diff --git a/addons/l10n_au/data/account_fiscal_position_tax_template_data.xml b/addons/l10n_au/data/account_fiscal_position_tax_template_data.xml
index bf721d7ee1e..0da65f9b855 100644
--- a/addons/l10n_au/data/account_fiscal_position_tax_template_data.xml
+++ b/addons/l10n_au/data/account_fiscal_position_tax_template_data.xml
@@ -34,4 +34,122 @@
             <field name="tax_src_id" ref="au_tax_purchase_capital"/>
             <field name="tax_dest_id" ref="au_tax_purchase_0"/>
         </record>
+
+        <record id="fiscal_position_tpar_partner" model="account.fiscal.position.template">
+            <field name="name">TPAR</field>
+            <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_10_service" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner"/>
+            <field name="tax_src_id" ref="au_tax_purchase_10_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_10_service_tpar"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_inc_10_service" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner"/>
+            <field name="tax_src_id" ref="au_tax_purchase_inc_10_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_inc_10_service_tpar"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_capital_service" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner"/>
+            <field name="tax_src_id" ref="au_tax_purchase_capital_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_capital_service_tpar"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_0_service" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner"/>
+            <field name="tax_src_id" ref="au_tax_purchase_0_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_0_service_tpar"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_0_service" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner"/>
+            <field name="tax_src_id" ref="au_tax_purchase_0_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_0_service_tpar"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_input_service" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner"/>
+            <field name="tax_src_id" ref="au_tax_purchase_input_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_input_service_tpar"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_private_service" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner"/>
+            <field name="tax_src_id" ref="au_tax_purchase_private_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_private_service_tpar"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_gst_only_service" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner"/>
+            <field name="tax_src_id" ref="au_tax_purchase_gst_only_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_gst_only_service_tpar"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_adj_service" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner"/>
+            <field name="tax_src_id" ref="au_tax_purchase_adj_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_adj_service_tpar"/>
+        </record>
+
+        <record id="fiscal_position_tpar_partner_no_abn" model="account.fiscal.position.template">
+            <field name="name">TPAR without ABN</field>
+            <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_10_service_no_abn" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner_no_abn"/>
+            <field name="tax_src_id" ref="au_tax_purchase_10_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_10_service_tpar_no_abn"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_inc_10_service_no_abn" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner_no_abn"/>
+            <field name="tax_src_id" ref="au_tax_purchase_inc_10_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_inc_10_service_tpar_no_abn"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_capital_service_no_abn" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner_no_abn"/>
+            <field name="tax_src_id" ref="au_tax_purchase_capital_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_capital_service_tpar_no_abn"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_0_service_no_abn" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner_no_abn"/>
+            <field name="tax_src_id" ref="au_tax_purchase_0_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_0_service_tpar_no_abn"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_0_service_no_abn" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner_no_abn"/>
+            <field name="tax_src_id" ref="au_tax_purchase_0_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_0_service_tpar_no_abn"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_input_service_no_abn" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner_no_abn"/>
+            <field name="tax_src_id" ref="au_tax_purchase_input_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_input_service_tpar_no_abn"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_private_service_no_abn" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner_no_abn"/>
+            <field name="tax_src_id" ref="au_tax_purchase_private_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_private_service_tpar_no_abn"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_gst_only_service_no_abn" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner_no_abn"/>
+            <field name="tax_src_id" ref="au_tax_purchase_gst_only_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_gst_only_service_tpar_no_abn"/>
+        </record>
+
+        <record id="fiscal_position_au_tax_purchase_adj_service_no_abn" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tpar_partner_no_abn"/>
+            <field name="tax_src_id" ref="au_tax_purchase_adj_service"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_adj_service_tpar_no_abn"/>
+        </record>
 </odoo>
diff --git a/addons/l10n_au/data/account_tax_template_data.xml b/addons/l10n_au/data/account_tax_template_data.xml
index a7d45802d6a..01a72ac58a8 100644
--- a/addons/l10n_au/data/account_tax_template_data.xml
+++ b/addons/l10n_au/data/account_tax_template_data.xml
@@ -1,7 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <record id="service_tag" model="account.account.tag">
+        <field name="name">Service</field>
+        <field name="applicability">taxes</field>
+        <field name="country_id" ref="base.au"/>
+    </record>
 
-     <record id="au_tax_sale_10" model="account.tax.template">
+    <record id="tax_withheld_tag" model="account.account.tag">
+        <field name="name">Tax Withheld</field>
+        <field name="applicability">taxes</field>
+        <field name="country_id" ref="base.au"/>
+    </record>
+
+    <record id="au_tax_witheld" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Tax Withheld</field>
+        <field name="sequence">1000</field>
+        <field name="description">Tax Withheld for Partners without ABN</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">-47.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21380'),
+                    'tag_ids': [(4, ref('tax_withheld_tag'))],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21380'),
+                    'tag_ids': [(4, ref('tax_withheld_tag'))],
+                }),
+            ]"/>
+    </record>
+
+    <record id="au_tax_sale_10" model="account.tax.template">
         <field name="chart_template_id" ref="l10n_au_chart_template"/>
         <field name="name">Sale (10%)</field>
         <field name="sequence">1</field>
@@ -223,6 +270,7 @@
         <field name="sequence">1</field>
         <field name="description">GST Purchases</field>
         <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">consu</field>
         <field name="amount_type">percent</field>
         <field name="amount">10.0</field>
         <field name="price_include" eval="0"/>
@@ -254,12 +302,103 @@
                 }),
             ]"/>
     </record>
+    <record id="au_tax_purchase_10_service" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch (10%)</field>
+        <field name="sequence">1</field>
+        <field name="description">GST Purchases</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_comparison_gl')],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_comparison_gl')],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_10_service_tpar" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch (10%) TPAR</field>
+        <field name="sequence">1</field>
+        <field name="description">GST Purchases</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_comparison_gl')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_comparison_gl')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_10_service_tpar_no_abn" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch (10%) TPAR without ABN</field>
+        <field name="sequence">1</field>
+        <field name="description">GST Purchases</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount">100</field>
+        <field name="amount_type">group</field>
+        <field name="children_tax_ids" eval="[(6,0,[ref('au_tax_purchase_10_service_tpar'), ref('au_tax_witheld')])]"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+    </record>
     <record id="au_tax_purchase_inc_10" model="account.tax.template">
         <field name="chart_template_id" ref="l10n_au_chart_template"/>
         <field name="name">GST Inc Purch (10%)</field>
         <field name="sequence">2</field>
         <field name="description">GST Inclusive Purchases</field>
         <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">consu</field>
         <field name="amount_type">percent</field>
         <field name="amount">10.0</field>
         <field name="price_include" eval="1"/>
@@ -291,12 +430,103 @@
                 }),
             ]"/>
     </record>
+    <record id="au_tax_purchase_inc_10_service" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">GST Inc Purch (10%)</field>
+        <field name="sequence">2</field>
+        <field name="description">GST Inclusive Purchases</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="1"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_comparison_gl')],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_comparison_gl')],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_inc_10_service_tpar" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">GST Inc Purch (10%) TPAR</field>
+        <field name="sequence">2</field>
+        <field name="description">GST Inclusive Purchases</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="1"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_comparison_gl')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_comparison_gl')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_inc_10_service_tpar_no_abn" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">GST Inc Purch (10%) TPAR without ABN</field>
+        <field name="sequence">2</field>
+        <field name="description">GST Inclusive Purchases</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount">100</field>
+        <field name="amount_type">group</field>
+        <field name="children_tax_ids" eval="[(6,0,[ref('au_tax_purchase_inc_10_service_tpar'), ref('au_tax_witheld')])]"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+    </record>
     <record id="au_tax_purchase_capital" model="account.tax.template">
         <field name="chart_template_id" ref="l10n_au_chart_template"/>
         <field name="name">Capital (10.0%)</field>
         <field name="sequence">3</field>
         <field name="description">Capital Purchases</field>
         <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">consu</field>
         <field name="amount_type">percent</field>
         <field name="amount">10.0</field>
         <field name="price_include" eval="0"/>
@@ -328,12 +558,103 @@
                 }),
             ]"/>
     </record>
+    <record id="au_tax_purchase_capital_service" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Capital (10.0%)</field>
+        <field name="sequence">3</field>
+        <field name="description">Capital Purchases</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g10')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g10'), ref('account_tax_report_gstrpt_comparison_gl')],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g10')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g10'), ref('account_tax_report_gstrpt_comparison_gl')],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_capital_service_tpar" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Capital (10.0%) TPAR</field>
+        <field name="sequence">3</field>
+        <field name="description">Capital Purchases</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g10')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g10'), ref('account_tax_report_gstrpt_comparison_gl')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g10')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g10'), ref('account_tax_report_gstrpt_comparison_gl')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_capital_service_tpar_no_abn" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Capital (10%) TPAR without ABN</field>
+        <field name="sequence">3</field>
+        <field name="description">Capital Purchases</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount">100</field>
+        <field name="amount_type">group</field>
+        <field name="children_tax_ids" eval="[(6,0,[ref('au_tax_purchase_capital_service_tpar'), ref('au_tax_witheld')])]"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+    </record>
     <record id="au_tax_purchase_0" model="account.tax.template">
         <field name="chart_template_id" ref="l10n_au_chart_template"/>
         <field name="name">Zero Rated Purch</field>
         <field name="sequence">4</field>
         <field name="description">Capital Purchases</field>
         <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">consu</field>
         <field name="amount_type">percent</field>
         <field name="amount">0</field>
         <field name="price_include" eval="0"/>
@@ -361,115 +682,95 @@
                 }),
             ]"/>
     </record>
+    <record id="au_tax_purchase_0_service" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Zero Rated Purch</field>
+        <field name="sequence">4</field>
+        <field name="description">Capital Purchases</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_0"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_0_service_tpar" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Zero Rated Purch TPAR</field>
+        <field name="sequence">4</field>
+        <field name="description">Capital Purchases</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_0"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_0_service_tpar_no_abn" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Zero Rated Purch TPAR without ABN</field>
+        <field name="sequence">4</field>
+        <field name="description">Capital Purchases</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount">100</field>
+        <field name="amount_type">group</field>
+        <field name="children_tax_ids" eval="[(6,0,[ref('au_tax_purchase_0_service_tpar'), ref('au_tax_witheld')])]"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+    </record>
     <record id="au_tax_purchase_taxable_import" model="account.tax.template">
         <field name="chart_template_id" ref="l10n_au_chart_template"/>
         <field name="name">Purch (Taxable Imports)</field>
         <field name="sequence">5</field>
         <field name="description">Purchase (Taxable Imports) - Tax Paid Separately</field>
         <field name="type_tax_use">purchase</field>
-        <field name="amount_type">percent</field>
-        <field name="amount">0</field>
-        <field name="price_include" eval="0"/>
-        <field name="tax_group_id" ref="tax_group_gst_0"/>
-        <field name="invoice_repartition_line_ids" eval="[
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                }),
-            ]"/>
-        <field name="refund_repartition_line_ids" eval="[
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                }),
-            ]"/>
-    </record>
-    <record id="au_tax_purchase_input" model="account.tax.template">
-        <field name="chart_template_id" ref="l10n_au_chart_template"/>
-        <field name="name">Purch for Input Sales</field>
-        <field name="sequence">6</field>
-        <field name="description">Purchases for Input Taxed Sales</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="amount_type">percent</field>
-        <field name="amount">10.0</field>
-        <field name="price_include" eval="0"/>
-        <field name="tax_group_id" ref="tax_group_gst_10"/>
-        <field name="invoice_repartition_line_ids" eval="[
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
-                }),
-            ]"/>
-        <field name="refund_repartition_line_ids" eval="[
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
-                }),
-            ]"/>
-    </record>
-    <record id="au_tax_purchase_private" model="account.tax.template">
-        <field name="chart_template_id" ref="l10n_au_chart_template"/>
-        <field name="name">Purch Private (10%)</field>
-        <field name="sequence">7</field>
-        <field name="description">Purchases for Private use or not deductible</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="amount_type">percent</field>
-        <field name="amount">10.0</field>
-        <field name="price_include" eval="0"/>
-        <field name="tax_group_id" ref="tax_group_gst_10"/>
-        <field name="invoice_repartition_line_ids" eval="[
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
-                }),
-            ]"/>
-        <field name="refund_repartition_line_ids" eval="[
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
-                }),
-            ]"/>
-    </record>
-    <record id="au_tax_purchase_gst_only" model="account.tax.template">
-        <field name="chart_template_id" ref="l10n_au_chart_template"/>
-        <field name="name">GST Only on Imports</field>
-        <field name="sequence">8</field>
-        <field name="description">GST Only on Imports</field>
-        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">consu</field>
         <field name="amount_type">percent</field>
         <field name="amount">100000000000</field>
         <!--
@@ -483,6 +784,366 @@
         -->
         <field name="price_include" eval="1"/>
         <field name="tax_group_id" ref="tax_group_gst_100000000"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_taxable_import_service" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch (Taxable Imports)</field>
+        <field name="sequence">5</field>
+        <field name="description">Purchase (Taxable Imports) - Tax Paid Separately</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">100000000000</field>
+        <field name="price_include" eval="1"/>
+        <field name="tax_group_id" ref="tax_group_gst_100000000"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_taxable_import_service_tpar" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch (Taxable Imports) TPAR</field>
+        <field name="sequence">5</field>
+        <field name="description">Purchase (Taxable Imports) - Tax Paid Separately</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">100000000000</field>
+        <field name="price_include" eval="1"/>
+        <field name="tax_group_id" ref="tax_group_gst_100000000"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_taxable_import_service_tpar_no_abn" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch (Taxable Imports) TPAR without ABN</field>
+        <field name="sequence">5</field>
+        <field name="description">Purchase (Taxable Imports) - Tax Paid Separately</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount">100</field>
+        <field name="amount_type">group</field>
+        <field name="children_tax_ids" eval="[(6,0,[ref('au_tax_purchase_taxable_import_service_tpar'), ref('au_tax_witheld')])]"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+    </record>
+    <record id="au_tax_purchase_input" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch for Input Sales</field>
+        <field name="sequence">6</field>
+        <field name="description">Purchases for Input Taxed Sales</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">consu</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_input_service" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch for Input Sales</field>
+        <field name="sequence">6</field>
+        <field name="description">Purchases for Input Taxed Sales</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_input_service_tpar" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch for Input Sales TPAR</field>
+        <field name="sequence">6</field>
+        <field name="description">Purchases for Input Taxed Sales</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_input_service_tpar_no_abn" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch for Input Sales TPAR without ABN</field>
+        <field name="sequence">6</field>
+        <field name="description">Purchases for Input Taxed Sales</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount">100</field>
+        <field name="amount_type">group</field>
+        <field name="children_tax_ids" eval="[(6,0,[ref('au_tax_purchase_input_service_tpar'), ref('au_tax_witheld')])]"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+    </record>
+    <record id="au_tax_purchase_private" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch Private (10%)</field>
+        <field name="sequence">7</field>
+        <field name="description">Purchases for Private use or not deductible</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">consu</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_private_service" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch Private (10%)</field>
+        <field name="sequence">7</field>
+        <field name="description">Purchases for Private use or not deductible</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_private_service_tpar" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch Private (10%) TPAR</field>
+        <field name="sequence">7</field>
+        <field name="description">Purchases for Private use or not deductible</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_private_service_tpar_no_abn" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch Private (10%) TPAR without ABN</field>
+        <field name="sequence">7</field>
+        <field name="description">Purchases for Private use or not deductible</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount">100</field>
+        <field name="amount_type">group</field>
+        <field name="children_tax_ids" eval="[(6,0,[ref('au_tax_purchase_private_service_tpar'), ref('au_tax_witheld')])]"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+    </record>
+    <record id="au_tax_purchase_gst_only" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">GST Only on Imports</field>
+        <field name="sequence">8</field>
+        <field name="description">GST Only on Imports</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">consu</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">100000000</field>
+        <field name="price_include" eval="1"/>
+        <field name="tax_group_id" ref="tax_group_gst_100000000"/>
         <field name="invoice_repartition_line_ids" eval="[
                 (0,0, {
                     'factor_percent': 100,
@@ -508,12 +1169,99 @@
                 }),
             ]"/>
     </record>
+    <record id="au_tax_purchase_gst_only_service" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">GST Only on Imports</field>
+        <field name="sequence">8</field>
+        <field name="description">GST Only on Imports</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">100000000</field>
+        <field name="price_include" eval="1"/>
+        <field name="tax_group_id" ref="tax_group_gst_100000000"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_gstonly'), ref('account_tax_report_gstrpt_comparison_gl')],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_gstonly'), ref('account_tax_report_gstrpt_comparison_gl')],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_gst_only_service_tpar" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">GST Only on Imports TPAR</field>
+        <field name="sequence">8</field>
+        <field name="description">GST Only on Imports</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">100000000</field>
+        <field name="price_include" eval="1"/>
+        <field name="tax_group_id" ref="tax_group_gst_100000000"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_gstonly'), ref('account_tax_report_gstrpt_comparison_gl')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_gstonly'), ref('account_tax_report_gstrpt_comparison_gl')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_gst_only_service_tpar_no_abn" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">GST Only on Imports TPAR without ABN</field>
+        <field name="sequence">8</field>
+        <field name="description">GST Only on Imports</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount">100</field>
+        <field name="amount_type">group</field>
+        <field name="children_tax_ids" eval="[(6,0,[ref('au_tax_purchase_gst_only_service_tpar'), ref('au_tax_witheld')])]"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+    </record>
     <record id="au_tax_purchase_adj" model="account.tax.template">
         <field name="chart_template_id" ref="l10n_au_chart_template"/>
         <field name="name">Purch Adj (10%)</field>
         <field name="sequence">9</field>
         <field name="description">Tax Adjustments (Purchases)</field>
         <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">consu</field>
         <field name="amount_type">percent</field>
         <field name="amount">10.0</field>
         <field name="price_include" eval="0"/>
@@ -545,5 +1293,95 @@
                 }),
             ]"/>
     </record>
+    <record id="au_tax_purchase_adj_service" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch Adj (10%)</field>
+        <field name="sequence">9</field>
+        <field name="description">Tax Adjustments (Purchases)</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g18')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g18'), ref('account_tax_report_gstrpt_comparison_gl')],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g18')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g18'), ref('account_tax_report_gstrpt_comparison_gl')],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_adj_service_tpar" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch Adj (10%) TPAR</field>
+        <field name="sequence">9</field>
+        <field name="description">Tax Adjustments (Purchases)</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10.0</field>
+        <field name="price_include" eval="0"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+        <field name="invoice_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g18')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g18'), ref('account_tax_report_gstrpt_comparison_gl')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+        <field name="refund_repartition_line_ids" eval="[
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g18')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('au_21330'),
+                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g18'), ref('account_tax_report_gstrpt_comparison_gl')],
+                    'tag_ids': [(4, ref('service_tag'))],
+                }),
+            ]"/>
+    </record>
+    <record id="au_tax_purchase_adj_service_tpar_no_abn" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_au_chart_template"/>
+        <field name="name">Purch Adj (10%) TPAR without ABN</field>
+        <field name="sequence">9</field>
+        <field name="description">Tax Adjustments (Purchases)</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="amount">100</field>
+        <field name="amount_type">group</field>
+        <field name="children_tax_ids" eval="[(6,0,[ref('au_tax_purchase_adj_service_tpar'), ref('au_tax_witheld')])]"/>
+        <field name="tax_group_id" ref="tax_group_gst_10"/>
+    </record>
 
  </odoo>