diff options
| author | Andrea Grazioso (agr-odoo) <agr@odoo.com> | 2020-02-27 13:05:01 +0000 |
|---|---|---|
| committer | Andrea Grazioso (agr-odoo) <agr@odoo.com> | 2020-03-19 16:44:26 +0000 |
| commit | 8a6b1ed9e0f20d80d1dbf4030157f2b5ba2d4a8f (patch) | |
| tree | c1f08ba52ce57d8263db03be26fd4e59360cd0d6 | |
| parent | e1b257bd8aa3f54f0f1a4612b291bb80301d611e (diff) | |
[FIX] l10n_de: fix Followup Report Letter
Install Germany - Accounting.
In General Settings, set "European A4 for DIN" as the Format and
"external_layout_din5008" as the layout.
Print Followup report letter
The report has misplaced elements, the other company address should be
present on the left and there is the extra address below the FollowUp
header.
Modifying the style to hide the address below the followup title
and the xml addon for din to fetch the address from the partner fix the
issue
opw-2187240
closes odoo/odoo#48057
X-original-commit: 2b9bf77c85c8840b9f585a59ee0ba4b8a3255120
Related: odoo/enterprise#9377
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
| -rw-r--r-- | addons/l10n_de/report/din5008_report.xml | 3 | ||||
| -rw-r--r-- | addons/l10n_de/static/src/scss/report_din5008.scss | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/addons/l10n_de/report/din5008_report.xml b/addons/l10n_de/report/din5008_report.xml index 84c03e9ccd8..90e42e054c5 100644 --- a/addons/l10n_de/report/din5008_report.xml +++ b/addons/l10n_de/report/din5008_report.xml @@ -49,6 +49,9 @@ <t t-raw="address"/> </div> </t> + <t t-else="fallback_address"> + <div name="invoice_address" class="invoice_address" t-raw="fallback_address" t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True}' /> + </t> <div class="company_address"> <div> <strong t-field="company.partner_id.name"/> diff --git a/addons/l10n_de/static/src/scss/report_din5008.scss b/addons/l10n_de/static/src/scss/report_din5008.scss index 801ef16637c..ca02c98a5d1 100644 --- a/addons/l10n_de/static/src/scss/report_din5008.scss +++ b/addons/l10n_de/static/src/scss/report_din5008.scss @@ -49,4 +49,9 @@ left: 25mm; width: 190mm; } -}
\ No newline at end of file + .o_account_reports_header { + .fallback_header { + display: none; + } + } +} |