diff --git a/addons/l10n_de/report/din5008_report.xml b/addons/l10n_de/report/din5008_report.xml index 86dde8f22af3803868185142a698f4b8363685d0..c73e5b10cf291ef526f7e4bad50f7854d68799d6 100644 --- a/addons/l10n_de/report/din5008_report.xml +++ b/addons/l10n_de/report/din5008_report.xml @@ -34,7 +34,7 @@ <!-- New report layout for din5008 format --> <template id="external_layout_din5008"> <div> - <div t-attf-class="header din_page o_company_#{company.id}_layout"> + <div t-attf-class="header din_page o_company_#{company.id}_layout #{'din_page_pdf' if report_type == 'pdf' else ''}"> <table class="company_header" t-att-style="'height: %dmm;' % (din_header_spacing or 27)"> <tr> <td><h3 class="mt0" t-field="company.report_header"/></td> @@ -43,7 +43,7 @@ </table> </div> - <div t-attf-class="din_page invoice_note article o_company_#{company.id}_layout" t-att-data-oe-model="o and o._name" t-att-data-oe-id="o and o.id"> + <div t-attf-class="din_page invoice_note article o_company_#{company.id}_layout #{'din_page_pdf' if report_type == 'pdf' else ''}" t-att-data-oe-model="o and o._name" t-att-data-oe-id="o and o.id"> <table> <tr> <td> @@ -110,7 +110,7 @@ <t t-out="0"/> </div> - <div t-attf-class="din_page footer o_company_#{company.id}_layout"> + <div t-attf-class="din_page footer o_company_#{company.id}_layout #{'din_page_pdf' if report_type == 'pdf' else ''}"> <div class="text-right page_number"> <div class="text-muted"> Page: <span class="page"/> of <span class="topage"/> @@ -120,7 +120,7 @@ <table> <tr> <td> - <ul class="list-inline"> + <ul class="list-inline text-nowrap"> <li t-if="company.name"><span t-field="company.name"/></li> <li t-if="company.street"><span t-field="company.street"/></li> <li t-if="company.street2"><span t-field="company.street2"/></li> diff --git a/addons/l10n_de/static/src/scss/report_din5008.scss b/addons/l10n_de/static/src/scss/report_din5008.scss index 7d163001063599de8f3d4fd0ff65f3063f10dec2..debdb6df8a6c87efd63fd34b127b48c3e3bc5df8 100644 --- a/addons/l10n_de/static/src/scss/report_din5008.scss +++ b/addons/l10n_de/static/src/scss/report_din5008.scss @@ -1,5 +1,4 @@ .din_page { - margin-left: -1rem; font-size: 9pt; &.header { @@ -21,7 +20,6 @@ } } &.invoice_note { - padding-top: 20px; tr { td { vertical-align: bottom; @@ -109,6 +107,11 @@ } } +.din_page_pdf { + width: 180mm; + margin-left: -1rem; +} + // TODO WAN remove in master .din {