From 97a21aeec1afb41c879340d980569eccfd4647bb Mon Sep 17 00:00:00 2001
From: Hardik Prajapati <hpr@odoo.com>
Date: Mon, 22 Apr 2019 11:59:19 +0000
Subject: [PATCH] [IMP] l10n_ae: Added taxes, COA and Fiscal position

- On the invoice pdf, if the invoice is in USD, we
need to specify conversion rate and amounts in AED.
Also, if it is between certain Gulf states, you need
to mention this on the invoice.   'Invoice' also
needs to replaced with 'Tax Invoice'.
- Taxes changed to 0% and 5% / AED symbol on currency
adapted to the real situation of UAE.
- A tax by state automatically adapted with the fiscal
positions in order to have the tax amounts correctly
split by state in the tax report.

opw-1931322
updated to 12.3 taxes (and l10n_ae_reports removed in
enterprise)

closes odoo/odoo#33474

Signed-off-by: Cedric Snauwaert (csn) <csn@openerp.com>
---
 addons/l10n_ae/__manifest__.py                |   4 +
 addons/l10n_ae/data/account_data.xml          |  12 +-
 .../l10n_ae/data/account_tax_report_data.xml  | 421 +++++++++
 .../data/account_tax_template_data.xml        | 843 +++++++++++++++++-
 addons/l10n_ae/data/fiscal_templates_data.xml | 112 +++
 addons/l10n_ae/data/l10n_ae_chart_data.xml    |   4 +-
 addons/l10n_ae/data/l10n_ae_data.xml          |  14 +
 .../views/report_invoice_templates.xml        |  35 +
 8 files changed, 1426 insertions(+), 19 deletions(-)
 create mode 100644 addons/l10n_ae/data/account_tax_report_data.xml
 create mode 100644 addons/l10n_ae/data/fiscal_templates_data.xml
 create mode 100644 addons/l10n_ae/data/l10n_ae_data.xml
 create mode 100644 addons/l10n_ae/views/report_invoice_templates.xml

diff --git a/addons/l10n_ae/__manifest__.py b/addons/l10n_ae/__manifest__.py
index d9542262df7..8f9f25a7b5f 100644
--- a/addons/l10n_ae/__manifest__.py
+++ b/addons/l10n_ae/__manifest__.py
@@ -14,11 +14,15 @@ United Arab Emirates accounting chart and localization.
     """,
     'depends': ['base', 'account'],
     'data': [
+             'data/l10n_ae_data.xml',
              'data/account_data.xml',
              'data/l10n_ae_chart_data.xml',
              'data/account.account.template.csv',
              'data/l10n_ae_chart_post_data.xml',
+             'data/account_tax_report_data.xml',
              'data/account_tax_template_data.xml',
+             'data/fiscal_templates_data.xml',
              'data/account_chart_template_data.xml',
+             'views/report_invoice_templates.xml',
     ],
 }
diff --git a/addons/l10n_ae/data/account_data.xml b/addons/l10n_ae/data/account_data.xml
index 48fcd567909..df9792faae5 100644
--- a/addons/l10n_ae/data/account_data.xml
+++ b/addons/l10n_ae/data/account_data.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
+    <data noupdate="0">
         <!-- Account Tax Group -->
-        <record id="tax_group_15" model="account.tax.group">
-            <field name="name">Tax 15%</field>
+        <record id="ae_tax_group_5" model="account.tax.group">
+            <field name="name">Tax 5%</field>
+        </record>
+        <record id="ae_tax_group_0" model="account.tax.group">
+            <field name="name">Tax 0%</field>
+        </record>
+        <record id="ae_tax_group_exempted" model="account.tax.group">
+            <field name="name">Tax Exempted</field>
         </record>
     </data>
 </odoo>
diff --git a/addons/l10n_ae/data/account_tax_report_data.xml b/addons/l10n_ae/data/account_tax_report_data.xml
new file mode 100644
index 00000000000..1f89d63f8a2
--- /dev/null
+++ b/addons/l10n_ae/data/account_tax_report_data.xml
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="tax_report_line_base_all_sales" model="account.tax.report.line">
+        <field name="name">VAT on Sales and all other Outputs (Base)</field>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_base" model="account.tax.report.line">
+        <field name="name">1. Standard Rated supplies (Base)</field>
+        <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_base_abu_dhabi" model="account.tax.report.line">
+        <field name="name">a. Abu Dhabi</field>
+        <field name="tag_name">a. Abu Dhabi</field>
+        <field name="code">STD_RATE_SUPP_BASE_AB</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_base_dubai" model="account.tax.report.line">
+        <field name="name">b. Dubai</field>
+        <field name="tag_name">b. Dubai</field>
+        <field name="code">STD_RATE_SUPP_BASE_DB</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
+        <field name="sequence" eval="2"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_base_sharjah" model="account.tax.report.line">
+        <field name="name">c. Sharjah</field>
+        <field name="tag_name">c. Sharjah</field>
+        <field name="code">STD_RATE_SUPP_BASE_SJ</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
+        <field name="sequence" eval="3"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_base_ajman" model="account.tax.report.line">
+        <field name="name">d. Ajman</field>
+        <field name="tag_name">d. Ajman</field>
+        <field name="code">STD_RATE_SUPP_BASE_AJ</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
+        <field name="sequence" eval="4"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_base_umm_al_quwain" model="account.tax.report.line">
+        <field name="name">e. Umm Al Quwain</field>
+        <field name="tag_name">e. Umm Al Quwain</field>
+        <field name="code">STD_RATE_SUPP_BASE_UM</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
+        <field name="sequence" eval="5"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_base_ras_al_khaima" model="account.tax.report.line">
+        <field name="name">f. Ras Al-Khaima</field>
+        <field name="tag_name">f. Ras Al-Khaima</field>
+        <field name="code">STD_RATE_SUPP_BASE_RA</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
+        <field name="sequence" eval="6"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_base_fujairah" model="account.tax.report.line">
+        <field name="name">g. Fujairah</field>
+        <field name="tag_name">g. Fujairah</field>
+        <field name="code">STD_RATE_SUPP_BASE_FU</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
+        <field name="sequence" eval="7"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_base_subtotal" model="account.tax.report.line">
+        <field name="name">Sub Total</field>
+        <field name="formula">STD_RATE_SUPP_BASE_AB + STD_RATE_SUPP_BASE_DB + STD_RATE_SUPP_BASE_SJ + STD_RATE_SUPP_BASE_AJ + STD_RATE_SUPP_BASE_UM + STD_RATE_SUPP_BASE_RA + STD_RATE_SUPP_BASE_FU</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
+        <field name="sequence" eval="8"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_tax_refund_tourist_base" model="account.tax.report.line">
+        <field name="name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field>
+        <field name="tag_name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field>
+        <field name="code">TAX_REF_TOUR_SCHEME_BASE</field>
+        <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="sequence" eval="2"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_supplies_reverse_charge_base" model="account.tax.report.line">
+        <field name="name">3. Supplies subject to reverse charge provisions</field>
+        <field name="tag_name">3. Supplies subject to reverse charge provisions</field>
+        <field name="code">REVERSE_CHARGE_PRO_BASE</field>
+        <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="sequence" eval="3"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_zero_rated_supplies_base" model="account.tax.report.line">
+        <field name="name">4. Zero rated supplies</field>
+        <field name="tag_name">4. Zero rated supplies</field>
+        <field name="code">ZERO_RATE_SUPP_BASE</field>
+        <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="sequence" eval="4"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_exempt_supplies_base" model="account.tax.report.line">
+        <field name="name">5. Exempt supplies</field>
+        <field name="tag_name">5. Exempt supplies</field>
+        <field name="code">EXAMPT_SUPP_BASE</field>
+        <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="sequence" eval="5"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_supplies_out_of_scope_base" model="account.tax.report.line">
+        <field name="name">6. Out of scope</field>
+        <field name="code">OUT_OF_SCOPE_BASE_0</field>
+        <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="sequence" eval="6"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_import_uae_base" model="account.tax.report.line">
+        <field name="name">7. Goods imported into the UAE</field>
+        <field name="tag_name">7. Goods imported into the UAE</field>
+        <field name="code">GOODS_IMPORT_IN_UAE_BASE</field>
+        <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="sequence" eval="7"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_adjustment_import_uae_base" model="account.tax.report.line">
+        <field name="name">8. Adjustments to goods imported into the UAE</field>
+        <field name="code">ADJUST_GOODS_IMPORT_IN_UAE_BASE</field>
+        <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="sequence" eval="8"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_base_all_sales_total" model="account.tax.report.line">
+        <field name="name">9. Total</field>
+        <field name="formula">ADJUST_GOODS_IMPORT_IN_UAE_BASE + GOODS_IMPORT_IN_UAE_BASE + OUT_OF_SCOPE_BASE_0 + EXAMPT_SUPP_BASE + ZERO_RATE_SUPP_BASE + REVERSE_CHARGE_PRO_BASE + TAX_REF_TOUR_SCHEME_BASE + (STD_RATE_SUPP_BASE_AB + STD_RATE_SUPP_BASE_DB + STD_RATE_SUPP_BASE_SJ + STD_RATE_SUPP_BASE_AJ + STD_RATE_SUPP_BASE_UM + STD_RATE_SUPP_BASE_RA + STD_RATE_SUPP_BASE_FU)</field>
+        <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="sequence" eval="9"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_base_all_expense" model="account.tax.report.line">
+        <field name="name">VAT on Expenses and all other Inputs (Base)</field>
+        <field name="sequence" eval="2"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_expense_base" model="account.tax.report.line">
+        <field name="name">10. Standard rated expenses</field>
+        <field name="tag_name">10. Standard rated expenses</field>
+        <field name="code">STD_RATE_EXPENSES_BASE</field>
+        <field name="parent_id" ref="tax_report_line_base_all_expense"/>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_expense_supplies_reverse_base" model="account.tax.report.line">
+        <field name="name">11. Supplies subject to the reverse charge provisions</field>
+        <field name="tag_name">11. Supplies subject to the reverse charge provisions</field>
+        <field name="code">SUPP_REV_CHARGE_PRO_BASE</field>
+        <field name="parent_id" ref="tax_report_line_base_all_expense"/>
+        <field name="sequence" eval="2"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_expense_out_of_scope" model="account.tax.report.line">
+        <field name="name">12. Out of scope</field>
+        <field name="code">OUT_OF_SCOPE_1_BASE</field>
+        <field name="parent_id" ref="tax_report_line_base_all_expense"/>
+        <field name="sequence" eval="3"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_base_all_expense_total" model="account.tax.report.line">
+        <field name="name">13. Totals</field>
+        <field name="formula">OUT_OF_SCOPE_1_BASE + SUPP_REV_CHARGE_PRO_BASE + STD_RATE_EXPENSES_BASE</field>
+        <field name="parent_id" ref="tax_report_line_base_all_expense"/>
+        <field name="sequence" eval="4"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_vat_all_sales" model="account.tax.report.line">
+        <field name="name">VAT on Sales and all other Outputs (Tax)</field>
+        <field name="sequence" eval="3"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_vat" model="account.tax.report.line">
+        <field name="name">1. Standard Rated supplies (Tax)</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_vat_abu_dhabi" model="account.tax.report.line">
+        <field name="name">a. Abu Dhabi</field>
+        <field name="tag_name">a. Abu Dhabi</field>
+        <field name="code">STD_RATE_SUPP_TAX_AB</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_vat_dubai" model="account.tax.report.line">
+        <field name="name">b. Dubai</field>
+        <field name="tag_name">b. Dubai</field>
+        <field name="code">STD_RATE_SUPP_TAX_DB</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
+        <field name="sequence" eval="2"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_vat_sharjah" model="account.tax.report.line">
+        <field name="name">c. Sharjah</field>
+        <field name="tag_name">c. Sharjah</field>
+        <field name="code">STD_RATE_SUPP_TAX_SJ</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
+        <field name="sequence" eval="3"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_vat_ajman" model="account.tax.report.line">
+        <field name="name">d. Ajman</field>
+        <field name="tag_name">d. Ajman</field>
+        <field name="code">STD_RATE_SUPP_TAX_AJ</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
+        <field name="sequence" eval="4"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_vat_umm_al_quwain" model="account.tax.report.line">
+        <field name="name">e. Umm Al Quwain</field>
+        <field name="tag_name">e. Umm Al Quwain</field>
+        <field name="code">STD_RATE_SUPP_TAX_UM</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
+        <field name="sequence" eval="5"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_vat_ras_al_khaima" model="account.tax.report.line">
+        <field name="name">f. Ras Al-Khaima</field>
+        <field name="tag_name">f. Ras Al-Khaima</field>
+        <field name="code">STD_RATE_SUPP_TAX_RA</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
+        <field name="sequence" eval="6"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_vat_fujairah" model="account.tax.report.line">
+        <field name="name">g. Fujairah</field>
+        <field name="tag_name">g. Fujairah</field>
+        <field name="code">STD_RATE_SUPP_TAX_FU</field>
+         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
+        <field name="sequence" eval="7"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_supplies_vat_subtotal" model="account.tax.report.line">
+        <field name="name">Sub Total</field>
+        <field name="formula">STD_RATE_SUPP_TAX_AB + STD_RATE_SUPP_TAX_DB + STD_RATE_SUPP_TAX_SJ + STD_RATE_SUPP_TAX_AJ + STD_RATE_SUPP_TAX_UM + STD_RATE_SUPP_TAX_RA + STD_RATE_SUPP_TAX_FU</field>
+        <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
+        <field name="sequence" eval="8"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_tax_refund_tourist_vat" model="account.tax.report.line">
+        <field name="name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field>
+        <field name="tag_name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field>
+        <field name="code">TAX_REF_TOUR_SCHEME_TAX</field>
+        <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
+        <field name="sequence" eval="2"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_supplies_reverse_charge_vat" model="account.tax.report.line">
+        <field name="name">3. Supplies subject to reverse charge provisions</field>
+        <field name="tag_name">3. Supplies subject to reverse charge provisions</field>
+        <field name="code">REVERSE_CHARGE_PRO_TAX</field>
+        <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
+        <field name="sequence" eval="3"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_zero_rated_supplies_vat" model="account.tax.report.line">
+        <field name="name">4. Zero rated supplies</field>
+        <field name="tag_name">4. Zero rated supplies</field>
+        <field name="code">ZERO_RATE_SUPP_TAX</field>
+        <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
+        <field name="sequence" eval="4"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_exempt_supplies_vat" model="account.tax.report.line">
+        <field name="name">5. Exempt supplies</field>
+        <field name="tag_name">5. Exempt supplies</field>
+        <field name="code">EXAMPT_SUPP_TAX</field>
+        <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
+        <field name="sequence" eval="5"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_supplies_out_of_scope_vat" model="account.tax.report.line">
+        <field name="name">6. Out of scope</field>
+        <field name="code">OUT_OF_SCOPE_TAX_0</field>
+        <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
+        <field name="sequence" eval="6"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_import_uae_vat" model="account.tax.report.line">
+        <field name="name">7. Goods imported into the UAE</field>
+        <field name="tag_name">7. Goods imported into the UAE</field>
+        <field name="code">GOODS_IMPORT_IN_UAE_TAX</field>
+        <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
+        <field name="sequence" eval="7"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_adjustment_import_uae_vat" model="account.tax.report.line">
+        <field name="name">8. Adjustments to goods imported into the UAE</field>
+        <field name="code">ADJUST_GOODS_IMPORT_IN_UAE_TAX</field>
+        <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
+        <field name="sequence" eval="8"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_vat_all_sales_total" model="account.tax.report.line">
+        <field name="name">9. Total</field>
+        <field name="formula">(STD_RATE_SUPP_TAX_AB + STD_RATE_SUPP_TAX_DB + STD_RATE_SUPP_TAX_SJ + STD_RATE_SUPP_TAX_AJ + STD_RATE_SUPP_TAX_UM + STD_RATE_SUPP_TAX_RA + STD_RATE_SUPP_TAX_FU) + OUT_OF_SCOPE_TAX_0 + ADJUST_GOODS_IMPORT_IN_UAE_TAX + GOODS_IMPORT_IN_UAE_TAX + EXAMPT_SUPP_TAX + ZERO_RATE_SUPP_TAX + REVERSE_CHARGE_PRO_TAX + TAX_REF_TOUR_SCHEME_TAX</field>
+        <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
+        <field name="sequence" eval="9"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_vat_all_expense" model="account.tax.report.line">
+        <field name="name">VAT on Expenses and all other Inputs (Tax)</field>
+        <field name="sequence" eval="4"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_standard_rated_expense_vat" model="account.tax.report.line">
+        <field name="name">10. Standard rated expenses</field>
+        <field name="tag_name">10. Standard rated expenses</field>
+        <field name="code">STD_RATE_EXPENSES_TAX</field>
+        <field name="parent_id" ref="tax_report_line_vat_all_expense"/>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_expense_supplies_reverse_vat" model="account.tax.report.line">
+        <field name="name">11. Supplies subject to the reverse charge provisions</field>
+        <field name="tag_name">11. Supplies subject to the reverse charge provisions</field>
+        <field name="code">SUPP_REV_CHARGE_PRO_TAX</field>
+        <field name="parent_id" ref="tax_report_line_vat_all_expense"/>
+        <field name="sequence" eval="2"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_expense_out_of_scope_vat" model="account.tax.report.line">
+        <field name="name">12. Out of scope</field>
+        <field name="code">OUT_OF_SCOPE_1_TAX</field>
+        <field name="parent_id" ref="tax_report_line_vat_all_expense"/>
+        <field name="sequence" eval="3"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_vat_all_expense_total" model="account.tax.report.line">
+        <field name="name">13. Totals</field>
+        <field name="formula">OUT_OF_SCOPE_1_TAX + SUPP_REV_CHARGE_PRO_TAX + STD_RATE_EXPENSES_TAX</field>
+        <field name="parent_id" ref="tax_report_line_vat_all_expense"/>
+        <field name="sequence" eval="4"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_net_vat_due" model="account.tax.report.line">
+        <field name="name">Net VAT Due</field>
+        <field name="sequence" eval="5"/>
+        <field name="formula">((STD_RATE_SUPP_TAX_AB + STD_RATE_SUPP_TAX_DB + STD_RATE_SUPP_TAX_SJ + STD_RATE_SUPP_TAX_AJ + STD_RATE_SUPP_TAX_UM + STD_RATE_SUPP_TAX_RA + STD_RATE_SUPP_TAX_FU) + OUT_OF_SCOPE_TAX_0 + ADJUST_GOODS_IMPORT_IN_UAE_TAX + GOODS_IMPORT_IN_UAE_TAX + EXAMPT_SUPP_TAX + ZERO_RATE_SUPP_TAX + REVERSE_CHARGE_PRO_TAX + TAX_REF_TOUR_SCHEME_TAX) - (OUT_OF_SCOPE_1_TAX + SUPP_REV_CHARGE_PRO_TAX + STD_RATE_EXPENSES_TAX)</field>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_total_value_due_tax_period" model="account.tax.report.line">
+        <field name="name">14. Total value of due tax for the period</field>
+        <field name="formula">(STD_RATE_SUPP_TAX_AB + STD_RATE_SUPP_TAX_DB + STD_RATE_SUPP_TAX_SJ + STD_RATE_SUPP_TAX_AJ + STD_RATE_SUPP_TAX_UM + STD_RATE_SUPP_TAX_RA + STD_RATE_SUPP_TAX_FU) + OUT_OF_SCOPE_TAX_0 + ADJUST_GOODS_IMPORT_IN_UAE_TAX + GOODS_IMPORT_IN_UAE_TAX + EXAMPT_SUPP_TAX + ZERO_RATE_SUPP_TAX + REVERSE_CHARGE_PRO_TAX + TAX_REF_TOUR_SCHEME_TAX</field>
+        <field name="parent_id" ref="tax_report_line_net_vat_due"/>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_total_value_recoverable_tax_period" model="account.tax.report.line">
+        <field name="name">15. Total value of recoverable tax for the period</field>
+        <field name="formula">OUT_OF_SCOPE_1_TAX + SUPP_REV_CHARGE_PRO_TAX + STD_RATE_EXPENSES_TAX</field>
+        <field name="parent_id" ref="tax_report_line_net_vat_due"/>
+        <field name="sequence" eval="2"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+    <record id="tax_report_line_net_vat_due_period" model="account.tax.report.line">
+        <field name="name">16. Net VAT due (or reclaimed) for the period</field>
+        <field name="formula">((STD_RATE_SUPP_TAX_AB + STD_RATE_SUPP_TAX_DB + STD_RATE_SUPP_TAX_SJ + STD_RATE_SUPP_TAX_AJ + STD_RATE_SUPP_TAX_UM + STD_RATE_SUPP_TAX_RA + STD_RATE_SUPP_TAX_FU) + OUT_OF_SCOPE_TAX_0 + ADJUST_GOODS_IMPORT_IN_UAE_TAX + GOODS_IMPORT_IN_UAE_TAX + EXAMPT_SUPP_TAX + ZERO_RATE_SUPP_TAX + REVERSE_CHARGE_PRO_TAX + TAX_REF_TOUR_SCHEME_TAX) - (OUT_OF_SCOPE_1_TAX + SUPP_REV_CHARGE_PRO_TAX + STD_RATE_EXPENSES_TAX)</field>
+        <field name="parent_id" ref="tax_report_line_net_vat_due"/>
+        <field name="sequence" eval="3"/>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
+</odoo>
diff --git a/addons/l10n_ae/data/account_tax_template_data.xml b/addons/l10n_ae/data/account_tax_template_data.xml
index 198d573bc10..15ae5ae9869 100644
--- a/addons/l10n_ae/data/account_tax_template_data.xml
+++ b/addons/l10n_ae/data/account_tax_template_data.xml
@@ -1,17 +1,264 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="sale_tax_template" model="account.tax.template">
-        <field name="chart_template_id" ref="uae_chart_template_standard"/>
-        <field name="name">Tax 10%</field>
-        <field name="amount">10</field>
+    <record id="uae_sale_tax_5_dubai" model="account.tax.template">
+        <field name="name">TVA 5% (Dubai)</field>
         <field name="type_tax_use">sale</field>
-        <field name="tax_group_id" ref="tax_group_15"/>
+        <field name="amount">5</field>
+        <field name="amount_type">percent</field>
+        <field name="description">TVA 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),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_dubai')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_dubai')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_dubai')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_dubai')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_5_abu_dhabi" model="account.tax.template">
+        <field name="name">TVA 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="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),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_abu_dhabi')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_abu_dhabi')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_abu_dhabi')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_abu_dhabi')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_5_sharjah" model="account.tax.template">
+        <field name="name">TVA 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="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),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_sharjah')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_sharjah')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_sharjah')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_sharjah')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_5_ajman" model="account.tax.template">
+        <field name="name">TVA 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="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),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_ajman')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_ajman')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_ajman')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_ajman')],
+            }),
+        ]"/>
+    </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="type_tax_use">sale</field>
+        <field name="amount">5</field>
+        <field name="amount_type">percent</field>
+        <field name="description">TVA 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),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_umm_al_quwain')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_umm_al_quwain')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_umm_al_quwain')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_umm_al_quwain')],
+            }),
+        ]"/>
+    </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="type_tax_use">sale</field>
+        <field name="amount">5</field>
+        <field name="amount_type">percent</field>
+        <field name="description">TVA 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),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_ras_al_khaima')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_ras_al_khaima')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_ras_al_khaima')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_ras_al_khaima')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_5_fujairah" model="account.tax.template">
+        <field name="name">TVA 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="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),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_fujairah')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_fujairah')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_base_fujairah')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_fujairah')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_exempted" model="account.tax.template">
+        <field name="name">Exempted Tax</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">0</field>
+        <field name="amount_type">percent</field>
+        <field name="description">Exempted</field>
+        <field name="tax_group_id" ref="ae_tax_group_exempted"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_exempt_supplies_base')],
             }),
-
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
@@ -22,8 +269,8 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_exempt_supplies_base')],
             }),
-
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
@@ -31,22 +278,54 @@
             }),
         ]"/>
     </record>
-    <record id="purchase_tax_template" model="account.tax.template">
+    <record id="uae_sale_tax_0" model="account.tax.template">
+        <field name="name">TVA 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="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),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_zero_rated_supplies_base')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_zero_rated_supplies_base')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+            }),
+        ]"/>
+    </record>
+    <record id="uae_export_tax" model="account.tax.template">
+        <field name="name">Export Tax 0%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">0</field>
+        <field name="amount_type">percent</field>
+        <field name="description">Export Tax</field>
         <field name="chart_template_id" ref="uae_chart_template_standard"/>
-        <field name="name">Purchase Tax 10%</field>
-        <field name="amount">10</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="tax_group_id" ref="tax_group_15"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3726'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -54,11 +333,545 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_reverse_charge_dubai" model="account.tax.template">
+        <field name="name">Reverse Charge Provision (Dubai)</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">5</field>
+        <field name="amount_type">percent</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_dubai')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_dubai')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_dubai')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_dubai')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_reverse_charge_abu_dhabi" model="account.tax.template">
+        <field name="name">Reverse Charge Provision (Abi Dhabi)</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">5</field>
+        <field name="amount_type">percent</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_abu_dhabi')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_abu_dhabi')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_abu_dhabi')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_abu_dhabi')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_reverse_charge_sharjah" model="account.tax.template">
+        <field name="name">Reverse Charge Provision (Sharjah)</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">5</field>
+        <field name="amount_type">percent</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_sharjah')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_sharjah')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_sharjah')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_sharjah')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_reverse_charge_ajman" model="account.tax.template">
+        <field name="name">Reverse Charge Provision (Ajman)</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">5</field>
+        <field name="amount_type">percent</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_ajman')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_ajman')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_ajman')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_ajman')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_reverse_charge_umm_al_quwain" model="account.tax.template">
+        <field name="name">Reverse Charge Provision (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">Supplies subject to reverse charge provisions</field>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_umm_al_quwain')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_umm_al_quwain')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_umm_al_quwain')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_umm_al_quwain')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_reverse_charge_ras_al_khaima" model="account.tax.template">
+        <field name="name">Reverse Charge Provision (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">Supplies subject to reverse charge provisions</field>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_ras_al_khaima')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_ras_al_khaima')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_ras_al_khaima')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_ras_al_khaima')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_reverse_charge_fujairah" model="account.tax.template">
+        <field name="name">Reverse Charge Provision (Fujairah)</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">5</field>
+        <field name="amount_type">percent</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_fujairah')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_fujairah')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_base'),ref('tax_report_line_standard_rated_supplies_base_fujairah')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3785'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_supplies_vat_fujairah')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_sale_tax_tourist_refund" model="account.tax.template">
+        <field name="name">Tourist Refund scheme 5%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">5.0</field>
+        <field name="amount_type">percent</field>
+        <field name="description">Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_tax_refund_tourist_base')],
+            }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_tax_refund_tourist_vat')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_tax_refund_tourist_base')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_tax_refund_tourist_vat')],
+            }),
+        ]"/>
+    </record>
+    <!-- purchase taxes -->
+    <record id="uae_purchase_tax_5" model="account.tax.template">
+        <field name="name">TVA 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="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),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_expense_base')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_expense_base')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_purchase_tax_exempted" model="account.tax.template">
+        <field name="name">Exempted Tax</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0</field>
+        <field name="amount_type">percent</field>
+        <field name="description">Exempted Tax</field>
+        <field name="tax_group_id" ref="ae_tax_group_exempted"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_exempt_supplies_vat')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_exempt_supplies_vat')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_purchase_tax_0" model="account.tax.template">
+        <field name="name">TVA 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="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),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_zero_rated_supplies_vat')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_zero_rated_supplies_vat')],
+            }),
+        ]"/>
+    </record>
+    <record id="uae_import_tax" model="account.tax.template">
+        <field name="name">Import Tax 5%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">5</field>
+        <field name="amount_type">percent</field>
+        <field name="description">Import Tax</field>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_import_uae_base')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'plus_report_line_ids': [ref('tax_report_line_import_uae_vat')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_import_uae_base')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'minus_report_line_ids': [ref('tax_report_line_import_uae_vat')],
+            }),
+        ]"/>
+    </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>
+        <field name="amount">5</field>
+        <field name="amount_type">percent</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'minus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_vat')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('uae_account_3726'),
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
             }),
         ]"/>
     </record>
diff --git a/addons/l10n_ae/data/fiscal_templates_data.xml b/addons/l10n_ae/data/fiscal_templates_data.xml
new file mode 100644
index 00000000000..14a68c1863e
--- /dev/null
+++ b/addons/l10n_ae/data/fiscal_templates_data.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="account_fiscal_position_dubai" model="account.fiscal.position.template">
+        <field name="name">Dubai</field>
+        <field name="auto_apply" eval="True"/>
+        <field name="sequence">16</field>
+        <field name="country_id" ref="base.ae"/>
+        <field name="state_ids" eval="[(6,0,[ref('base.state_ae_du')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </record>
+
+    <record id="account_fiscal_position_abu_dhabi" model="account.fiscal.position.template">
+        <field name="name">Abu Dhabi</field>
+        <field name="auto_apply" eval="True"/>
+        <field name="sequence">16</field>
+        <field name="country_id" ref="base.ae"/>
+        <field name="state_ids" eval="[(6,0,[ref('base.state_ae_az')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </record>
+    <record id="account_fiscal_position_abu_dhabi_01" model="account.fiscal.position.tax.template">
+        <field name="tax_src_id" ref="uae_sale_tax_5_dubai"/>
+        <field name="tax_dest_id" ref="uae_sale_tax_5_abu_dhabi"/>
+        <field name="position_id" ref="account_fiscal_position_abu_dhabi"/>
+    </record>
+
+    <record id="account_fiscal_position_sharjah" model="account.fiscal.position.template">
+        <field name="name">Sharjah</field>
+        <field name="auto_apply" eval="True"/>
+        <field name="sequence">16</field>
+        <field name="country_id" ref="base.ae"/>
+        <field name="state_ids" eval="[(6,0,[ref('base.state_ae_sh')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </record>
+    <record id="account_fiscal_position_sharjah_01" model="account.fiscal.position.tax.template">
+        <field name="tax_src_id" ref="uae_sale_tax_5_dubai"/>
+        <field name="tax_dest_id" ref="uae_sale_tax_5_sharjah"/>
+        <field name="position_id" ref="account_fiscal_position_sharjah"/>
+    </record>
+
+    <record id="account_fiscal_position_ajman" model="account.fiscal.position.template">
+        <field name="name">Ajman</field>
+        <field name="auto_apply" eval="True"/>
+        <field name="sequence">16</field>
+        <field name="country_id" ref="base.ae"/>
+        <field name="state_ids" eval="[(6,0,[ref('base.state_ae_aj')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </record>
+    <record id="account_fiscal_position_ajman_01" model="account.fiscal.position.tax.template">
+        <field name="tax_src_id" ref="uae_sale_tax_5_dubai"/>
+        <field name="tax_dest_id" ref="uae_sale_tax_5_ajman"/>
+        <field name="position_id" ref="account_fiscal_position_ajman"/>
+    </record>
+
+    <record id="account_fiscal_position_umm_al_quwain" model="account.fiscal.position.template">
+        <field name="name">Umm Al Quwain</field>
+        <field name="auto_apply" eval="True"/>
+        <field name="sequence">16</field>
+        <field name="country_id" ref="base.ae"/>
+        <field name="state_ids" eval="[(6,0,[ref('base.state_ae_uq')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </record>
+    <record id="account_fiscal_position_umm_al_quwain_01" model="account.fiscal.position.tax.template">
+        <field name="tax_src_id" ref="uae_sale_tax_5_dubai"/>
+        <field name="tax_dest_id" ref="uae_sale_tax_5_umm_al_quwain"/>
+        <field name="position_id" ref="account_fiscal_position_umm_al_quwain"/>
+    </record>
+
+    <record id="account_fiscal_position_ras_al_khaima" model="account.fiscal.position.template">
+        <field name="name">Ras Al-Khaima</field>
+        <field name="auto_apply" eval="True"/>
+        <field name="sequence">16</field>
+        <field name="country_id" ref="base.ae"/>
+        <field name="state_ids" eval="[(6,0,[ref('base.state_ae_rk')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </record>
+    <record id="account_fiscal_position_ras_al_khaima_01" model="account.fiscal.position.tax.template">
+        <field name="tax_src_id" ref="uae_sale_tax_5_dubai"/>
+        <field name="tax_dest_id" ref="uae_sale_tax_5_ras_al_khaima"/>
+        <field name="position_id" ref="account_fiscal_position_ras_al_khaima"/>
+    </record>
+
+    <record id="account_fiscal_position_fujairah" model="account.fiscal.position.template">
+        <field name="name">Fujairah</field>
+        <field name="auto_apply" eval="True"/>
+        <field name="sequence">16</field>
+        <field name="country_id" ref="base.ae"/>
+        <field name="state_ids" eval="[(6,0,[ref('base.state_ae_fu')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </record>
+    <record id="account_fiscal_position_fujairah_01" model="account.fiscal.position.tax.template">
+        <field name="tax_src_id" ref="uae_sale_tax_5_dubai"/>
+        <field name="tax_dest_id" ref="uae_sale_tax_5_fujairah"/>
+        <field name="position_id" ref="account_fiscal_position_fujairah"/>
+    </record>
+
+    <record id="account_fiscal_position_non_uae_countries" model="account.fiscal.position.template">
+        <field name="name">Non-UAE</field>
+        <field name="sequence">20</field>
+        <field name="auto_apply" eval="True"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </record>
+    <record id="acccount_fiscal_position_tax_non_uae_01" model="account.fiscal.position.tax.template">
+        <field name="tax_src_id" ref="uae_sale_tax_5_dubai"/>
+        <field name="tax_dest_id" ref="uae_sale_tax_0"/>
+        <field name="position_id" ref="account_fiscal_position_non_uae_countries"/>
+    </record>
+    <record id="acccount_fiscal_position_tax_non_uae_02" model="account.fiscal.position.tax.template">
+        <field name="tax_src_id" ref="uae_purchase_tax_5"/>
+        <field name="tax_dest_id" ref="uae_purchase_tax_0"/>
+        <field name="position_id" ref="account_fiscal_position_non_uae_countries"/>
+    </record>
+</odoo>
diff --git a/addons/l10n_ae/data/l10n_ae_chart_data.xml b/addons/l10n_ae/data/l10n_ae_chart_data.xml
index 0c8202a34f2..eb648164386 100644
--- a/addons/l10n_ae/data/l10n_ae_chart_data.xml
+++ b/addons/l10n_ae/data/l10n_ae_chart_data.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <menuitem id="account_reports_ae_statements_menu" name="UAE" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/>
+
      <record id="uae_chart_template_standard" model="account.chart.template">
          <field name="name">U.A.E Chart of Accounts - Standard</field>
          <field name="code_digits">6</field>
@@ -7,6 +9,6 @@
          <field name="cash_account_code_prefix">105</field>
          <field name="transfer_account_code_prefix">100</field>
          <field name="currency_id" ref="base.AED" />
-         <field name="complete_tax_set" eval="False"/>
+         <field name="complete_tax_set" eval="True"/>
      </record>
 </odoo>
diff --git a/addons/l10n_ae/data/l10n_ae_data.xml b/addons/l10n_ae/data/l10n_ae_data.xml
new file mode 100644
index 00000000000..94692698ecd
--- /dev/null
+++ b/addons/l10n_ae/data/l10n_ae_data.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- set VAT label to show on invoice report -->
+    <record id="base.ae" model="res.country">
+        <field name="vat_label">TRN</field>
+    </record>
+    <record id="base.AED" model="res.currency">
+        <field name="symbol">AED</field>
+    </record>
+    <record id="gcc_countries_group" model="res.country.group">
+        <field name="name">GCC VAT implementing States</field>
+        <field name="country_ids" eval="[(6,0,[ref('base.ae'),ref('base.sa'),ref('base.bh')])]"/>
+    </record>
+</odoo>
diff --git a/addons/l10n_ae/views/report_invoice_templates.xml b/addons/l10n_ae/views/report_invoice_templates.xml
new file mode 100644
index 00000000000..681fe038284
--- /dev/null
+++ b/addons/l10n_ae/views/report_invoice_templates.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="report_invoice_document" inherit_id="account.report_invoice_document">
+        <xpath expr="//p[@name='payment_term']" position="after">
+            <p t-if="o.company_id.country_id.code == 'AE' and o.partner_id.country_id.code != 'AE' and o.env.ref('l10n_ae.gcc_countries_group') in o.partner_id.country_id.country_group_ids">
+                Supply between <b>United Arad Emirates</b> and <b><span t-field="o.partner_id.country_id.name"/></b>
+            </p>
+        </xpath>
+        <xpath expr="//h2/span" position="before">
+            <span t-if="o.company_id.country_id.code == 'AE' and o.type in ['out_invoice', 'out_refund']">Tax</span>
+        </xpath>
+
+        <xpath expr="//div[hasclass('clearfix')]" position="after">
+            <div t-if="o.company_id.country_id.code == 'AE' and o.currency_id != o.company_id.currency_id" id="aed_amounts" class="row clearfix ml-auto my-3 text-nowrap table">
+                <t t-set="aed_rate" t-value="o.env['res.currency']._get_conversion_rate(o.currency_id, o.company_id.currency_id, o.company_id, o.date_invoice or datetime.date.today())"/>
+                <div name="exchange_rate" class="col-auto">
+                    <strong>Exchange Rate</strong>
+                    <p class="m-0" t-esc="aed_rate" t-options='{"widget": "float", "precision": 5}'/>
+                </div>
+                <div name="aed_subtotal" class="col-auto">
+                    <strong>Subtotal (AED)</strong>
+                    <p class="m-0" t-esc="o.amount_untaxed_signed" t-options='{"widget": "monetary", "display_currency": o.company_currency_id}'/>
+                </div>
+                <div name="aed_vat_amount" class="col-auto">
+                    <strong>Tax Amount (AED)</strong>
+                    <p class="m-0" t-esc="o.currency_id._convert(o.amount_tax, o.company_id.currency_id, o.company_id, o.date_invoice or datetime.date.today())" t-options='{"widget": "monetary", "display_currency": o.company_currency_id}'/>
+                </div>
+                <div name="aed_total" class="col-auto">
+                    <strong>Total (AED)</strong>
+                    <p class="m-0" t-esc="o.amount_total_company_signed" t-options='{"widget": "monetary", "display_currency": o.company_currency_id}'/>
+                </div>
+            </div>
+        </xpath>
+    </template>
+</odoo>