From eb6a177a50128f2d78607fcff36aaf65e8a3034e Mon Sep 17 00:00:00 2001
From: "Benjamin Frantzen (bfr)" <bfr@odoo.com>
Date: Tue, 17 Mar 2020 11:42:14 +0000
Subject: [PATCH] [IMP] l10n_de: improved DIN compliance on report

- added a line with company address on top of invoice address to be DIN compliant
- added country to din address
- css improvments

Task ID: 2214336

closes odoo/odoo#56111

Signed-off-by: Josse Colpaert <jco@openerp.com>
---
 addons/l10n_de/report/din5008_report.xml      | 22 +++++++++++++++++++
 .../static/src/scss/report_din5008.scss       | 16 +++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_de/report/din5008_report.xml b/addons/l10n_de/report/din5008_report.xml
index 90e42e054c5..066946278c6 100644
--- a/addons/l10n_de/report/din5008_report.xml
+++ b/addons/l10n_de/report/din5008_report.xml
@@ -45,6 +45,27 @@
                 <div class="article din" t-att-data-oe-model="o and o._name" t-att-data-oe-id="o and o.id">
                     <div class="header_address">
                         <t t-if="address">
+                            <div class="company_invoice_address">
+                                <t t-if="company.name">
+                                    <span t-field="company.name"/> &#8226;
+                                </t>
+                                <t t-if="company.street">
+                                    <span t-field="company.street"/> &#8226;
+                                </t>
+                                <t t-if="company.street2">
+                                    <span t-field="company.street2"/> &#8226;
+                                </t>
+                                <t t-if="company.zip">
+                                    <span t-field="company.zip"/> &#8226;
+                                </t>
+                                <t t-if="company.city">
+                                    <span t-field="company.city"/> &#8226;
+                                </t>
+                                <t t-if="company.country_id">
+                                    <span t-field="company.country_id.name"/>
+                                </t>
+                                <hr class="company_invoice_line" />
+                            </div>
                             <div name="invoice_address" class="invoice_address">
                                 <t t-raw="address"/>
                             </div>
@@ -56,6 +77,7 @@
                             <div>
                                 <strong t-field="company.partner_id.name"/>
                             </div>
+
                             <span t-field="company.partner_id"
                                 t-options='{"widget": "contact", "fields": ["address"], "no_marker": true}'/>
                             <t t-if="information_block">
diff --git a/addons/l10n_de/static/src/scss/report_din5008.scss b/addons/l10n_de/static/src/scss/report_din5008.scss
index ca02c98a5d1..f0c2f5f97ba 100644
--- a/addons/l10n_de/static/src/scss/report_din5008.scss
+++ b/addons/l10n_de/static/src/scss/report_din5008.scss
@@ -15,11 +15,25 @@
         min-width: 75mm;
         display: inline-block;
     }
-    .invoice_address {
+    .company_invoice_address {
         position: relative;
         left: 25mm;
         top: 17.7mm;
         width: 85mm;
+        min-width: 85mm;
+        margin-bottom: 1mm;
+        font-size: 7pt;
+        overflow-y: hidden;
+        word-break: break-word;
+    }
+    .company_invoice_line {
+        margin-top: 1mm;
+    }
+    .invoice_address {
+        position: relative;
+        left: 25mm;
+        top: 14.7mm;
+        width: 85mm;
         height: 27.3mm;
         line-height: 1.15;
         overflow-y: hidden;