[MERGE] forward port branch saas-12.4 up to fe59754c520

closes odoo/odoo#36721

Signed-off-by: Christophe Simonis <chs@odoo.com>

1 files changed, 20 insertions, 42 deletions

diff --git a/addons/l10n_ae/data/account_tax_template_data.xml b/addons/l10n_ae/data/account_tax_template_data.xml
index b3cec92c1c5..2993be745de 100644
--- a/addons/l10n_ae/data/account_tax_template_data.xml
+++ b/addons/l10n_ae/data/account_tax_template_data.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <record id="uae_sale_tax_5_dubai" model="account.tax.template">
-        <field name="name">TVA 5% (Dubai)</field>
+        <field name="name">VAT 5% (Dubai)</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">5</field>
         <field name="amount_type">percent</field>
-        <field name="description">TVA 5%</field>
+        <field name="description">VAT 5%</field>
         <field name="tax_group_id" ref="ae_tax_group_5"/>
         <field name="chart_template_id" ref="uae_chart_template_standard"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -36,11 +36,11 @@
         ]"/>
     </record>
     <record id="uae_sale_tax_5_abu_dhabi" model="account.tax.template">
-        <field name="name">TVA 5% (Abu Dhabi)</field>
+        <field name="name">VAT 5% (Abu Dhabi)</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">5</field>
         <field name="amount_type">percent</field>
-        <field name="description">TVA 5%</field>
+        <field name="description">VAT 5%</field>
         <field name="tax_group_id" ref="ae_tax_group_5"/>
         <field name="chart_template_id" ref="uae_chart_template_standard"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -71,11 +71,11 @@
         ]"/>
     </record>
     <record id="uae_sale_tax_5_sharjah" model="account.tax.template">
-        <field name="name">TVA 5% (Sharjah)</field>
+        <field name="name">VAT 5% (Sharjah)</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">5</field>
         <field name="amount_type">percent</field>
-        <field name="description">TVA 5%</field>
+        <field name="description">VAT 5%</field>
         <field name="tax_group_id" ref="ae_tax_group_5"/>
         <field name="chart_template_id" ref="uae_chart_template_standard"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -106,11 +106,11 @@
         ]"/>
     </record>
     <record id="uae_sale_tax_5_ajman" model="account.tax.template">
-        <field name="name">TVA 5% (Ajman)</field>
+        <field name="name">VAT 5% (Ajman)</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">5</field>
         <field name="amount_type">percent</field>
-        <field name="description">TVA 5%</field>
+        <field name="description">VAT 5%</field>
         <field name="tax_group_id" ref="ae_tax_group_5"/>
         <field name="chart_template_id" ref="uae_chart_template_standard"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -141,11 +141,11 @@
         ]"/>
     </record>
     <record id="uae_sale_tax_5_umm_al_quwain" model="account.tax.template">
-        <field name="name">TVA 5% (Umm Al Quwain)</field>
+        <field name="name">VAT 5% (Umm Al Quwain)</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">5</field>
         <field name="amount_type">percent</field>
-        <field name="description">TVA 5%</field>
+        <field name="description">VAT 5%</field>
         <field name="tax_group_id" ref="ae_tax_group_5"/>
         <field name="chart_template_id" ref="uae_chart_template_standard"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -176,11 +176,11 @@
         ]"/>
     </record>
     <record id="uae_sale_tax_5_ras_al_khaima" model="account.tax.template">
-        <field name="name">TVA 5% (Ras Al-Khaima)</field>
+        <field name="name">VAT 5% (Ras Al-Khaima)</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">5</field>
         <field name="amount_type">percent</field>
-        <field name="description">TVA 5%</field>
+        <field name="description">VAT 5%</field>
         <field name="tax_group_id" ref="ae_tax_group_5"/>
         <field name="chart_template_id" ref="uae_chart_template_standard"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -211,11 +211,11 @@
         ]"/>
     </record>
     <record id="uae_sale_tax_5_fujairah" model="account.tax.template">
-        <field name="name">TVA 5% (Fujairah)</field>
+        <field name="name">VAT 5% (Fujairah)</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">5</field>
         <field name="amount_type">percent</field>
-        <field name="description">TVA 5%</field>
+        <field name="description">VAT 5%</field>
         <field name="tax_group_id" ref="ae_tax_group_5"/>
         <field name="chart_template_id" ref="uae_chart_template_standard"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -277,11 +277,11 @@
         ]"/>
     </record>
     <record id="uae_sale_tax_0" model="account.tax.template">
-        <field name="name">TVA 0%</field>
+        <field name="name">VAT 0%</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0</field>
         <field name="amount_type">percent</field>
-        <field name="description">TVA 0%</field>
+        <field name="description">VAT 0%</field>
         <field name="tax_group_id" ref="ae_tax_group_0"/>
         <field name="chart_template_id" ref="uae_chart_template_standard"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -693,11 +693,11 @@
     </record>
     <!-- purchase taxes -->
     <record id="uae_purchase_tax_5" model="account.tax.template">
-        <field name="name">TVA 5%</field>
+        <field name="name">VAT 5%</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">5</field>
         <field name="amount_type">percent</field>
-        <field name="description">TVA 5%</field>
+        <field name="description">VAT 5%</field>
         <field name="tax_group_id" ref="ae_tax_group_5"/>
         <field name="chart_template_id" ref="uae_chart_template_standard"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -757,11 +757,11 @@
         ]"/>
     </record>
     <record id="uae_purchase_tax_0" model="account.tax.template">
-        <field name="name">TVA 0%</field>
+        <field name="name">VAT 0%</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0</field>
         <field name="amount_type">percent</field>
-        <field name="description">TVA 0%</field>
+        <field name="description">VAT 0%</field>
         <field name="tax_group_id" ref="ae_tax_group_0"/>
         <field name="chart_template_id" ref="uae_chart_template_standard"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -817,28 +817,6 @@
             }),
         ]"/>
     </record>
-    <record id="uae_purchase_tax_5_child_global" model="account.tax.template">
-        <field name="name">TVA 5%</field>
-        <field name="type_tax_use">none</field>
-        <field name="amount">5</field>
-        <field name="amount_type">percent</field>
-        <field name="description">TVA 5%</field>
-        <field name="account_id" ref="uae_account_3726"/>
-        <field name="refund_account_id" ref="uae_account_3726"/>
-        <field name="tax_group_id" ref="ae_tax_group_5"/>
-        <field name="chart_template_id" ref="uae_chart_template_standard"/>
-    </record>
-    <record id="uae_purchase_tax_5_child_reverse" model="account.tax.template">
-        <field name="name">Reverse Charge TVA +5%(Purchase)</field>
-        <field name="type_tax_use">none</field>
-        <field name="amount">5</field>
-        <field name="amount_type">percent</field>
-        <field name="description">TVA 5%</field>
-        <field name="account_id" ref="uae_account_3726"/>
-        <field name="refund_account_id" ref="uae_account_3726"/>
-        <field name="tax_group_id" ref="ae_tax_group_5"/>
-        <field name="chart_template_id" ref="uae_chart_template_standard"/>
-    </record>
     <record id="uae_purchase_tax_reverse_charge" model="account.tax.template">
         <field name="name">Reverse Charge Provision</field>
         <field name="type_tax_use">purchase</field>