diff --git a/addons/l10n_ae/__manifest__.py b/addons/l10n_ae/__manifest__.py
index d9542262df7..bc5da58dfe3 100644
--- a/addons/l10n_ae/__manifest__.py
+++ b/addons/l10n_ae/__manifest__.py
@@ -14,11 +14,14 @@ 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_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_template_data.xml b/addons/l10n_ae/data/account_tax_template_data.xml
index eb60fb97ba8..b7299572170 100644
--- a/addons/l10n_ae/data/account_tax_template_data.xml
+++ b/addons/l10n_ae/data/account_tax_template_data.xml
@@ -1,21 +1,339 @@
 <?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="tag_ae_01_dubai" model="account.account.tag">
+        <field name="name">Output VAT 5% (Dubai)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_01_abu_dhabi" model="account.account.tag">
+        <field name="name">Output VAT 5% (Abu Dhabi)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_01_sharjah" model="account.account.tag">
+        <field name="name">Output VAT 5% (Sharjah)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_01_ajman" model="account.account.tag">
+        <field name="name">Output VAT 5% (Ajman)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_01_umm_al_quwain" model="account.account.tag">
+        <field name="name">Output VAT 5% (Umm Al Quwain)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_01_ras_al_khaima" model="account.account.tag">
+        <field name="name">Output VAT 5% (Ras Al-Khaima)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_01_fujairah" model="account.account.tag">
+        <field name="name">Output VAT 5% (Fujairah)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_02" model="account.account.tag">
+        <field name="name">Input VAT 5%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_03" model="account.account.tag">
+        <field name="name">Exempted Output VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_04" model="account.account.tag">
+        <field name="name">Exempted Input VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_05" model="account.account.tag">
+        <field name="name">Output VAT 0%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_06" model="account.account.tag">
+        <field name="name">Input VAT 0%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_07" model="account.account.tag">
+        <field name="name">Import VAT 5%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_08" model="account.account.tag">
+        <field name="name">Export VAT 0%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_09" model="account.account.tag">
+        <field name="name">Reverse Charge TVA -5%(sales)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_10" model="account.account.tag">
+        <field name="name">Reverse Charge TVA -5%(purchase)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ae_11" model="account.account.tag">
+        <field name="name">Tourist Refund scheme 5%</field>
+        <field name="applicability">taxes</field>
+    </record>
+
+    <!-- account.tax.template -->
+    <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="amount">5</field>
+        <field name="amount_type">percent</field>
+        <field name="description">TVA 5%</field>
         <field name="account_id" ref="uae_account_3785"/>
         <field name="refund_account_id" ref="uae_account_3785"/>
-        <field name="tax_group_id" ref="tax_group_15"/>
-    </record>
-    <record id="purchase_tax_template" model="account.tax.template">
+        <field name="tax_group_id" ref="ae_tax_group_5"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_01_dubai')])]"/>
         <field name="chart_template_id" ref="uae_chart_template_standard"/>
-        <field name="name">Purchase Tax 10%</field>
-        <field name="amount">10</field>
+    </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="account_id" ref="uae_account_3785"/>
+        <field name="refund_account_id" ref="uae_account_3785"/>
+        <field name="tax_group_id" ref="ae_tax_group_5"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_01_abu_dhabi')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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="account_id" ref="uae_account_3785"/>
+        <field name="refund_account_id" ref="uae_account_3785"/>
+        <field name="tax_group_id" ref="ae_tax_group_5"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_01_sharjah')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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="account_id" ref="uae_account_3785"/>
+        <field name="refund_account_id" ref="uae_account_3785"/>
+        <field name="tax_group_id" ref="ae_tax_group_5"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_01_ajman')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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="account_id" ref="uae_account_3785"/>
+        <field name="refund_account_id" ref="uae_account_3785"/>
+        <field name="tax_group_id" ref="ae_tax_group_5"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_01_umm_al_quwain')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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="account_id" ref="uae_account_3785"/>
+        <field name="refund_account_id" ref="uae_account_3785"/>
+        <field name="tax_group_id" ref="ae_tax_group_5"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_01_ras_al_khaima')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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="account_id" ref="uae_account_3785"/>
+        <field name="refund_account_id" ref="uae_account_3785"/>
+        <field name="tax_group_id" ref="ae_tax_group_5"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_01_fujairah')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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="account_id" ref="uae_account_3785"/>
+        <field name="refund_account_id" ref="uae_account_3785"/>
+        <field name="tax_group_id" ref="ae_tax_group_exempted"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_03')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </record>
+    <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="account_id" ref="uae_account_3785"/>
+        <field name="refund_account_id" ref="uae_account_3785"/>
+        <field name="tax_group_id" ref="ae_tax_group_0"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_05')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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="tag_ids" eval="[(6,0,[ref('tag_ae_08')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </record>
+    <record id="uae_sale_tax_reverse_charge_5" model="account.tax.template">
+        <field name="name">Reverse Charge TVA -5%(Sale)</field>
+        <field name="type_tax_use">none</field>
+        <field name="amount">-5.0</field>
+        <field name="amount_type">percent</field>
+        <field name="refund_account_id" ref="uae_account_3726"/>
+        <field name="account_id" ref="uae_account_3726"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_09')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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">0.0</field>
+        <field name="amount_type">group</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="children_tax_ids" eval="[(6, 0, [ref('uae_sale_tax_reverse_charge_5'), ref('uae_sale_tax_5_dubai')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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">0.0</field>
+        <field name="amount_type">group</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="children_tax_ids" eval="[(6, 0, [ref('uae_sale_tax_reverse_charge_5'), ref('uae_sale_tax_5_abu_dhabi')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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">0.0</field>
+        <field name="amount_type">group</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="children_tax_ids" eval="[(6, 0, [ref('uae_sale_tax_reverse_charge_5'), ref('uae_sale_tax_5_sharjah')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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">0.0</field>
+        <field name="amount_type">group</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="children_tax_ids" eval="[(6, 0, [ref('uae_sale_tax_reverse_charge_5'), ref('uae_sale_tax_5_ajman')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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">0.0</field>
+        <field name="amount_type">group</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="children_tax_ids" eval="[(6, 0, [ref('uae_sale_tax_reverse_charge_5'), ref('uae_sale_tax_5_umm_al_quwain')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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">0.0</field>
+        <field name="amount_type">group</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="children_tax_ids" eval="[(6, 0, [ref('uae_sale_tax_reverse_charge_5'), ref('uae_sale_tax_5_ras_al_khaima')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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">0.0</field>
+        <field name="amount_type">group</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="children_tax_ids" eval="[(6, 0, [ref('uae_sale_tax_reverse_charge_5'), ref('uae_sale_tax_5_fujairah')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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="refund_account_id" ref="uae_account_3726"/>
+        <field name="account_id" ref="uae_account_3726"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_11')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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="account_id" ref="uae_account_3726"/>
         <field name="refund_account_id" ref="uae_account_3726"/>
-        <field name="tax_group_id" ref="tax_group_15"/>
+        <field name="tax_group_id" ref="ae_tax_group_5"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_02')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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="account_id" ref="uae_account_3726"/>
+        <field name="refund_account_id" ref="uae_account_3726"/>
+        <field name="tax_group_id" ref="ae_tax_group_exempted"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_04')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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="account_id" ref="uae_account_3726"/>
+        <field name="refund_account_id" ref="uae_account_3726"/>
+        <field name="tax_group_id" ref="ae_tax_group_0"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_06')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </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="tag_ids" eval="[(6,0,[ref('tag_ae_07')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
+    </record>
+    <record id="uae_purchase_tax_reverse_charge_5" model="account.tax.template">
+        <field name="name">Reverse Charge TVA -5%(Purchase)</field>
+        <field name="type_tax_use">none</field>
+        <field name="amount">-5.0</field>
+        <field name="amount_type">percent</field>
+        <field name="refund_account_id" ref="uae_account_3726"/>
+        <field name="account_id" ref="uae_account_3726"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_ae_10')])]"/>
+        <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>
+        <field name="amount">0.0</field>
+        <field name="amount_type">group</field>
+        <field name="description">Supplies subject to reverse charge provisions</field>
+        <field name="children_tax_ids" eval="[(6, 0, [ref('uae_purchase_tax_reverse_charge_5'), ref('uae_purchase_tax_5')])]"/>
+        <field name="chart_template_id" ref="uae_chart_template_standard"/>
     </record>
 </odoo>
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..2579a2ad720
--- /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="auto_apply" eval="True"/>
+        <field name="sequence">20</field>
+        <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>