[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>

4 files changed, 1601 insertions, 738 deletions

diff --git a/addons/l10n_nl/__manifest__.py b/addons/l10n_nl/__manifest__.py
index a002287fee3..ca40d5392ee 100644
--- a/addons/l10n_nl/__manifest__.py
+++ b/addons/l10n_nl/__manifest__.py
@@ -22,6 +22,7 @@
         'data/account_chart_template_post_data.xml',
         'data/res.country.state.csv',
         'data/account_data.xml',
+        'data/account_tax_report_data.xml',
         'data/account_tax_template.xml',
         'data/account_fiscal_position_template.xml',
         'data/account_fiscal_position_tax_template.xml',
diff --git a/addons/l10n_nl/data/account_account_tag.xml b/addons/l10n_nl/data/account_account_tag.xml
index f5519a03ee2..07718eb7b92 100644
--- a/addons/l10n_nl/data/account_account_tag.xml
+++ b/addons/l10n_nl/data/account_account_tag.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
+    <data noupdate="0">
 
         <!-- Account Tags -->
         <record id="account_tag_1" model="account.account.tag">
@@ -136,165 +136,6 @@
             <field name="applicability">accounts</field>
         </record>
 
-        <!-- Tax Tags -->
-        <record id="tag_nl_01" model="account.account.tag">
-            <field name="name">Gegevens omzet</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_02" model="account.account.tag">
-            <field name="name">Rubriek 1: Prestaties binnenland</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_03" model="account.account.tag">
-            <field name="name">1a. Leveringen/diensten belast met hoog tarief (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_04" model="account.account.tag">
-            <field name="name">Leveringen/diensten belast met hoog tarief (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_05" model="account.account.tag">
-            <field name="name">1b. Leveringen/diensten belast met laag tarief (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_06" model="account.account.tag">
-            <field name="name">1c. Leveringen/diensten belast met overige tarieven, behalve 0% (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_07" model="account.account.tag">
-            <field name="name">1d. Privégebruik (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_08" model="account.account.tag">
-            <field name="name">1e. Leveringen/diensten belast met 0% of niet bij u belast (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_09" model="account.account.tag">
-            <field name="name">Rubriek 2: Verleggingsregelingen binnenland (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_10" model="account.account.tag">
-            <field name="name">2a. Leveringen/diensten waarbij de omzetbelasting naar u is verlegd (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_11" model="account.account.tag">
-            <field name="name">Rubriek 3: Prestaties naar of in het buitenland (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_12" model="account.account.tag">
-            <field name="name">3a. Leveringen naar landen buiten de EU (uitvoer) (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <!-- Keep tag_nl_40 & tag_nl_41 to avoid migration issue. -->
-        <record id="tag_nl_40" model="account.account.tag">
-            <field name="name">3b. Leveringen naar of diensten in landen binnen de EU (omzet) (producten)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_41" model="account.account.tag">
-            <field name="name">3b. Leveringen naar of diensten in landen binnen de EU (omzet) (diensten)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_14" model="account.account.tag">
-            <field name="name">3c. Installatie/afstandsverkopen binnen de EU (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_15" model="account.account.tag">
-            <field name="name">Rubriek 4: Prestaties vanuit het buitenland aan u verricht (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_16" model="account.account.tag">
-            <field name="name">4a. Leveringen/diensten uit landen buiten de EU (invoer) (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_17" model="account.account.tag">
-            <field name="name">4b. Leveringen/diensten uit landen binnen de EU (omzet)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_18" model="account.account.tag">
-            <field name="name">Gegevens omzetbelasting (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_19" model="account.account.tag">
-            <field name="name">Rubriek 1: Prestaties binnenland (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_20" model="account.account.tag">
-            <field name="name">1a. Leveringen/diensten belast met 21% (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_21" model="account.account.tag">
-            <field name="name">Leveringen/diensten belast met hoog tarief (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_22" model="account.account.tag">
-            <field name="name">1b. Leveringen/diensten belast met laag tarief (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_23" model="account.account.tag">
-            <field name="name">1c. Leveringen/diensten belast met overige tarieven, behalve 0% (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_24" model="account.account.tag">
-            <field name="name">1d. Privégebruik (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_25" model="account.account.tag">
-            <field name="name">1e. Leveringen/diensten belast met 0% of niet bij u belast (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_26" model="account.account.tag">
-            <field name="name">Rubriek 2: Verleggingsregelingen binnenland (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_27" model="account.account.tag">
-            <field name="name">2a. Leveringen/diensten waarbij de omzetbelasting naar u is verlegd (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_28" model="account.account.tag">
-            <field name="name">Rubriek 4: Prestaties vanuit het buitenland aan u verricht (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_29" model="account.account.tag">
-            <field name="name">4a. Leveringen/diensten uit landen buiten de EU (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_30" model="account.account.tag">
-            <field name="name">4b. Leveringen/diensten uit landen binnen de EU (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_31" model="account.account.tag">
-            <field name="name">Rubriek 5: Voorbelasting, kleineondernemersregeling en totaal (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_32" model="account.account.tag">
-            <field name="name">5a. Verschuldigde omzetbelasting (rubrieken 1a t/m 4b) (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_33" model="account.account.tag">
-            <field name="name">5b. Voorbelasting (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_35" model="account.account.tag">
-            <field name="name">5c. Subtotaal (rubriek 5a min 5b) (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_36" model="account.account.tag">
-            <field name="name">5d. Vermindering volgens de kleineondernemersregeling (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_37" model="account.account.tag">
-            <field name="name">5e. Schatting vorige aangifte(n) (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_38" model="account.account.tag">
-            <field name="name">5f. Schatting deze aangifte (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tag_nl_39" model="account.account.tag">
-            <field name="name">5g. Totaal te betalen/terug te vragen (BTW)</field>
-            <field name="applicability">taxes</field>
-        </record>
-
     </data>
 </odoo>
 
diff --git a/addons/l10n_nl/data/account_tax_report_data.xml b/addons/l10n_nl/data/account_tax_report_data.xml
new file mode 100644
index 00000000000..f6cd13d6336
--- /dev/null
+++ b/addons/l10n_nl/data/account_tax_report_data.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="tax_report_rub_1" model="account.tax.report.line">
+        <field name="name">Rubriek 1: Prestaties binnenland</field>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_1a" model="account.tax.report.line">
+        <field name="name">1a. Leveringen/diensten belast met hoog tarief (omzet)</field>
+        <field name="tag_name">1a (omzet)</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="tax_report_rub_1"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_1b" model="account.tax.report.line">
+        <field name="name">1b. Leveringen/diensten belast met laag tarief (omzet)</field>
+        <field name="tag_name">1b (omzet)</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="tax_report_rub_1"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_1c" model="account.tax.report.line">
+        <field name="name">1c. Leveringen/diensten belast met overige tarieven behalve 0% (omzet)</field>
+        <field name="tag_name">1c (omzet)</field>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref="tax_report_rub_1"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_1d" model="account.tax.report.line">
+        <field name="name">1d. Privégebruik (omzet)</field>
+        <field name="tag_name">1d (omzet)</field>
+        <field name="sequence" eval="4"/>
+        <field name="parent_id" ref="tax_report_rub_1"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_1e" model="account.tax.report.line">
+        <field name="name">1e. Leveringen/diensten belast met 0% of niet bij u belast (omzet)</field>
+        <field name="tag_name">1e (omzet)</field>
+        <field name="sequence" eval="5"/>
+        <field name="parent_id" ref="tax_report_rub_1"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_2" model="account.tax.report.line">
+        <field name="name">Rubriek 2: Verleggingsregelingen binnenland (omzet)</field>
+        <field name="sequence" eval="2"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_2a" model="account.tax.report.line">
+        <field name="name">2a. Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (omzet)</field>
+        <field name="tag_name">2a (omzet)</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="tax_report_rub_2"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_3" model="account.tax.report.line">
+        <field name="name">Rubriek 3: Prestaties naar of in het buitenland (omzet)</field>
+        <field name="sequence" eval="3"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_3a" model="account.tax.report.line">
+        <field name="name">3a. Leveringen naar landen buiten de EU (uitvoer) (omzet)</field>
+        <field name="tag_name">3a (omzet)</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="tax_report_rub_3"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_3b" model="account.tax.report.line">
+        <field name="name">3b. Leveringen naar/diensten in landen binnen de EU (omzet)</field>
+        <field name="tag_name">3b (omzet)</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="tax_report_rub_3"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_3c" model="account.tax.report.line">
+        <field name="name">3c. Installatie/afstandsverkopen binnen de EU (omzet)</field>
+        <field name="tag_name">3c (omzet)</field>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref="tax_report_rub_3"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_4" model="account.tax.report.line">
+        <field name="name">Rubriek 4: Prestaties vanuit het buitenland aan u verricht (omzet)</field>
+        <field name="sequence" eval="4"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_4a" model="account.tax.report.line">
+        <field name="name">4a. Leveringen/diensten uit landen buiten de EU (invoer) (omzet)</field>
+        <field name="tag_name">4a (omzet)</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="tax_report_rub_4"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_4b" model="account.tax.report.line">
+        <field name="name">4b. Leveringen/diensten uit landen binnen de EU (omzet)</field>
+        <field name="tag_name">4b (omzet)</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="tax_report_rub_4"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_1" model="account.tax.report.line">
+        <field name="code">NLTAX_B1</field>
+        <field name="name">Rubriek 1: Prestaties binnenland (BTW)</field>
+        <field name="sequence" eval="5"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_1a" model="account.tax.report.line">
+        <field name="name">1a. Leveringen/diensten belast met 21% (BTW)</field>
+        <field name="tag_name">1a (BTW)</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="tax_report_rub_btw_1"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_1b" model="account.tax.report.line">
+        <field name="name">1b. Leveringen/diensten belast met laag tarief (BTW)</field>
+        <field name="tag_name">1b (BTW)</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="tax_report_rub_btw_1"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_1c" model="account.tax.report.line">
+        <field name="name">1c. Leveringen/diensten belast met overige tarieven behalve 0% (BTW)</field>
+        <field name="tag_name">1c (BTW)</field>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref="tax_report_rub_btw_1"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_1d" model="account.tax.report.line">
+        <field name="name">1d. Privégebruik (BTW)</field>
+        <field name="tag_name">1d (BTW)</field>
+        <field name="sequence" eval="4"/>
+        <field name="parent_id" ref="tax_report_rub_btw_1"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_1e" model="account.tax.report.line">
+        <field name="name">1e. Leveringen/diensten belast met 0% of niet bij u belast (BTW)</field>
+        <field name="tag_name">1e (BTW)</field>
+        <field name="sequence" eval="5"/>
+        <field name="parent_id" ref="tax_report_rub_btw_1"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_2" model="account.tax.report.line">
+        <field name="name">Rubriek 2: Verleggingsregelingen binnenland (BTW)</field>
+        <field name="sequence" eval="6"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_2a" model="account.tax.report.line">
+        <field name="name">2a. Leveringen/diensten waarbij de heffing van Heffing van omzetbelasting naar u is verlegd (BTW)</field>
+        <field name="code">NLTAX_B2</field>
+        <field name="tag_name">2a (BTW)</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="tax_report_rub_btw_2"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_4" model="account.tax.report.line">
+        <field name="name">Rubriek 4: Prestaties vanuit het buitenland aan u verricht (BTW)</field>
+        <field name="sequence" eval="7"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_4a" model="account.tax.report.line">
+        <field name="name">4a. Leveringen/diensten uit landen buiten de EU (BTW)</field>
+        <field name="tag_name">4a (BTW)</field>
+        <field name="code">NLTAX_B4a</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="tax_report_rub_btw_4"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_4b" model="account.tax.report.line">
+        <field name="name">4b. Leveringen/diensten uit landen binnen de EU (BTW)</field>
+        <field name="tag_name">4b (BTW)</field>
+        <field name="code">NLTAX_B4b</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="tax_report_rub_btw_4"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_5" model="account.tax.report.line">
+        <field name="name">Rubriek 5: Voorbelasting, kleineondernemersregeling en totaal (BTW)</field>
+        <field name="sequence" eval="8"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_5a" model="account.tax.report.line">
+        <field name="name">5a. Verschuldigde omzetbelasting (rubrieken 1a t/m 4b) (BTW)</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="tax_report_rub_btw_5"/>
+        <field name="formula">NLTAX_B1 + NLTAX_B2 + abs(NLTAX_B4a) + abs(NLTAX_B4b)</field>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_5b" model="account.tax.report.line">
+        <field name="code">NLTAX_B5b</field>
+        <field name="name">5b. Voorbelasting (BTW)</field>
+        <field name="tag_name">5b (BTW)</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="tax_report_rub_btw_5"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_5c" model="account.tax.report.line">
+        <field name="code"></field>
+        <field name="name">5c. Subtotaal (rubriek 5a min 5b) (BTW)</field>
+        <field name="sequence" eval="3"/>
+        <field name="formula">NLTAX_B1 + NLTAX_B2 + NLTAX_B4a + NLTAX_B4b - NLTAX_B5b</field>
+        <field name="parent_id" ref="tax_report_rub_btw_5"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_5d" model="account.tax.report.line">
+        <field name="code">NLTAX_B5d</field>
+        <field name="name">5d. Vermindering volgens de kleineondernemersregeling (BTW)</field>
+        <field name="tag_name">5d. (BTW)</field>
+        <field name="sequence" eval="4"/>
+        <field name="parent_id" ref="tax_report_rub_btw_5"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_5e" model="account.tax.report.line">
+        <field name="code">NLTAX_B5e</field>
+        <field name="name">5e. Schatting vorige aangifte(n) (BTW)</field>
+        <field name="tag_name">5e. (BTW)</field>
+        <field name="sequence" eval="5"/>
+        <field name="parent_id" ref="tax_report_rub_btw_5"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_5f" model="account.tax.report.line">
+        <field name="code">NLTAX_B5f</field>
+        <field name="name">5f. Schatting deze aangifte (BTW)</field>
+        <field name="tag_name">5f. (BTW)</field>
+        <field name="sequence" eval="6"/>
+        <field name="parent_id" ref="tax_report_rub_btw_5"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+    <record id="tax_report_rub_btw_5g" model="account.tax.report.line">
+        <field name="code">NLTAX_B5g</field>
+        <field name="name">5g. Totaal te betalen/terug te vragen (BTW)</field>
+        <field name="sequence" eval="7"/>
+        <field name="formula">NLTAX_B1 + NLTAX_B2 + NLTAX_B4a + NLTAX_B4b - NLTAX_B5b - NLTAX_B5d - NLTAX_B5e - NLTAX_B5f</field>
+        <field name="parent_id" ref="tax_report_rub_btw_5"/>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
+</odoo>
diff --git a/addons/l10n_nl/data/account_tax_template.xml b/addons/l10n_nl/data/account_tax_template.xml
index 44f42f7d71b..e56f1914288 100644
--- a/addons/l10n_nl/data/account_tax_template.xml
+++ b/addons/l10n_nl/data/account_tax_template.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="0">
+<odoo>
 
 <!-- Binnen Nederland -->
 <!-- Verkoop BTW -->
@@ -11,11 +10,32 @@
             <field name="description">0% BTW</field>
             <field eval="0" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_0"/>
-            <field name="account_id" ref="vat_payable_0"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_08')])]"/>
             <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('tax_report_rub_1e')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0'),
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_1e')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0'),
+                }),
+            ]"/>
         </record>
         <record id="btw_6" model="account.tax.template">
             <field name="sequence">10</field>
@@ -24,11 +44,34 @@
             <field name="description">6% BTW</field>
             <field eval="6" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_l"/>
-            <field name="account_id" ref="vat_payable_l"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_05'),ref('tag_nl_22')])]"/>
             <field name="tax_group_id" ref="tax_group_6"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_1b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_1b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_1b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_1b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_9" model="account.tax.template">
             <field name="sequence">10</field>
@@ -37,11 +80,34 @@
             <field name="description">9% BTW</field>
             <field eval="9" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_l"/>
-            <field name="account_id" ref="vat_payable_l"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_05'),ref('tag_nl_22')])]"/>
             <field name="tax_group_id" ref="tax_group_9"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_1b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_1b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_1b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_1b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_21" model="account.tax.template">
             <field name="sequence">5</field>
@@ -50,11 +116,34 @@
             <field name="description">21% BTW</field>
             <field eval="21" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_h"/>
-            <field name="account_id" ref="vat_payable_h"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_03'),ref('tag_nl_20')])]"/>
             <field name="tax_group_id" ref="tax_group_21"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_1a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_1a')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_1a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_1a')],
+                }),
+            ]"/>
         </record>
         <record id="btw_overig" model="account.tax.template">
             <field name="sequence">15</field>
@@ -63,11 +152,34 @@
             <field name="description">variabel BTW</field>
             <field eval="21" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_h"/>
-            <field name="account_id" ref="vat_payable_h"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_04'),ref('tag_nl_06'),ref('tag_nl_21'),ref('tag_nl_23')])]"/>
             <field name="tax_group_id" ref="tax_group_21"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_1a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_1a')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_1c')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_1c')],
+                }),
+            ]"/>
         </record>
 <!-- Verkoop BTW Diensten -->
         <record id="btw_0_d" model="account.tax.template">
@@ -77,11 +189,32 @@
             <field name="description">0% BTW diensten</field>
             <field eval="0" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_0_d"/>
-            <field name="account_id" ref="vat_payable_0_d"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_08')])]"/>
             <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('tax_report_rub_1e')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0_d'),
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_1e')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0_d'),
+                }),
+            ]"/>
         </record>
         <record id="btw_6_d" model="account.tax.template">
             <field name="sequence">10</field>
@@ -90,11 +223,34 @@
             <field name="description">6% BTW diensten</field>
             <field eval="6" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_l_d"/>
-            <field name="account_id" ref="vat_payable_l_d"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_05'),ref('tag_nl_22')])]"/>
             <field name="tax_group_id" ref="tax_group_6"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_1b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_d'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_1b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_1b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_d'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_1b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_9_d" model="account.tax.template">
             <field name="sequence">10</field>
@@ -103,11 +259,34 @@
             <field name="description">9% BTW diensten</field>
             <field eval="9" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_l_d"/>
-            <field name="account_id" ref="vat_payable_l_d"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_05'),ref('tag_nl_22')])]"/>
             <field name="tax_group_id" ref="tax_group_9"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_1b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_d'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_1b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_1b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_d'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_1b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_21_d" model="account.tax.template">
             <field name="sequence">6</field>
@@ -116,11 +295,34 @@
             <field name="description">21% BTW diensten</field>
             <field eval="21" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_h_d"/>
-            <field name="account_id" ref="vat_payable_h_d"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_03'),ref('tag_nl_20')])]"/>
             <field name="tax_group_id" ref="tax_group_21"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_1a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_d'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_1a')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_1a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_d'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_1a')],
+                }),
+            ]"/>
         </record>
         <record id="btw_overig_d" model="account.tax.template">
             <field name="sequence">15</field>
@@ -129,11 +331,34 @@
             <field name="description">variabel BTW diensten</field>
             <field eval="21" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_h_d"/>
-            <field name="account_id" ref="vat_payable_h_d"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_04'),ref('tag_nl_06'),ref('tag_nl_21'),ref('tag_nl_23')])]"/>
             <field name="tax_group_id" ref="tax_group_21"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_1a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_d'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_1a')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_1c')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_d'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_1c')],
+                }),
+            ]"/>
         </record>
 <!--Inkoop BTW -->
         <record id="btw_6_buy" model="account.tax.template">
@@ -143,11 +368,32 @@
             <field name="description">6% BTW</field>
             <field eval="6" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_l"/>
-            <field name="account_id" ref="vat_refund_l"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_6"/>
+            <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('vat_refund_l'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <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('vat_refund_l'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_9_buy" model="account.tax.template">
             <field name="sequence">10</field>
@@ -156,11 +402,32 @@
             <field name="description">9% BTW</field>
             <field eval="9" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_l"/>
-            <field name="account_id" ref="vat_refund_l"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_9"/>
+            <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('vat_refund_l'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <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('vat_refund_l'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
 
         <record id="btw_6_buy_incl" model="account.tax.template">
@@ -171,11 +438,32 @@
             <field eval="6" name="amount"/>
             <field name="amount_type">percent</field>
             <field name="price_include">True</field>
-            <field name="refund_account_id" ref="vat_refund_l"/>
-            <field name="account_id" ref="vat_refund_l"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_6"/>
+            <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('vat_refund_l'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <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('vat_refund_l'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_9_buy_incl" model="account.tax.template">
             <field name="sequence">10</field>
@@ -185,11 +473,32 @@
             <field eval="9" name="amount"/>
             <field name="amount_type">percent</field>
             <field name="price_include">True</field>
-            <field name="refund_account_id" ref="vat_refund_l"/>
-            <field name="account_id" ref="vat_refund_l"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_9"/>
+            <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('vat_refund_l'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <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('vat_refund_l'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_21_buy" model="account.tax.template">
             <field name="sequence">5</field>
@@ -198,11 +507,32 @@
             <field name="description">21% BTW</field>
             <field eval="21" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_h"/>
-            <field name="account_id" ref="vat_refund_h"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_21"/>
+            <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('vat_refund_h'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <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('vat_refund_h'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_21_buy_incl" model="account.tax.template">
             <field name="sequence">7</field>
@@ -212,11 +542,32 @@
             <field eval="21" name="amount"/>
             <field name="amount_type">percent</field>
             <field name="price_include">True</field>
-            <field name="refund_account_id" ref="vat_refund_h"/>
-            <field name="account_id" ref="vat_refund_h"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_21"/>
+            <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('vat_refund_h'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <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('vat_refund_h'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_overig_buy" model="account.tax.template">
             <field name="sequence">15</field>
@@ -225,11 +576,32 @@
             <field name="description">variabel BTW</field>
             <field eval="21" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_h"/>
-            <field name="account_id" ref="vat_refund_h"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_21"/>
+            <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('vat_refund_h'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <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('vat_refund_h'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
 <!--Inkoop BTW diensten -->
         <record id="btw_6_buy_d" model="account.tax.template">
@@ -239,11 +611,32 @@
             <field name="description">6% BTW diensten</field>
             <field eval="6" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_l_d"/>
-            <field name="account_id" ref="vat_refund_l_d"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_6"/>
+            <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('vat_refund_l_d'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <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('vat_refund_l_d'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_9_buy_d" model="account.tax.template">
             <field name="sequence">10</field>
@@ -252,11 +645,32 @@
             <field name="description">9% BTW diensten</field>
             <field eval="9" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_l_d"/>
-            <field name="account_id" ref="vat_refund_l_d"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_9"/>
+            <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('vat_refund_l_d'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <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('vat_refund_l_d'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_21_buy_d" model="account.tax.template">
             <field name="sequence">6</field>
@@ -265,11 +679,32 @@
             <field name="description">21% BTW diensten</field>
             <field eval="21" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_h_d"/>
-            <field name="account_id" ref="vat_refund_h_d"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_21"/>
+            <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('vat_refund_h_d'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <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('vat_refund_h_d'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_overig_buy_d" model="account.tax.template">
             <field name="sequence">15</field>
@@ -278,11 +713,32 @@
             <field name="description">variabel BTW diensten</field>
             <field eval="21" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_h_d"/>
-            <field name="account_id" ref="vat_refund_h_d"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_21"/>
+            <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('vat_refund_h_d'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <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('vat_refund_h_d'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
 <!--BTW verlegd-->
         <record id="btw_verk_0" model="account.tax.template">
@@ -292,37 +748,32 @@
             <field name="description">0% BTW verlegd</field>
             <field eval="0" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_v"/>
-            <field name="account_id" ref="vat_payable_v"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_08')])]"/>
-            <field name="tax_group_id" ref="tax_group_0"/>
-        </record>
-        <record id="btw_ink_0_1" model="account.tax.template">
-            <field name="sequence">98</field>
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW te vorderen verlegd (inkopen1)</field>
-            <field name="description">BTW te vorderen verlegd (inkopen1)</field>
-            <field eval="21" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_v"/>
-            <field name="account_id" ref="vat_payable_v"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_27')])]"/>
-            <field name="tax_group_id" ref="tax_group_0"/>
-        </record>
-        <record id="btw_ink_0_2" model="account.tax.template">
-            <field name="sequence">99</field>
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW af te dragen verlegd (inkopen2)</field>
-            <field name="description">BTW af te dragen verlegd (inkopen2)</field>
-            <field eval="-21" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_v"/>
-            <field name="account_id" ref="vat_payable_v"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <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('tax_report_rub_1e')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_v'),
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_1e')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_v'),
+                }),
+            ]"/>
         </record>
         <record id="btw_ink_0" model="account.tax.template">
             <field name="sequence">15</field>
@@ -330,77 +781,97 @@
             <field name="name">BTW af te dragen verlegd (inkopen)</field>
             <field name="description">21% BTW verlegd</field>
             <field eval="21" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_10')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_ink_0_1'), ref('btw_ink_0_2')])]"/>
             <field name="tax_group_id" ref="tax_group_21"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_2a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_v'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_2a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_v'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_2a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_v'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_2a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_v'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
 <!-- Binnen de EU -->
 <!-- BTW inkoop -->
-        <record id="btw_I_6_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="sequence">21</field>
-            <field name="name">Inkopen import binnen EU laag(1) 6%</field>
-            <field name="description">Inkopen import binnen EU laag(1)</field>
-            <field eval="-6" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_l_eu"/>
-            <field name="account_id" ref="vat_payable_l_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
-            <field name="tax_group_id" ref="tax_group_6_eu"/>
-        </record>
-        <record id="btw_I_9_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="sequence">21</field>
-            <field name="name">Inkopen import binnen EU laag(1) 9%</field>
-            <field name="description">Inkopen import binnen EU laag(1)</field>
-            <field eval="-9" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_l_eu"/>
-            <field name="account_id" ref="vat_payable_l_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
-            <field name="tax_group_id" ref="tax_group_9_eu"/>
-        </record>
-        <record id="btw_I_6_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="sequence">22</field>
-            <field name="name">Inkopen import binnen EU laag(2) 6%</field>
-            <field name="description">Inkopen import binnen EU laag(2)</field>
-            <field eval="6" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_l_eu"/>
-            <field name="account_id" ref="vat_refund_l_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_6_eu"/>
-        </record>
-        <record id="btw_I_9_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="sequence">22</field>
-            <field name="name">Inkopen import binnen EU laag(2) 9%</field>
-            <field name="description">Inkopen import binnen EU laag(2)</field>
-            <field eval="9" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_l_eu"/>
-            <field name="account_id" ref="vat_refund_l_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_9_eu"/>
-        </record>
         <record id="btw_I_6" model="account.tax.template">
             <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import binnen EU laag 6%</field>
             <field name="description">6% BTW import binnen EU</field>
             <field eval="6" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_6_1'), ref('btw_I_6_2')])]"/>
             <field name="tax_group_id" ref="tax_group_6_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_I_9" model="account.tax.template">
             <field name="sequence">20</field>
@@ -408,37 +879,47 @@
             <field name="name">Inkopen import binnen EU laag 9%</field>
             <field name="description">9% BTW import binnen EU</field>
             <field eval="9" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_9_1'), ref('btw_I_9_2')])]"/>
             <field name="tax_group_id" ref="tax_group_9_eu"/>
-        </record>
-        <record id="btw_I_21_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="sequence">21</field>
-            <field name="name">Inkopen import binnen EU hoog(1)</field>
-            <field name="description">Inkopen import binnen EU hoog(1)</field>
-            <field eval="-21" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_h_eu"/>
-            <field name="account_id" ref="vat_payable_h_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
-            <field name="tax_group_id" ref="tax_group_21_eu"/>
-        </record>
-        <record id="btw_I_21_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="sequence">22</field>
-            <field name="name">Inkopen import binnen EU hoog(2)</field>
-            <field name="description">Inkopen import binnen EU hoog(2)</field>
-            <field eval="21" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_h_eu"/>
-            <field name="account_id" ref="vat_refund_h_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_21_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_I_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -446,37 +927,47 @@
             <field name="name">Inkopen import binnen EU hoog</field>
             <field name="description">21% BTW import binnen EU</field>
             <field eval="21" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_21_1'), ref('btw_I_21_2')])]"/>
             <field name="tax_group_id" ref="tax_group_21_eu"/>
-        </record>
-        <record id="btw_I_overig_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import binnen EU overig(1)</field>
-            <field name="description">Inkopen import binnen EU overig(1)</field>
-            <field name="sequence">99</field>
-            <field eval="0" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_h_eu"/>
-            <field name="account_id" ref="vat_payable_h_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
-            <field name="tax_group_id" ref="tax_group_0_eu"/>
-        </record>
-        <record id="btw_I_overig_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import binnen EU overig(2)</field>
-            <field name="description">Inkopen import binnen EU overig(2)</field>
-            <field eval="0" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_h_eu"/>
-            <field name="account_id" ref="vat_refund_h_eu"/>
-            <field name="sequence">98</field>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_0_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_I_overig" model="account.tax.template">
             <field name="sequence">20</field>
@@ -484,11 +975,47 @@
             <field name="name">Inkopen import binnen EU overig</field>
             <field name="description">0% BTW import binnen EU</field>
             <field eval="0" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_overig_1'), ref('btw_I_overig_2')])]"/>
             <field name="tax_group_id" ref="tax_group_0_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
 <!-- BTW verkoop -->
         <record id="btw_X0_producten" model="account.tax.template">
@@ -498,11 +1025,32 @@
             <field name="description">BTW export binnen EU (producten)</field>
             <field eval="0" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_0_eu"/>
-            <field name="account_id" ref="vat_payable_0_eu"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_40')])]"/>
             <field name="tax_group_id" ref="tax_group_0_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_3b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0_eu'),
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_3b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0_eu'),
+                }),
+            ]"/>
         </record>
         <record id="btw_X0_diensten" model="account.tax.template">
             <field name="sequence">20</field>
@@ -511,11 +1059,32 @@
             <field name="description">BTW export binnen EU (diensten)</field>
             <field eval="0" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_0_eu"/>
-            <field name="account_id" ref="vat_payable_0_eu"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_41')])]"/>
             <field name="tax_group_id" ref="tax_group_0_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_3b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0_eu'),
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_3b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0_eu'),
+                }),
+            ]"/>
         </record>
         <record id="btw_X2" model="account.tax.template">
             <field name="sequence">20</field>
@@ -524,76 +1093,81 @@
             <field name="description">Inst./afst.verkopen binnen EU</field>
             <field eval="0" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_0_eu"/>
-            <field name="account_id" ref="vat_payable_0_eu"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_14')])]"/>
             <field name="tax_group_id" ref="tax_group_0_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_3c')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0_eu'),
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_3c')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0_eu'),
+                }),
+            ]"/>
         </record>
 <!-- BTW inkoop diensten -->
-        <record id="btw_I_6_d_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="sequence">21</field>
-            <field name="name">Inkopen import binnen EU laag(1) diensten 6%</field>
-            <field name="description">Inkopen import binnen EU laag(1) diensten</field>
-            <field eval="-6" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_l_d_eu"/>
-            <field name="account_id" ref="vat_payable_l_d_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
-            <field name="tax_group_id" ref="tax_group_6_eu"/>
-        </record>
-        <record id="btw_I_9_d_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="sequence">21</field>
-            <field name="name">Inkopen import binnen EU laag(1) diensten 9%</field>
-            <field name="description">Inkopen import binnen EU laag(1) diensten</field>
-            <field eval="-9" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_l_d_eu"/>
-            <field name="account_id" ref="vat_payable_l_d_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
-            <field name="tax_group_id" ref="tax_group_9_eu"/>
-        </record>
-        <record id="btw_I_6_d_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="sequence">22</field>
-            <field name="name">Inkopen import binnen EU laag(2) diensten 6%</field>
-            <field name="description">Inkopen import binnen EU laag(2) diensten</field>
-            <field eval="6" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_l_d_eu"/>
-            <field name="account_id" ref="vat_refund_l_d_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_6_eu"/>
-        </record>
-        <record id="btw_I_9_d_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="sequence">22</field>
-            <field name="name">Inkopen import binnen EU laag(2) diensten 9%</field>
-            <field name="description">Inkopen import binnen EU laag(2) diensten</field>
-            <field eval="9" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_l_d_eu"/>
-            <field name="account_id" ref="vat_refund_l_d_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_9_eu"/>
-        </record>
         <record id="btw_I_6_d" model="account.tax.template">
             <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import binnen EU laag diensten 6%</field>
             <field name="description">6% BTW import binnen EU diensten</field>
             <field eval="6" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_6_d_1'), ref('btw_I_6_d_2')])]"/>
             <field name="tax_group_id" ref="tax_group_6_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_d_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_d_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_d_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_d_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_I_9_d" model="account.tax.template">
             <field name="sequence">20</field>
@@ -601,37 +1175,47 @@
             <field name="name">Inkopen import binnen EU laag diensten 9%</field>
             <field name="description">9% BTW import binnen EU diensten</field>
             <field eval="9" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_9_d_1'), ref('btw_I_9_d_2')])]"/>
             <field name="tax_group_id" ref="tax_group_9_eu"/>
-        </record>
-        <record id="btw_I_21_d_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="sequence">21</field>
-            <field name="name">Inkopen import binnen EU hoog(1) diensten</field>
-            <field name="description">Inkopen import binnen EU hoog(1) diensten</field>
-            <field eval="-21" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_h_d_eu"/>
-            <field name="account_id" ref="vat_payable_h_d_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
-            <field name="tax_group_id" ref="tax_group_21_eu"/>
-        </record>
-        <record id="btw_I_21_d_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="sequence">22</field>
-            <field name="name">Inkopen import binnen EU hoog(2) diensten</field>
-            <field name="description">Inkopen import binnen EU hoog(2) diensten</field>
-            <field eval="21" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_h_d_eu"/>
-            <field name="account_id" ref="vat_refund_h_d_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_21_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_d_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_d_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_d_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_d_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_I_21_d" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -639,37 +1223,47 @@
             <field name="name">Inkopen import binnen EU hoog diensten</field>
             <field name="description">21% BTW import binnen EU diensten</field>
             <field eval="21" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_21_d_1'), ref('btw_I_21_d_2')])]"/>
             <field name="tax_group_id" ref="tax_group_21_eu"/>
-        </record>
-        <record id="btw_I_overig_d_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import binnen EU overig(1) diensten</field>
-            <field name="description">Inkopen import binnen EU overig(1) diensten</field>
-            <field name="sequence">99</field>
-            <field eval="0" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_h_d_eu"/>
-            <field name="account_id" ref="vat_payable_h_d_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
-            <field name="tax_group_id" ref="tax_group_0_eu"/>
-        </record>
-        <record id="btw_I_overig_d_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import binnen EU overig(2) diensten</field>
-            <field name="description">Inkopen import binnen EU overig(2) diensten</field>
-            <field eval="0" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_h_d_eu"/>
-            <field name="account_id" ref="vat_refund_h_d_eu"/>
-            <field name="sequence">98</field>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_0_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_d_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_d_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_d_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_d_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_I_overig_d" model="account.tax.template">
             <field name="sequence">20</field>
@@ -677,78 +1271,98 @@
             <field name="name">Inkopen import binnen EU overig diensten</field>
             <field name="description">0% BTW import binnen EU diensten</field>
             <field eval="0" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_overig_d_1'), ref('btw_I_overig_d_2')])]"/>
             <field name="tax_group_id" ref="tax_group_0_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_d_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_d_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_d_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_d_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
 
 <!-- Buiten de EU -->
 <!-- BTW inkoop -->
-        <record id="btw_E1_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU laag(1) 6%</field>
-            <field name="description">Inkopen import buiten EU laag(1)</field>
-            <field eval="-6" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_l_non_eu"/>
-            <field name="account_id" ref="vat_payable_l_non_eu"/>
-            <field name="sequence">21</field>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
-            <field name="tax_group_id" ref="tax_group_6_niet_eu"/>
-        </record>
-        <record id="btw_E1_1_9" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU laag(1) 9%</field>
-            <field name="description">Inkopen import buiten EU laag(1)</field>
-            <field eval="-9" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_l_non_eu"/>
-            <field name="account_id" ref="vat_payable_l_non_eu"/>
-            <field name="sequence">21</field>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
-            <field name="tax_group_id" ref="tax_group_9_niet_eu"/>
-        </record>
-        <record id="btw_E1_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU laag(2) 6%</field>
-            <field name="description">Inkopen import buiten EU laag(2)</field>
-            <field eval="6" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_l_non_eu"/>
-            <field name="account_id" ref="vat_refund_l_non_eu"/>
-            <field name="sequence">22</field>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_6_niet_eu"/>
-        </record>
-        <record id="btw_E1_2_9" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU laag(2) 9%</field>
-            <field name="description">Inkopen import buiten EU laag(2)</field>
-            <field eval="9" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_l_non_eu"/>
-            <field name="account_id" ref="vat_refund_l_non_eu"/>
-            <field name="sequence">22</field>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_9_niet_eu"/>
-        </record>
         <record id="btw_E1" model="account.tax.template">
             <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import buiten EU laag 6%</field>
             <field name="description">BTW import buiten EU laag inkopen</field>
             <field eval="6" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_E1_1'), ref('btw_E1_2')])]"/>
             <field name="tax_group_id" ref="tax_group_6_niet_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_E1_9" model="account.tax.template">
             <field name="sequence">20</field>
@@ -756,37 +1370,47 @@
             <field name="name">Inkopen import buiten EU laag 9%</field>
             <field name="description">BTW import buiten EU laag inkopen</field>
             <field eval="9" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_E1_1_9'), ref('btw_E1_2_9')])]"/>
             <field name="tax_group_id" ref="tax_group_9_niet_eu"/>
-        </record>
-        <record id="btw_E2_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU hoog(1)</field>
-            <field name="description">Inkopen import buiten EU hoog(1)</field>
-            <field eval="-21" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_h_non_eu"/>
-            <field name="sequence">21</field>
-            <field name="account_id" ref="vat_payable_h_non_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
-            <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
-        </record>
-        <record id="btw_E2_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU hoog(2)</field>
-            <field name="description">Inkopen import buiten EU hoog(2)</field>
-            <field eval="21" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="sequence">22</field>
-            <field name="refund_account_id" ref="vat_refund_h_non_eu"/>
-            <field name="account_id" ref="vat_refund_h_non_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_E2" model="account.tax.template">
             <field name="sequence">20</field>
@@ -794,37 +1418,47 @@
             <field name="name">Inkopen import buiten EU hoog</field>
             <field name="description">BTW import buiten EU hoog inkopen</field>
             <field eval="21" name="amount"/>
-            <field name="amount_type">group</field>
-            <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_E2_1'), ref('btw_E2_2')])]"/>
-            <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
-        </record>
-        <record id="btw_E_overig_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU overig(1)</field>
-            <field name="description">Inkopen import buiten EU overig(1)</field>
-            <field eval="-21" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_h_non_eu"/>
-            <field name="account_id" ref="vat_payable_h_non_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="sequence">21</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
-            <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
-        </record>
-        <record id="btw_E_overig_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU overig(2)</field>
-            <field name="description">Inkopen import buiten EU overig(2)</field>
-            <field eval="21" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_h_non_eu"/>
-            <field name="account_id" ref="vat_refund_h_non_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="sequence">22</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
+            <field name="type_tax_use">purchase</field>
             <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_E_overig" model="account.tax.template">
             <field name="sequence">20</field>
@@ -832,11 +1466,47 @@
             <field name="name">Inkopen import buiten EU overig</field>
             <field name="description">BTW import buiten EU overig inkopen</field>
             <field eval="21" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_E_overig_1'), ref('btw_E_overig_2')])]"/>
             <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
 <!-- BTW Verkoop -->
         <record id="btw_X1" model="account.tax.template">
@@ -846,11 +1516,32 @@
             <field name="description">BTW export buiten EU</field>
             <field eval="0" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_0_non_eu"/>
-            <field name="account_id" ref="vat_payable_0_non_eu"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_12')])]"/>
             <field name="tax_group_id" ref="tax_group_0_niet_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_3a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0_non_eu'),
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_3a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0_non_eu'),
+                }),
+            ]"/>
         </record>
         <record id="btw_X3" model="account.tax.template">
             <field name="sequence">21</field>
@@ -859,76 +1550,81 @@
             <field name="description">Inst./afst.verkopen buiten EU</field>
             <field eval="0" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_0_non_eu"/>
-            <field name="account_id" ref="vat_payable_0_non_eu"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_12')])]"/>
             <field name="tax_group_id" ref="tax_group_0_niet_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_3a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0_non_eu'),
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_3a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_0_non_eu'),
+                }),
+            ]"/>
         </record>
 <!-- BTW inkoop diensten -->
-        <record id="btw_E1_d_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU laag(1) diensten 6%</field>
-            <field name="description">Inkopen import buiten EU laag(1) diensten</field>
-            <field eval="-6" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_l_d_non_eu"/>
-            <field name="account_id" ref="vat_payable_l_d_non_eu"/>
-            <field name="sequence">21</field>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
-            <field name="tax_group_id" ref="tax_group_6_niet_eu"/>
-        </record>
-        <record id="btw_E1_d_1_9" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU laag(1) diensten 9%</field>
-            <field name="description">Inkopen import buiten EU laag(1) diensten</field>
-            <field eval="-9" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_l_d_non_eu"/>
-            <field name="account_id" ref="vat_payable_l_d_non_eu"/>
-            <field name="sequence">21</field>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
-            <field name="tax_group_id" ref="tax_group_9_niet_eu"/>
-        </record>
-        <record id="btw_E1_d_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU laag(2) diensten 6%</field>
-            <field name="description">Inkopen import buiten EU laag(2) diensten</field>
-            <field eval="6" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_l_d_non_eu"/>
-            <field name="account_id" ref="vat_refund_l_d_non_eu"/>
-            <field name="sequence">22</field>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_6_niet_eu"/>
-        </record>
-        <record id="btw_E1_d_2_9" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU laag(2) diensten 9%</field>
-            <field name="description">Inkopen import buiten EU laag(2) diensten</field>
-            <field eval="9" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_l_d_non_eu"/>
-            <field name="account_id" ref="vat_refund_l_d_non_eu"/>
-            <field name="sequence">22</field>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_9_niet_eu"/>
-        </record>
         <record id="btw_E1_d" model="account.tax.template">
             <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import buiten EU laag diensten 6%</field>
             <field name="description">BTW import buiten EU laag inkopen diensten</field>
             <field eval="6" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_E1_d_1'), ref('btw_E1_d_2')])]"/>
             <field name="tax_group_id" ref="tax_group_6_niet_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_d_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_d_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_d_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_d_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_E1_d_9" model="account.tax.template">
             <field name="sequence">20</field>
@@ -936,37 +1632,47 @@
             <field name="name">Inkopen import buiten EU laag diensten 9%</field>
             <field name="description">BTW import buiten EU laag inkopen diensten</field>
             <field eval="9" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_E1_d_1_9'), ref('btw_E1_d_2_9')])]"/>
             <field name="tax_group_id" ref="tax_group_9_niet_eu"/>
-        </record>
-        <record id="btw_E2_d_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU hoog(1) diensten</field>
-            <field name="description">Inkopen import buiten EU hoog(1) diensten</field>
-            <field eval="-21" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_h_d_non_eu"/>
-            <field name="sequence">21</field>
-            <field name="account_id" ref="vat_payable_h_d_non_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
-            <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
-        </record>
-        <record id="btw_E2_d_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU hoog(2) diensten</field>
-            <field name="description">Inkopen import buiten EU hoog(2) diensten</field>
-            <field eval="21" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="sequence">22</field>
-            <field name="refund_account_id" ref="vat_refund_h_d_non_eu"/>
-            <field name="account_id" ref="vat_refund_h_d_non_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
-            <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_d_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_d_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_l_d_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_l_d_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_E2_d" model="account.tax.template">
             <field name="sequence">20</field>
@@ -974,37 +1680,47 @@
             <field name="name">Inkopen import buiten EU hoog diensten</field>
             <field name="description">BTW import buiten EU hoog inkopen diensten</field>
             <field eval="21" name="amount"/>
-            <field name="amount_type">group</field>
-            <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_E2_d_1'), ref('btw_E2_d_2')])]"/>
-            <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
-        </record>
-        <record id="btw_E_overig_d_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU overig(1) diensten</field>
-            <field name="description">Inkopen import buiten EU overig(1) diensten</field>
-            <field eval="-21" name="amount"/>
-            <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_payable_h_d_non_eu"/>
-            <field name="account_id" ref="vat_payable_h_d_non_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="sequence">21</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
-            <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
-        </record>
-        <record id="btw_E_overig_d_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">Inkopen import buiten EU overig(2) diensten</field>
-            <field name="description">Inkopen import buiten EU overig(2) diensten</field>
-            <field eval="21" name="amount"/>
             <field name="amount_type">percent</field>
-            <field name="refund_account_id" ref="vat_refund_h_d_non_eu"/>
-            <field name="account_id" ref="vat_refund_h_d_non_eu"/>
-            <field name="type_tax_use">none</field>
-            <field name="sequence">22</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
+            <field name="type_tax_use">purchase</field>
             <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_d_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_d_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_d_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_d_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
         <record id="btw_E_overig_d" model="account.tax.template">
             <field name="sequence">20</field>
@@ -1012,12 +1728,47 @@
             <field name="name">Inkopen import buiten EU overig diensten</field>
             <field name="description">BTW import buiten EU overig inkopen diensten</field>
             <field eval="21" name="amount"/>
-            <field name="amount_type">group</field>
+            <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
-            <field name="children_tax_ids" eval="[(6, 0, [ref('btw_E_overig_d_1'), ref('btw_E_overig_d_2')])]"/>
             <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_d_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_d_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('tax_report_rub_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_payable_h_d_non_eu'),
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('vat_refund_h_d_non_eu'),
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                }),
+            ]"/>
         </record>
 
-    </data>
-</openerp>
+</odoo>