[IMP] account, l10n_*: v13 taxes

- Add repartition lines on taxes

- Link account tags directly to account.move.line; remove the tag_ids field from account.tag

- Add a new report engine dedicated to tax reports, directly generating account tags. It is called as an alternate mode of generic tax report, with a dedicated "Use tax grids" toggle.

>> The biggest change lies in the way the new tax report computes its values.
Everything is now aggregated directly using the tags set on the account move lines. Thanks to that,
modifying the configuration of a tax today will not impact the report for the previous periods anymore.
This is a big improvement, as it means the report will keep on reflecting the values that were submitted
to the state before, whatever the configuration change.

- Add an audit char field to account.move.line telling with tax grids are impacted by the line, with the corresponding amount

- Modify the behavior of cash basis taxes: the cash basis account is now used as the transition account, while the regular account given in tax declaration is used to store the final entry (it was the opposite before)

- Modify every l10n_* module in order to keep them consistent with these changes

closes odoo/odoo#32833

Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>

3 files changed, 848 insertions, 492 deletions

diff --git a/addons/l10n_sg/__manifest__.py b/addons/l10n_sg/__manifest__.py
index 461c6fa5be0..b48e83a55d7 100644
--- a/addons/l10n_sg/__manifest__.py
+++ b/addons/l10n_sg/__manifest__.py
@@ -22,6 +22,7 @@ This module add, for accounting:
     'data': [
         'data/l10n_sg_chart_data.xml',
         'data/account_data.xml',
+        'data/account_tax_report_data.xml',
         'data/account_tax_data.xml',
         'data/account_chart_template_data.xml',
         'views/account_invoice_view.xml',
diff --git a/addons/l10n_sg/data/account_tax_data.xml b/addons/l10n_sg/data/account_tax_data.xml
index 3ca0a064296..e6eda67eee5 100644
--- a/addons/l10n_sg/data/account_tax_data.xml
+++ b/addons/l10n_sg/data/account_tax_data.xml
@@ -1,518 +1,754 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
+        <!-- Sales Tax -->
+        <record id="sg_sale_tax_es_0" model="account.tax.template">
+            <field name="name">Sales Tax 0% ES33</field>
+            <field name="description">0% ES33</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_exempt_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_791'),
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_exempt_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_791'),
+                    }),
+                ]"/>
+        </record>
 
-    <!-- Account Tags -->
-    <record id="tag_sg_01" model="account.account.tag">
-        <field name="name">Chart of Singapore</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_02" model="account.account.tag">
-        <field name="name">Tax Balance To Pay</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_03" model="account.account.tag">
-        <field name="name">Tax Received</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_04" model="account.account.tag">
-        <field name="name">Tax Received @ 0%</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_05" model="account.account.tag">
-        <field name="name">Tax Received @ 7% SR</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_06" model="account.account.tag">
-        <field name="name">Tax Received @ 7% DS</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_07" model="account.account.tag">
-        <field name="name">Tax Paid</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_08" model="account.account.tag">
-        <field name="name">Tax Paid @ 7% TX7</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_09" model="account.account.tag">
-        <field name="name">Tax Paid @ 7% TX-N33</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_10" model="account.account.tag">
-        <field name="name">Tax Paid @ 7% TX-E33</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_11" model="account.account.tag">
-        <field name="name">Tax Paid @ 7% BL</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_12" model="account.account.tag">
-        <field name="name">Tax Paid @ 7% IM</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_13" model="account.account.tag">
-        <field name="name">Tax Paid @ 7% TX-RE</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_14" model="account.account.tag">
-        <field name="name">Tax Paid @ 7% IGDS</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_15" model="account.account.tag">
-        <field name="name">Tax Paid @ 0% NR</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_16" model="account.account.tag">
-        <field name="name">Tax Paid @ 0% ZP</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_17" model="account.account.tag">
-        <field name="name">MES Purchase Tax</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_18" model="account.account.tag">
-        <field name="name">Out of Scope Taxes</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_19" model="account.account.tag">
-        <field name="name">Out of Scope Purchase Tax</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_20" model="account.account.tag">
-        <field name="name">Out of Scope Sales Tax</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_21" model="account.account.tag">
-        <field name="name">Exempted Taxes</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_22" model="account.account.tag">
-        <field name="name">Exempted Purchase Tax</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_23" model="account.account.tag">
-        <field name="name">Exempted Sales Tax ES33</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_24" model="account.account.tag">
-        <field name="name">Exempted Sales Tax ESN33</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_25" model="account.account.tag">
-        <field name="name">Tax Bases</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_26" model="account.account.tag">
-        <field name="name">Base of Taxed Sales</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_27" model="account.account.tag">
-        <field name="name">Sales 7% Standard</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_28" model="account.account.tag">
-        <field name="name">Sales 7% Standard SR</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_29" model="account.account.tag">
-        <field name="name">Sales 7% Standard DS</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_30" model="account.account.tag">
-        <field name="name">Sales 0% Standard</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_31" model="account.account.tag">
-        <field name="name">Sales Exempted</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_32" model="account.account.tag">
-        <field name="name">Sales Exempted ES33</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_33" model="account.account.tag">
-        <field name="name">Sales Exempted ESN33</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_34" model="account.account.tag">
-        <field name="name">Base of Taxed Purchases</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_35" model="account.account.tag">
-        <field name="name">Purchase 7% Standard TX7</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_36" model="account.account.tag">
-        <field name="name">Purchase 7% Standard TX-N33</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_37" model="account.account.tag">
-        <field name="name">Purchase 7% Standard TX-E33</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_38" model="account.account.tag">
-        <field name="name">Purchase 7% Standard BL</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_39" model="account.account.tag">
-        <field name="name">Purchase 7% Standard IM</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_40" model="account.account.tag">
-        <field name="name">Purchase 7% Standard TX-RE</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_41" model="account.account.tag">
-        <field name="name">Purchase 7% Standard IGDS</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_42" model="account.account.tag">
-        <field name="name">Purchase 0% Standard NR</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_43" model="account.account.tag">
-        <field name="name">Purchase 0% Standard ZP</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_44" model="account.account.tag">
-        <field name="name">Purchase Imports Under MES</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_45" model="account.account.tag">
-        <field name="name">Purchase Exempted</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_46" model="account.account.tag">
-        <field name="name">Purchase Out Of Scope</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_47" model="account.account.tag">
-        <field name="name">Sales Out Of Scope</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_48" model="account.account.tag">
-        <field name="name">Tax Received SRCA-S</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_49" model="account.account.tag">
-        <field name="name">Tax Received @ 7% SRCA-C</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_50" model="account.account.tag">
-        <field name="name">Tax Paid @ 7% TXCA</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_51" model="account.account.tag">
-        <field name="name">Sales Standard SRCA-S</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_52" model="account.account.tag">
-        <field name="name">Sales 7% Standard SRCA-C</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_sg_53" model="account.account.tag">
-        <field name="name">Purchase 7% Standard TXCA</field>
-        <field name="applicability">taxes</field>
-    </record>
+        <record id="sg_sale_tax_ds_7" model="account.tax.template">
+            <field name="name">Sales Tax 7% DS</field>
+            <field name="description">7% DS</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">7</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_std_rated_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_792'),
+                        'plus_report_line_ids': [ref('account_tax_report_line_output_tax_due')],
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_std_rated_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_792'),
+                        'minus_report_line_ids': [ref('account_tax_report_line_output_tax_due')],
+                    }),
+                ]"/>
+        </record>
 
-    <!-- Sales Tax -->
+        <record id="sg_sale_tax_esn_0" model="account.tax.template">
+            <field name="name">Sales Tax 0% ESN33</field>
+            <field name="description">0% ESN33</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_exempt_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_793'),
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_exempt_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_793'),
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_sale_tax_es_0" model="account.tax.template">
-        <field name="name">Sales Tax 0% ES33</field>
-        <field name="description">0% ES33</field>
-        <field name="price_include" eval="0"/>
-        <field name="amount">0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_id" ref="account_account_791"/>
-        <field name="refund_account_id" ref="account_account_791"/>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_23'),ref('tag_sg_32')])]"/>
-        <field name="tax_group_id" ref="tax_group_0"/>
-    </record>
+        <record id="sg_sale_tax_os_0" model="account.tax.template">
+            <field name="name">Sales Tax 0% OS</field>
+            <field name="description">0% OS</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <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('account_account_794'),
+                    }),
+                ]"/>
+            <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('account_account_794'),
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_sale_tax_ds_7" model="account.tax.template">
-        <field name="name">Sales Tax 7% DS</field>
-        <field name="description">7% DS</field>
-        <field name="price_include" eval="0"/>
-        <field name="amount">7</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_id" ref="account_account_792"/>
-        <field name="refund_account_id" ref="account_account_792"/>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_06'), ref('tag_sg_29')])]"/>
-        <field name="tax_group_id" ref="tax_group_7"/>
-    </record>
+        <record id="sg_sale_tax_zr_0" model="account.tax.template">
+            <field name="name">Sales Tax 0% ZR</field>
+            <field name="description">0% ZR</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_zero_rated_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_795'),
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_zero_rated_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_795'),
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_sale_tax_esn_0" model="account.tax.template">
-        <field name="name">Sales Tax 0% ESN33</field>
-        <field name="description">0% ESN33</field>
-        <field name="price_include" eval="0"/>
-        <field name="amount">0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_id" ref="account_account_793"/>
-        <field name="refund_account_id" ref="account_account_793"/>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_24'),ref('tag_sg_33')])]"/>
-        <field name="tax_group_id" ref="tax_group_0"/>
-    </record>
+        <record id="sg_sale_tax_sr_7" model="account.tax.template">
+            <field name="name">Sales Tax 7% SR</field>
+            <field name="description">7% SR</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">7</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_std_rated_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_796'),
+                        'plus_report_line_ids': [ref('account_tax_report_line_output_tax_due')],
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_std_rated_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_796'),
+                        'minus_report_line_ids': [ref('account_tax_report_line_output_tax_due')],
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_sale_tax_os_0" model="account.tax.template">
-        <field name="name">Sales Tax 0% OS</field>
-        <field name="description">0% OS</field>
-        <field name="price_include" eval="0"/>
-        <field name="amount">0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_id" ref="account_account_794"/>
-        <field name="refund_account_id" ref="account_account_794"/>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_20'),ref('tag_sg_47')])]"/>
-        <field name="tax_group_id" ref="tax_group_0"/>
-    </record>
+        <record id="sg_sale_tax_srca_s_na" model="account.tax.template">
+            <field name="name">Sales Tax SRCA-S</field>
+            <field name="description">SRCA-S</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_std_rated_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_797'),
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_std_rated_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_797'),
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_sale_tax_zr_0" model="account.tax.template">
-        <field name="name">Sales Tax 0% ZR</field>
-        <field name="description">0% ZR</field>
-        <field name="price_include" eval="0"/>
-        <field name="amount">0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_id" ref="account_account_795"/>
-        <field name="refund_account_id" ref="account_account_795"/>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_04'), ref('tag_sg_30')])]"/>
-        <field name="tax_group_id" ref="tax_group_0"/>
-    </record>
+        <record id="sg_sale_tax_srca_c_7" model="account.tax.template">
+            <field name="name">Sales Tax 7% SRCA-C</field>
+            <field name="description">7% SRCA-C</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">7</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_std_rated_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_798'),
+                        'plus_report_line_ids': [ref('account_tax_report_line_output_tax_due')],
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_std_rated_supplies')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_798'),
+                        'minus_report_line_ids': [ref('account_tax_report_line_output_tax_due')],
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_sale_tax_sr_7" model="account.tax.template">
-        <field name="name">Sales Tax 7% SR</field>
-        <field name="description">7% SR</field>
-        <field name="price_include" eval="0"/>
-        <field name="amount">7</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_id" ref="account_account_796"/>
-        <field name="refund_account_id" ref="account_account_796"/>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_05'),ref('tag_sg_28')])]"/>
-        <field name="tax_group_id" ref="tax_group_7"/>
-    </record>
+        <!-- Purchases Tax -->
 
-    <record id="sg_sale_tax_srca_s_na" model="account.tax.template">
-        <field name="name">Sales Tax SRCA-S</field>
-        <field name="description">SRCA-S</field>
-        <field name="price_include" eval="0"/>
-        <field name="amount">0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_id" ref="account_account_797"/>
-        <field name="refund_account_id" ref="account_account_797"/>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_48'),ref('tag_sg_51')])]"/>
-        <field name="tax_group_id" ref="tax_group_0"/>
-    </record>
+        <record id="sg_purchase_tax_txn33_7" model="account.tax.template">
+            <field name="name">Purchase Tax 7% TX-N33</field>
+            <field name="description">7% TX-N33</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">7</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_738'),
+                        'plus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_738'),
+                        'minus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_sale_tax_srca_c_7" model="account.tax.template">
-        <field name="name">Sales Tax 7% SRCA-C</field>
-        <field name="description">7% SRCA-C</field>
-        <field name="price_include" eval="0"/>
-        <field name="amount">7</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_id" ref="account_account_798"/>
-        <field name="refund_account_id" ref="account_account_798"/>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_49'),ref('tag_sg_52')])]"/>
-        <field name="tax_group_id" ref="tax_group_7"/>
-    </record>
+        <record id="sg_purchase_tax_txe33_7" model="account.tax.template">
+            <field name="name">Purchase Tax 7% TX-E33</field>
+            <field name="description">7% TX-E33</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">7</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_739'),
+                        'plus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_739'),
+                        'minus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+        </record>
 
-    <!-- Purchases Tax -->
+        <record id="sg_purchase_tax_bl_7" model="account.tax.template">
+            <field name="name">Purchase Tax 7% BL</field>
+            <field name="description">7% BL</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">7</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+            <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('account_account_740'),
+                    }),
+                ]"/>
+            <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('account_account_740'),
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_purchase_tax_txn33_7" model="account.tax.template">
-        <field name="name">Purchase Tax 7% TX-N33</field>
-        <field name="description">7% TX-N33</field>
-        <field name="account_id" ref="account_account_738"/>
-        <field name="refund_account_id" ref="account_account_738"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">7</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_09'), ref('tag_sg_36')])]"/>
-        <field name="tax_group_id" ref="tax_group_7"/>
-    </record>
+        <record id="sg_purchase_tax_im_7" model="account.tax.template">
+            <field name="name">Purchase Tax 7% IM</field>
+            <field name="description">7% IM</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">7</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_741'),
+                        'plus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_741'),
+                        'minus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_purchase_tax_txe33_7" model="account.tax.template">
-        <field name="name">Purchase Tax 7% TX-E33</field>
-        <field name="description">7% TX-E33</field>
-        <field name="account_id" ref="account_account_739"/>
-        <field name="refund_account_id" ref="account_account_739"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">7</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_10'),ref('tag_sg_37')])]"/>
-        <field name="tax_group_id" ref="tax_group_7"/>
-    </record>
+        <record id="sg_purchase_tax_txre_7" model="account.tax.template">
+            <field name="name">Purchase Tax 7% TX-RE</field>
+            <field name="description">7% TX-RE</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">7</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_742'),
+                        'plus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_742'),
+                        'minus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_purchase_tax_bl_7" model="account.tax.template">
-        <field name="name">Purchase Tax 7% BL</field>
-        <field name="description">7% BL</field>
-        <field name="account_id" ref="account_account_740"/>
-        <field name="refund_account_id" ref="account_account_740"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">7</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_11'),ref('tag_sg_38')])]"/>
-        <field name="tax_group_id" ref="tax_group_7"/>
-    </record>
+        <record id="sg_purchase_tax_me_0" model="account.tax.template">
+            <field name="name">Purchase Tax 7% IGDS</field>
+            <field name="description">7% IGDS</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">7</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_743'),
+                        'plus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_743'),
+                        'minus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_purchase_tax_im_7" model="account.tax.template">
-        <field name="name">Purchase Tax 7% IM</field>
-        <field name="description">7% IM</field>
-        <field name="account_id" ref="account_account_741"/>
-        <field name="refund_account_id" ref="account_account_741"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">7</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_12'),ref('tag_sg_39')])]"/>
-        <field name="tax_group_id" ref="tax_group_7"/>
-    </record>
+        <record id="sg_purchase_tax_nr_0" model="account.tax.template">
+            <field name="name">Purchase Tax 0% NR</field>
+            <field name="description">0% NR</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <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('account_account_744'),
+                    }),
+                ]"/>
+            <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('account_account_744'),
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_purchase_tax_txre_7" model="account.tax.template">
-        <field name="name">Purchase Tax 7% TX-RE</field>
-        <field name="description">7% TX-RE</field>
-        <field name="account_id" ref="account_account_742"/>
-        <field name="refund_account_id" ref="account_account_742"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">7</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_13'),ref('tag_sg_40')])]"/>
-        <field name="tax_group_id" ref="tax_group_7"/>
-    </record>
+        <record id="sg_purchase_tax_zp_0" model="account.tax.template">
+            <field name="name">Purchase Tax 0% ZP</field>
+            <field name="description">0% ZP</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_745'),
+                        'plus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_745'),
+                        'minus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_purchase_tax_me_0" model="account.tax.template">
-        <field name="name">Purchase Tax 7% IGDS</field>
-        <field name="description">7% IGDS</field>
-        <field name="account_id" ref="account_account_743"/>
-        <field name="refund_account_id" ref="account_account_743"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">7</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_14'),ref('tag_sg_41')])]"/>
-        <field name="tax_group_id" ref="tax_group_7"/>
-    </record>
+        <record id="sg_purchase_tax_op_0" model="account.tax.template">
+            <field name="name">Purchase Tax 0% OP</field>
+            <field name="description">0% OP</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <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('account_account_746'),
+                    }),
+                ]"/>
+            <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('account_account_746'),
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_purchase_tax_nr_0" model="account.tax.template">
-        <field name="name">Purchase Tax 0% NR</field>
-        <field name="description">0% NR</field>
-        <field name="account_id" ref="account_account_744"/>
-        <field name="refund_account_id" ref="account_account_744"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_15'),ref('tag_sg_42')])]"/>
-        <field name="tax_group_id" ref="tax_group_0"/>
-    </record>
+        <record id="sg_purchase_tax_ep_0" model="account.tax.template">
+            <field name="name">Purchase Tax 0% EP</field>
+            <field name="description">0% EP</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <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('account_account_747'),
+                    }),
+                ]"/>
+            <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('account_account_747'),
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_purchase_tax_zp_0" model="account.tax.template">
-        <field name="name">Purchase Tax 0% ZP</field>
-        <field name="description">0% ZP</field>
-        <field name="account_id" ref="account_account_745"/>
-        <field name="refund_account_id" ref="account_account_745"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_16'),ref('tag_sg_43')])]"/>
-        <field name="tax_group_id" ref="tax_group_0"/>
-    </record>
+        <record id="sg_purchase_tax_mes_0" model="account.tax.template">
+            <field name="name">Purchase Tax MES</field>
+            <field name="description">0% MES</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_applicable_goods_imported_value')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_748'),
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_applicable_goods_imported_value')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_748'),
+                    }),
+                ]"/>
+        </record>
 
-    <record id="sg_purchase_tax_op_0" model="account.tax.template">
-        <field name="name">Purchase Tax 0% OP</field>
-        <field name="description">0% OP</field>
-        <field name="account_id" ref="account_account_746"/>
-        <field name="refund_account_id" ref="account_account_746"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_19'),ref('tag_sg_46')])]"/>
-        <field name="tax_group_id" ref="tax_group_0"/>
-    </record>
-
-    <record id="sg_purchase_tax_ep_0" model="account.tax.template">
-        <field name="name">Purchase Tax 0% EP</field>
-        <field name="description">0% EP</field>
-        <field name="account_id" ref="account_account_747"/>
-        <field name="refund_account_id" ref="account_account_747"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_22'),ref('tag_sg_45')])]"/>
-        <field name="tax_group_id" ref="tax_group_0"/>
-    </record>
-
-    <record id="sg_purchase_tax_mes_0" model="account.tax.template">
-        <field name="name">Purchase Tax MES</field>
-        <field name="description">0% MES</field>
-        <field name="account_id" ref="account_account_748"/>
-        <field name="refund_account_id" ref="account_account_748"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_17'),ref('tag_sg_44')])]"/>
-        <field name="tax_group_id" ref="tax_group_0"/>
-    </record>
-
-    <record id="sg_purchase_tax_tx7_7" model="account.tax.template">
-        <field name="name">Purchase Tax 7% TX7</field>
-        <field name="description">7% TX7</field>
-        <field name="account_id" ref="account_account_749"/>
-        <field name="refund_account_id" ref="account_account_749"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">7</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_08'),ref('tag_sg_35')])]"/>
-        <field name="tax_group_id" ref="tax_group_7"/>
-    </record>
-
-    <record id="sg_purchase_tax_txca_7" model="account.tax.template">
-        <field name="name">Purchase Tax 7% TXCA</field>
-        <field name="description">7% TXCA</field>
-        <field name="account_id" ref="account_account_750"/>
-        <field name="refund_account_id" ref="account_account_750"/>
-        <field name="price_include" eval="0"/>
-        <field name="amount">7</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_50'),ref('tag_sg_53')])]"/>
-        <field name="tax_group_id" ref="tax_group_7"/>
-    </record>
+        <record id="sg_purchase_tax_tx7_7" model="account.tax.template">
+            <field name="name">Purchase Tax 7% TX7</field>
+            <field name="description">7% TX7</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">7</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_749'),
+                        'plus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_749'),
+                        'minus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+        </record>
 
+        <record id="sg_purchase_tax_txca_7" model="account.tax.template">
+            <field name="name">Purchase Tax 7% TXCA</field>
+            <field name="description">7% TXCA</field>
+            <field name="price_include" eval="0"/>
+            <field name="amount">7</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+            <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'plus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_750'),
+                        'plus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'base',
+                        'minus_report_line_ids': [ref('account_tax_report_line_total_taxable_purchases')],
+                    }),
+                    (0,0, {
+                        'factor_percent': 100,
+                        'repartition_type': 'tax',
+                        'account_id': ref('account_account_750'),
+                        'minus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
+                    }),
+                ]"/>
+        </record>
     </data>
 </odoo>
diff --git a/addons/l10n_sg/data/account_tax_report_data.xml b/addons/l10n_sg/data/account_tax_report_data.xml
new file mode 100644
index 00000000000..26e8509b486
--- /dev/null
+++ b/addons/l10n_sg/data/account_tax_report_data.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="account_tax_report_line_supplies" model="account.tax.report.line">
+            <field name="name">Supplies</field>
+            <field name="sequence" eval="1"/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_std_rated_supplies" model="account.tax.report.line">
+            <field name="name">Box 1 - Total value of standard-rated supplies</field>
+            <field name="tag_name">Box 1</field>
+            <field name="code">BOX1</field>
+            <field name="sequence" eval="1"/>
+            <field name="parent_id" ref='account_tax_report_line_supplies'/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_zero_rated_supplies" model="account.tax.report.line">
+            <field name="name">Box 2 - Total value of zero-rated supplies</field>
+            <field name="tag_name">Box 2</field>
+            <field name="code">BOX2</field>
+            <field name="sequence" eval="2"/>
+            <field name="parent_id" ref='account_tax_report_line_supplies'/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_exempt_supplies" model="account.tax.report.line">
+            <field name="name">Box 3 - Total value of exempt supplies</field>
+            <field name="tag_name">Box 3</field>
+            <field name="code">BOX3</field>
+            <field name="sequence" eval="3"/>
+            <field name="parent_id" ref='account_tax_report_line_supplies'/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_total_supplies" model="account.tax.report.line">
+            <field name="name">Box 4 - Total value of (1) + (2) + (3)</field>
+            <field name="sequence" eval="4"/>
+            <field name="formula">BOX1 + BOX2 + BOX3</field>
+            <field name="parent_id" ref='account_tax_report_line_supplies'/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_purchases" model="account.tax.report.line">
+            <field name="name">Purchases</field>
+            <field name="sequence" eval="2"/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_total_taxable_purchases" model="account.tax.report.line">
+            <field name="name">Box 5 - Total value of taxable purchases</field>
+            <field name="tag_name">Box 5</field>
+            <field name="sequence" eval="1"/>
+            <field name="parent_id" ref='account_tax_report_line_purchases'/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_taxes" model="account.tax.report.line">
+            <field name="name">Taxes</field>
+            <field name="sequence" eval="3"/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_output_tax_due" model="account.tax.report.line">
+            <field name="name">Box 6 - Output tax due</field>
+            <field name="tag_name">Box 6</field>
+            <field name="code">BOX6</field>
+            <field name="sequence" eval="1"/>
+            <field name="parent_id" ref='account_tax_report_line_taxes'/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_inp_tax_refund_claim" model="account.tax.report.line">
+            <field name="name">Box 7 - Less : Input tax and refunds claimed</field>
+            <field name="tag_name">Box 7</field>
+            <field name="code">BOX7</field>
+            <field name="parent_id" ref='account_tax_report_line_taxes'/>
+            <field name="sequence" eval="2"/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_total_gst_paid_iras" model="account.tax.report.line">
+            <field name="name">Box 8 - Equals : Net GST to be paid to IRAS</field>
+            <field name="sequence" eval="3"/>
+            <field name="formula">BOX6 - BOX7</field>
+            <field name="parent_id" ref='account_tax_report_line_taxes'/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_applicable" model="account.tax.report.line">
+            <field name="name">Applicable to Taxable Persons under Major Exported Scheme / Approved 3rd Party Logistics Company / Other Approved Schemes Only</field>
+            <field name="sequence" eval="4"/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_applicable_goods_imported_value" model="account.tax.report.line">
+            <field name="name">Box 9 - Total value of goods imported under this scheme</field>
+            <field name="tag_name">Box 9</field>
+            <field name="sequence" eval="1"/>
+            <field name="parent_id" ref="account_tax_report_line_applicable"/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_revenues" model="account.tax.report.line">
+            <field name="name">Revenue</field>
+            <field name="sequence" eval="6"/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+
+        <record id="account_tax_report_line_revenues_accounting_period" model="account.tax.report.line">
+            <field name="name">Box 13 - Revenue for the accounting period</field>
+            <field name="sequence" eval="1"/>
+            <field name="formula">net_profit</field>
+            <field name="parent_id" ref="account_tax_report_line_revenues"/>
+            <field name="country_id" ref="base.sg"/>
+        </record>
+    </data>
+</odoo>