diff --git a/ext/custom-addons/dp_reports/models/report_helper.py b/ext/custom-addons/dp_reports/models/report_helper.py
index 462cac2c..4810c15f 100644
--- a/ext/custom-addons/dp_reports/models/report_helper.py
+++ b/ext/custom-addons/dp_reports/models/report_helper.py
@@ -15,10 +15,13 @@ class ReportHelper(models.AbstractModel):
                 elif not temp and idx != 0:
                     return False
                 else:
-                    temp = temp.__getattribute__(field)
-            if not temp:
-                return False
-        return True
+                    if len(temp) > 1:
+                        temp = temp[0].__getattribute__(field)
+                    else:
+                        temp = temp.__getattribute__(field)
+            if temp:
+                return True
+        return False
 
     @api.model
     def _formatLang(self, value, currency=True):
diff --git a/ext/custom-addons/dp_reports/reports/report_templates.xml b/ext/custom-addons/dp_reports/reports/report_templates.xml
index 85df0cb9..ad221e47 100644
--- a/ext/custom-addons/dp_reports/reports/report_templates.xml
+++ b/ext/custom-addons/dp_reports/reports/report_templates.xml
@@ -56,7 +56,7 @@
                             <span t-field="o.quote_name"/>
                         </p>
                     </div>
-                    <div class="col-xs-2">
+                    <div class="col-xs-2 header-logo">
                         <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo.decode()"
                              style="max-height: 85px;"/>
                     </div>
@@ -153,7 +153,7 @@
             <div class="partner-data">
                 <span t-esc="o.partner_id.name"/><br/>
                 <span t-esc="o.partner_id.street"/><br/>
-                <span t-esc="o.partner_id.zip"/><span t-esc="o.partner_id.city"/><br/>
+                <span t-esc="o.partner_id.zip"/> <span t-esc="o.partner_id.city"/><br/>
                 <span t-esc="o.partner_id.country_id.name"/><br/>
                 <span t-esc="o.partner_id.email"/><br/>
                 <span t-esc="o.partner_id.phone"/>
diff --git a/ext/custom-addons/dp_reports/static/src/less/report_backend.less b/ext/custom-addons/dp_reports/static/src/less/report_backend.less
index a414aef3..c298a22f 100644
--- a/ext/custom-addons/dp_reports/static/src/less/report_backend.less
+++ b/ext/custom-addons/dp_reports/static/src/less/report_backend.less
@@ -14,8 +14,27 @@ body.container {
 .header {
     font-size:10pt;
     font-family: 'Raleway';
+    position: relative;
 }
 
+/*
+.header-logo {
+    position: absolute;
+    top: 0;
+    left: 80%;
+}
+
+.header-label {
+    font-size:20pt;
+    font-weight: bold;
+    color: #A72523;
+    vertical-align: bottom;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+}
+*/
+
 .header-label {
     font-size:20pt;
     font-weight: bold;
diff --git a/ext/custom-addons/dp_reports_account/reports/invoice.xml b/ext/custom-addons/dp_reports_account/reports/invoice.xml
index 7464e366..124b716b 100644
--- a/ext/custom-addons/dp_reports_account/reports/invoice.xml
+++ b/ext/custom-addons/dp_reports_account/reports/invoice.xml
@@ -15,7 +15,7 @@
                         <div class="partner-data">
                             <span t-esc="o.partner_shipping_id.name"/>
                             <span t-esc="o.partner_shipping_id.street"/><br/>
-                            <span t-esc="o.partner_shipping_id.zip"/><span t-esc="o.partner_shipping_id.city"/><br/>
+                            <span t-esc="o.partner_shipping_id.zip"/> <span t-esc="o.partner_shipping_id.city"/><br/>
                             <span t-esc="o.partner_shipping_id.country_id.name"/>
                         </div>
                     </div>
@@ -24,10 +24,11 @@
                         <div class="partner-data">
                             <span t-esc="o.partner_id.name"/><br/>
                             <span t-esc="o.partner_id.street"/><br/>
-                            <span t-esc="o.partner_id.zip"/><span t-esc="o.partner_id.city"/><br/>
-                            <span t-esc="o.partner_id.country_id.name"/><br/>
-                            <span t-esc="o.partner_id.email"/><br/>
-                            <span t-esc="o.partner_id.phone"/>
+                            <span t-esc="o.partner_id.zip"/> <span t-esc="o.partner_id.city"/><br/>
+                            <t t-if="o.partner_id.country_id"><span t-esc="o.partner_id.country_id.name"/><br/></t>
+                            <t t-if="o.partner_id.email"><span t-esc="o.partner_id.email"/><br/></t>
+                            <t t-if="o.partner_id.phone"><span t-esc="o.partner_id.phone"/><br/></t>
+                            <t t-if="o.partner_id.vat">UID-Nr.: <span t-esc="o.partner_id.vat"/></t>
                         </div>
                     </div>
                     <div class="col-xs-3">
@@ -44,8 +45,8 @@
                     <span class="col-xs-2" t-field="o.positions"/>
                 </div>
                 <div class="row height-20">
-                    <strong><span class="col-xs-2">Angebotsdatum:</span></strong>
-                    <span class="col-xs-2">?????????</span>
+                    <strong><span class="col-xs-2">Rechnungsdatum:</span></strong>
+                    <span class="col-xs-2" t-field="o.date_invoice"/>
                     <strong><span class="col-xs-2">Email:</span></strong>
                     <span class="col-xs-2" t-field="o.user_id.email"/>
                     <strong><span class="col-xs-2">Artikel:</span></strong>
@@ -57,7 +58,7 @@
                     <strong><span class="col-xs-2">Telefon:</span></strong>
                     <span class="col-xs-2" t-field="o.user_id.phone"/>
                     <strong><span class="col-xs-2">Bezeichnung:</span></strong>
-                    <span class="col-xs-2">?????????</span>
+                    <span class="col-xs-2" t-field="o.number"/>
                 </div>
                 <div class="row mt32"/>
                 <table class="table table-condensed">
@@ -178,6 +179,11 @@
                         <span t-esc="o.payment_term_id.name"/>
                         <br/>
                     </p>
+                    <p class="col-xs-12">
+                        EORI-Nr.:
+                        <span t-esc="o.user_id.company_id.eori_nr"/>
+                        <br/>
+                    </p>
                 </div>
                 </div>
             </t>
diff --git a/ext/custom-addons/dp_reports_sale/reports/sale.xml b/ext/custom-addons/dp_reports_sale/reports/sale.xml
index 5b3b63c2..76f10bf9 100644
--- a/ext/custom-addons/dp_reports_sale/reports/sale.xml
+++ b/ext/custom-addons/dp_reports_sale/reports/sale.xml
@@ -14,7 +14,7 @@
                         <div class="partner-data">
                             <span t-esc="o.partner_shipping_id.name"/>
                             <span t-esc="o.partner_shipping_id.street"/><br/>
-                            <span t-esc="o.partner_shipping_id.zip"/><span t-esc="o.partner_shipping_id.city"/><br/>
+                            <span t-esc="o.partner_shipping_id.zip"/> <span t-esc="o.partner_shipping_id.city"/><br/>
                             <span t-esc="o.partner_shipping_id.country_id.name"/>
                         </div>
                     </div>
@@ -23,10 +23,11 @@
                         <div class="partner-data">
                             <span t-esc="o.partner_invoice_id.name"/><br/>
                             <span t-esc="o.partner_invoice_id.street"/><br/>
-                            <span t-esc="o.partner_invoice_id.zip"/><span t-esc="o.partner_invoice_id.city"/><br/>
-                            <span t-esc="o.partner_invoice_id.country_id.name"/><br/>
-                            <span t-esc="o.partner_invoice_id.email"/><br/>
-                            <span t-esc="o.partner_invoice_id.phone"/>
+                            <span t-esc="o.partner_invoice_id.zip"/> <span t-esc="o.partner_invoice_id.city"/><br/>
+                            <t t-if="o.partner_invoice_id.country_id"><span t-esc="o.partner_invoice_id.country_id.name"/><br/></t>
+                            <t t-if="o.partner_invoice_id.email"><span t-esc="o.partner_invoice_id.email"/><br/></t>
+                            <t t-if="o.partner_invoice_id.phone"><span t-esc="o.partner_invoice_id.phone"/><br/></t>
+                            <t t-if="o.partner_invoice_id.vat">UID-Nr.: <span t-esc="o.partner_invoice_id.vat"/></t>
                         </div>
                     </div>
                     <div class="col-xs-3">
@@ -44,7 +45,7 @@
                 </div>
                 <div class="row height-20">
                     <strong><span class="col-xs-2">Angebotsdatum:</span></strong>
-                    <span class="col-xs-2" t-field="o.date_order"/>
+                    <span class="col-xs-2" t-field="o.date_order" t-options='{"widget": "date"}'/>
                     <strong><span class="col-xs-2">Email:</span></strong>
                     <span class="col-xs-2" t-field="o.user_id.email"/>
                     <strong><span class="col-xs-2">Artikel:</span></strong>
@@ -52,11 +53,11 @@
                 </div>
                 <div class="row height-20">
                     <strong><span class="col-xs-2">Lieferdatum:</span></strong>
-                    <span class="col-xs-2" t-field="o.earliest_scheduled_date"/>
+                    <span class="col-xs-2" t-field="o.earliest_scheduled_date" t-options='{"widget": "date"}'/>
                     <strong><span class="col-xs-2">Telefon:</span></strong>
                     <span class="col-xs-2" t-field="o.user_id.phone"/>
                     <strong><span class="col-xs-2">Bezeichnung:</span></strong>
-                    <span class="col-xs-2">?????????</span>
+                    <span class="col-xs-2" t-field="o.quote_name"/>
                 </div>
                 <div class="row mt32"/>
                 <table class="table table-condensed">
@@ -84,12 +85,10 @@
                                     <span t-field="order_line.product_uom_qty"/>
                                 </td>
                                 <td t-if="not order_line.lot_id.weight" class="text-right">
-                                    <span t-field="order_line.product_id.weight"/>
-                                    <span t-field="order_line.product_uom"/>
+                                    <span t-field="order_line.product_id.weight"/> kg
                                 </td>
                                 <td t-if="order_line.lot_id.weight" class="text-right">
-                                    <span t-field="order_line.lot_id.weight"/>
-                                    <span t-field="order_line.product_uom"/>
+                                    <span t-field="order_line.lot_id.weight"/> kg
                                 </td>
                                 <td class="text-right">
                                     <span t-field="order_line.price_unit"/>
@@ -188,6 +187,21 @@
                         <span t-esc="o.payment_term_id.name"/>
                         <br/>
                     </p>
+                    <p class="col-xs-12" t-if="o.state not in ['draft','sent']">
+                        Bitte prüfen Sie bei Anlieferung sofort die Verkackung bzw. Ware auf Beschädigung!<br/>
+                        Falls die beschädigte Ware angenommen wird, besteht kein Anspruch auf Kostenerstattung bzw. Austausch.
+                    </p>
+                    <t t-if="o.state in ['draft','sent']">
+                        <p class="col-xs-12">
+                            Gültigkeit: 14 Tage ab Ausstellungsdatum
+                        </p>
+                        <p class="col-xs-12">
+                            Auftrag erteilt am: ____________________
+                        </p>
+                        <p class="col-xs-12">
+                            Unterschrift: ____________________
+                        </p>
+                    </t>
                 </div>
             </div>
         </t>