From 6182f5ea19e2f0d8fdb3b5abb9ed8b9c13308671 Mon Sep 17 00:00:00 2001
From: Olivier Laurent <olt@odoo.com>
Date: Wed, 24 May 2017 08:39:09 +0200
Subject: [PATCH] [FIX] mrp_repair, sale: display the right partner.vat

Some reports displays the wrong partner.vat.
On the invoice report, when the shipping address is different than the
invoicing address, we also also display the shipping address in addition
to the invoicing address. But we displayed the VAT of the invoicing
address instead of the one from the shipping address.

Same issue on the MRP repair report and the sale report.
---
 .../mrp_repair/report/mrp_repair_templates_repair_order.xml   | 4 ++--
 addons/sale/report/invoice_report_templates.xml               | 2 +-
 addons/sale/report/sale_report_templates.xml                  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml b/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
index 826fca68b73..bc427bc015e 100644
--- a/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
+++ b/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
@@ -15,13 +15,13 @@
                                 <strong t-if="o.address_id != o.partner_invoice_id">Invoice address: </strong>
                                 <div t-field="o.partner_invoice_id" 
                                     t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
-                                <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
+                                <p t-if="o.partner_invoice_id.vat">VAT: <span t-field="o.partner_invoice_id.vat"/></p>
                             </div>
                             <div t-if="o.address_id != o.partner_invoice_id">
                                 <strong>Shipping address :</strong>
                                 <div t-field="o.address_id" 
                                     t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
-                                <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
+                                <p t-if="o.address_id.vat">VAT: <span t-field="o.address_id.vat"/></p>
                             </div>                        
                         </div>
                         <div class="col-xs-5 col-xs-offset-1">
diff --git a/addons/sale/report/invoice_report_templates.xml b/addons/sale/report/invoice_report_templates.xml
index ef26e950a8f..09beef6f8cc 100644
--- a/addons/sale/report/invoice_report_templates.xml
+++ b/addons/sale/report/invoice_report_templates.xml
@@ -87,7 +87,7 @@
                     <strong>Shipping address:</strong>
                     <div t-field="o.partner_shipping_id"
                         t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
-                    <span t-if="o.partner_id.vat">TIN: <span t-field="o.partner_id.vat"/></span>
+                    <span t-if="o.partner_shipping_id.vat">TIN: <span t-field="o.partner_shipping_id.vat"/></span>
                 </div>
             </div>
         </xpath>
diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml
index 6d9c0b0c89c..4afba7e2311 100644
--- a/addons/sale/report/sale_report_templates.xml
+++ b/addons/sale/report/sale_report_templates.xml
@@ -11,12 +11,12 @@
                     <strong t-if="doc.partner_shipping_id != doc.partner_invoice_id">Invoicing address:</strong>
                     <div t-field="doc.partner_invoice_id"
                         t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
-                    <p t-if="doc.partner_id.vat">VAT: <span t-field="doc.partner_id.vat"/></p>
+                    <p t-if="doc.partner_invoice_id.vat">VAT: <span t-field="doc.partner_invoice_id.vat"/></p>
                     <div t-if="doc.partner_shipping_id != doc.partner_invoice_id" class="mt8">
                         <strong>Shipping address:</strong>
                         <div t-field="doc.partner_shipping_id"
                             t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
-                        <p t-if="doc.partner_id.vat">VAT: <span t-field="doc.partner_id.vat"/></p>
+                        <p t-if="doc.partner_shipping_id.vat">VAT: <span t-field="doc.partner_shipping_id.vat"/></p>
                     </div>
                 </div>
                 <div class="col-xs-5 col-xs-offset-1">