From d676dce66d6f96058a6ae6b4664af3443d4210ce Mon Sep 17 00:00:00 2001
From: JasminSForgeFlow <jasmin.solanki@forgeflow.com>
Date: Tue, 28 Mar 2023 16:45:03 +0530
Subject: [PATCH] [MIG] account_multi_vat: Migration to 15.0

---
 account_multi_vat/__manifest__.py          |  2 +-
 account_multi_vat/models/account_tax.py    |  2 +-
 account_multi_vat/tests/common.py          |  4 +-
 account_multi_vat/views/report_invoice.xml | 80 +---------------------
 4 files changed, 6 insertions(+), 82 deletions(-)

diff --git a/account_multi_vat/__manifest__.py b/account_multi_vat/__manifest__.py
index 921347b3b..156562694 100644
--- a/account_multi_vat/__manifest__.py
+++ b/account_multi_vat/__manifest__.py
@@ -6,7 +6,7 @@
     "summary": """
         Allows setting multiple VAT numbers on any partner and select the right one
         depending on the fiscal position and delivery address of the invoice.""",
-    "version": "14.0.1.0.0",
+    "version": "15.0.1.0.0",
     "development_status": "Beta",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
diff --git a/account_multi_vat/models/account_tax.py b/account_multi_vat/models/account_tax.py
index e6e03eaaf..f63b53a08 100644
--- a/account_multi_vat/models/account_tax.py
+++ b/account_multi_vat/models/account_tax.py
@@ -18,7 +18,7 @@ class AccountTax(models.Model):
         comodel_name="res.country",
         related=False,
         compute="_compute_country_id",
-        store=False,
+        store=True,
         readonly=True,
     )
 
diff --git a/account_multi_vat/tests/common.py b/account_multi_vat/tests/common.py
index 119dfdb9f..ca7d7dee5 100644
--- a/account_multi_vat/tests/common.py
+++ b/account_multi_vat/tests/common.py
@@ -1,10 +1,10 @@
 # Copyright 2020 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
-class CommonAccountMultiVat(SavepointCase):
+class CommonAccountMultiVat(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(CommonAccountMultiVat, cls).setUpClass()
diff --git a/account_multi_vat/views/report_invoice.xml b/account_multi_vat/views/report_invoice.xml
index 6da25f1b7..b29bf9576 100644
--- a/account_multi_vat/views/report_invoice.xml
+++ b/account_multi_vat/views/report_invoice.xml
@@ -5,93 +5,17 @@
     <template
         id="multi_vat_report_invoice_document"
         inherit_id="account.report_invoice_document"
+        priority="99"
     >
         <xpath expr="//div[@t-if='o.partner_id.vat']" position="replace">
             <div t-if="o.partner_id.has_vat" class="mt16">
                 <t
                     t-if="o.company_id.country_id.vat_label"
-                    t-esc="o.company_id.country_id.vat_label"
+                    t-out="o.company_id.country_id.vat_label"
                     id="inv_tax_id_label"
                 />
                 <t t-else="">Tax ID</t>: <span t-field="o.customer_vat" />
             </div>
         </xpath>
     </template>
-    <template id="external_layout_multi_vat" inherit_id="web.external_layout_standard">
-        <xpath
-            expr="//li[@t-if='company.vat']/span[@t-field='company.vat']"
-            position="replace"
-        >
-            <t
-                t-if="'fiscal_position_id' in o._fields and o._name == 'account.move' and o.move_type in ['out_invoice', 'out_refund']"
-            >
-                <span
-                    t-esc="company.partner_id._get_vat_number_for_administration(o.fiscal_position_id.vat_partner_id)"
-                />
-            </t>
-            <t t-else="else">
-                <span t-field="company.vat" />
-            </t>
-        </xpath>
-    </template>
-    <template
-        id="external_layout_multi_vat_clean"
-        inherit_id="web.external_layout_clean"
-    >
-            <xpath
-            expr="//li[@t-if='company.vat']/span[@t-field='company.vat']"
-            position="replace"
-        >
-            <t
-                t-if="'fiscal_position_id' in o._fields and o._name == 'account.move' and o.move_type in ['out_invoice', 'out_refund']"
-            >
-                <span
-                    t-esc="company.partner_id._get_vat_number_for_administration(o.fiscal_position_id.vat_partner_id)"
-                />
-            </t>
-            <t t-else="else">
-                <span t-field="company.vat" />
-            </t>
-        </xpath>
-    </template>
-    <template
-        id="external_layout_multi_vat_boxed"
-        inherit_id="web.external_layout_boxed"
-    >
-            <xpath
-            expr="//li[@t-if='company.vat']/span[@t-field='company.vat']"
-            position="replace"
-        >
-            <t
-                t-if="'fiscal_position_id' in o._fields and o._name == 'account.move' and o.move_type in ['out_invoice', 'out_refund']"
-            >
-                <span
-                    t-esc="company.partner_id._get_vat_number_for_administration(o.fiscal_position_id.vat_partner_id)"
-                />
-            </t>
-            <t t-else="else">
-                <span t-field="company.vat" />
-            </t>
-        </xpath>
-    </template>
-    <template
-        id="external_layout_multi_vat_background"
-        inherit_id="web.external_layout_background"
-    >
-            <xpath
-            expr="//li[@t-if='company.vat']/span[@t-field='company.vat']"
-            position="replace"
-        >
-            <t
-                t-if="'fiscal_position_id' in o._fields and o._name == 'account.move' and o.move_type in ['out_invoice', 'out_refund']"
-            >
-                <span
-                    t-esc="company.partner_id._get_vat_number_for_administration(o.fiscal_position_id.vat_partner_id)"
-                />
-            </t>
-            <t t-else="else">
-                <span t-field="company.vat" />
-            </t>
-        </xpath>
-    </template>
 </odoo>