diff options
| author | Denis Ledoux <dle@odoo.com> | 2016-01-28 15:05:50 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2016-01-28 15:08:06 +0100 |
| commit | afd2dbfb7f93f0cdff13e968198d7991e00fd268 (patch) | |
| tree | 1a8b12f93a848f23ca54ff38651d35a5024fa743 | |
| parent | b493faf5955a905cddbfe10bff0643d975d1b1ea (diff) | |
[FIX] mrp_repair: quotation report, shipping and invoice address
Copy the structure of the sale order report regarding the
partner, invoice and shipping address.
Besides, on a repair order, this is possible
to set a shipping address without setting
an invoice address (if no invoicing is set).
In such a case, the `Invoice address:` must be hidden.
opw-666506
| -rw-r--r-- | addons/mrp_repair/views/report_mrprepairorder.xml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/addons/mrp_repair/views/report_mrprepairorder.xml b/addons/mrp_repair/views/report_mrprepairorder.xml index a6d00ba5b15..7448c674639 100644 --- a/addons/mrp_repair/views/report_mrprepairorder.xml +++ b/addons/mrp_repair/views/report_mrprepairorder.xml @@ -10,13 +10,15 @@ <div class="row"> <div class="col-xs-6"> - <p t-if="o.address_id == o.partner_invoice_id">Invoice and shipping address:</p> - <p t-if="o.address_id != o.partner_invoice_id">Invoice address: </p> - <div t-field="o.partner_invoice_id" - t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/> - <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p> - <div t-if="o.address_id != o.partner_invoice_id"> - <p>Shipping address :</p> + <strong t-if="o.address_id == o.partner_invoice_id">Invoice and shipping address:</strong> + <div t-if="o.partner_invoice_id"> + <strong t-if="o.address_id != o.partner_invoice_id">Invoice address: </strong> + <div t-field="o.partner_invoice_id" + t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/> + <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p> + </div> + <div t-if="o.address_id != o.partner_invoice_id" class="mt8"> + <strong>Shipping address :</strong> <div t-field="o.address_id" t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/> <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p> |