Since 15.2, when creating an invoice containing both a recipient address and an invoice address, the addresses would both appear on the left, one after the other. This made reading difficult and the invoice unclear. Furthermore, the company address wasn't present by default on the invoice : it was only there if a layout had previously been selected. This PR: - reverts the behaviour of the company address, i.e. it appears even if no layout is (yet) selected ; - aligns the delivery and the recipient address on each side of the page when necessary, while not changing the outcome if a single address is given. Also displays a "title" above the addresses when necessary to make things clearer. task-2809240 related : https://github.com/odoo/enterprise/pull/27240 closes odoo/odoo#91487 X-original-commit: 1e745256fabbec4d6979180d8f792c99be463509 Related: odoo/enterprise#27383 Signed-off-by: Florian Gilbert <flg@odoo.com>
14 lines
763 B
XML
14 lines
763 B
XML
<odoo>
|
|
<template id="l10n_ca_report_invoice_document_inherit" inherit_id="account.report_invoice_document">
|
|
<xpath expr="//div[hasclass('row')]//div[@name='address_not_same_as_shipping']//t[@t-set='address']" position="inside">
|
|
<div>PST: <span t-field="o.partner_id.l10n_ca_pst"/></div>
|
|
</xpath>
|
|
<xpath expr="//div[hasclass('row')]//div[@name='address_same_as_shipping']//t[@t-set='address']" position="inside">
|
|
<div>PST: <span t-field="o.partner_id.l10n_ca_pst"/></div>
|
|
</xpath>
|
|
<xpath expr="//div[hasclass('row')]//div[@name='no_shipping']//t[@t-set='address']" position="inside">
|
|
<div>PST: <span t-field="o.partner_id.l10n_ca_pst"/></div>
|
|
</xpath>
|
|
</template>
|
|
</odoo>
|