From 3936d655c4bfd845b6ead724cecdc8e7c62816eb Mon Sep 17 00:00:00 2001
From: Olivier Colson <oco@odoo.com>
Date: Fri, 19 Apr 2019 10:06:07 +0000
Subject: [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>
---
 addons/l10n_pl/__manifest__.py                  |    1 +
 addons/l10n_pl/data/account_tax_data.xml        | 1458 +++++++++++++++--------
 addons/l10n_pl/data/account_tax_report_data.xml |  383 ++++++
 3 files changed, 1319 insertions(+), 523 deletions(-)
 create mode 100644 addons/l10n_pl/data/account_tax_report_data.xml

(limited to 'addons/l10n_pl')

diff --git a/addons/l10n_pl/__manifest__.py b/addons/l10n_pl/__manifest__.py
index 90b48a4c6f6..c12ea3c3fe1 100644
--- a/addons/l10n_pl/__manifest__.py
+++ b/addons/l10n_pl/__manifest__.py
@@ -30,6 +30,7 @@ Wewnętrzny numer wersji OpenGLOBE 1.02
               'data/account.account.template.csv',
               'data/l10n_pl_chart_post_data.xml',
               'data/account_data.xml',
+              'data/account_tax_report_data.xml',
               'data/account_tax_data.xml',
               'data/account_fiscal_position_data.xml',
               'data/res_country_state_data.xml',
diff --git a/addons/l10n_pl/data/account_tax_data.xml b/addons/l10n_pl/data/account_tax_data.xml
index 973d05ff7b6..61d64d30648 100644
--- a/addons/l10n_pl/data/account_tax_data.xml
+++ b/addons/l10n_pl/data/account_tax_data.xml
@@ -2,210 +2,7 @@
 <odoo>
   <data>
 
-    <!-- Account Tags -->
-
-    <record id="tag_pl_01" model="account.account.tag">
-      <field name="name">Podstawa - Razem C</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_02" model="account.account.tag">
-      <field name="name">Podstawa - Dostawa towarów/usług, kraj, zwolnione</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_03" model="account.account.tag">
-      <field name="name">Podstawa - Dostawa towarów/usług, poza kraj</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_04" model="account.account.tag">
-      <field name="name">Podstawa - W tym usługi art 100.1.4</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_05" model="account.account.tag">
-      <field name="name">Podstawa - Dostawa towarów/usług, kraj, 0%</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_06" model="account.account.tag">
-      <field name="name">Podstawa - W tym towary art 129</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_07" model="account.account.tag">
-      <field name="name">Podstawa - Dostawa towarów/usług, kraj, 3% lub 5%</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_08" model="account.account.tag">
-      <field name="name">Podstawa - Dostawa towarów/usług, kraj, 7% lub 8%</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_09" model="account.account.tag">
-      <field name="name">Podstawa - Dostawa towarów/usług, kraj, 22% lub 23%</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_10" model="account.account.tag">
-      <field name="name">Podstawa - Wew-wspól dostawa towarów</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_11" model="account.account.tag">
-      <field name="name">Podstawa - Eksport towarów</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_12" model="account.account.tag">
-      <field name="name">Podstawa - Wewn-wspól. nabycie towarów</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_13" model="account.account.tag">
-      <field name="name">Podstawa - Import towarów art. 33a</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_14" model="account.account.tag">
-      <field name="name">Podstawa - Import usług</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_15" model="account.account.tag">
-      <field name="name">Podstawa - W tym nabycie wg art 28b</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_16" model="account.account.tag">
-      <field name="name">Podstawa - Dostawa towarów, podatnik nabywca</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_17" model="account.account.tag">
-      <field name="name">Podstawa - Dostawa towarów, podatnik nabywca bis</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_18" model="account.account.tag">
-      <field name="name">Podstawa - Razem D</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_19" model="account.account.tag">
-      <field name="name">Podstawa - Nabycie towarów i usług ś.trwałe</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_20" model="account.account.tag">
-      <field name="name">Podstawa - Nabycie towarów i usług pozostałych</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_21" model="account.account.tag">
-      <field name="name">Podstawa - Nabycie towarów i usług pozostałych bis</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_22" model="account.account.tag">
-      <field name="name">Podatek - Do przeniesienia</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_23" model="account.account.tag">
-      <field name="name">Podatek - Nadwyżka naliczonego nad należnym</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_24" model="account.account.tag">
-      <field name="name">Podatek - Do wpłaty do US</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_25" model="account.account.tag">
-      <field name="name">Podatek - Wydatek na kasy rejestrujące</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_26" model="account.account.tag">
-      <field name="name">Podatek - Objęty zaniechaniem poboru</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_27" model="account.account.tag">
-      <field name="name">Podatek - Razem C</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_28" model="account.account.tag">
-      <field name="name">Podatek - Dostawa towarów/usług, kraj, 3% lub 5%</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_29" model="account.account.tag">
-      <field name="name">Podatek - Dostawa towarów/usług, kraj, 7% lub 8%</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_30" model="account.account.tag">
-      <field name="name">Podatek - Dostawa towarów/usług, kraj, 22% lub 23%</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_31" model="account.account.tag">
-      <field name="name">Podatek - Wewn-wspól. nabycie towarów</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_32" model="account.account.tag">
-      <field name="name">Podatek - Import towarów art. 33a</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_33" model="account.account.tag">
-      <field name="name">Podatek - Import usług</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_34" model="account.account.tag">
-      <field name="name">Podatek - W tym nabycie wg art 28b</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_35" model="account.account.tag">
-      <field name="name">Podatek - Dostawa towarów, podatnik nabywca</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_36" model="account.account.tag">
-      <field name="name">Podatek - Ze spisu z natury art 14.5</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_37" model="account.account.tag">
-      <field name="name">Podatek - Wew.wspól. nabycie środk. transp. termin</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_38" model="account.account.tag">
-      <field name="name">Podatek - Razem D</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_39" model="account.account.tag">
-      <field name="name">Podatek - Nadwyżka z poprzedniej deklaracji</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_40" model="account.account.tag">
-      <field name="name">Podatek - Naliczony ze spisu z natury, art.113</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_41" model="account.account.tag">
-      <field name="name">Podatek - Nabycie towarów i usług ś.trwałe</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_42" model="account.account.tag">
-      <field name="name">Podatek - Nabycie towarów i usług pozostałych</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_43" model="account.account.tag">
-      <field name="name">Podatek - Nabycie towarów i usług pozostałych bis</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_44" model="account.account.tag">
-      <field name="name">Podatek - Korekta naliczonego od nabycia ś.trwałych</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_45" model="account.account.tag">
-      <field name="name">Podatek - Korekta naliczonego od pozostałych nabyć</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_46" model="account.account.tag">
-      <field name="name">Podatek - Wydatek na kasy do zwrotu w tym okresie</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_47" model="account.account.tag">
-      <field name="name">Podatek - Do zwrotu</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_48" model="account.account.tag">
-      <field name="name">Podatek - Do zwrotu 25 dni</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_49" model="account.account.tag">
-      <field name="name">Podatek - Do zwrotu 60 dni</field>
-      <field name="applicability">taxes</field>
-    </record>
-    <record id="tag_pl_50" model="account.account.tag">
-      <field name="name">Podatek - Do zwrotu 180 dni</field>
-      <field name="applicability">taxes</field>
-    </record>
-
-    # VAT domestic sale
+    <!-- VAT domestic sale-->
 
     <record id="vs_kraj_23" model="account.tax.template">
       <field name="chart_template_id" ref="pl_chart_template"/>
@@ -215,10 +12,33 @@
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
       <field name="sequence" eval="0"/>
-      <field name="refund_account_id" ref="chart22030400"/>
-      <field name="account_id" ref="chart22030400"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_09'), ref('l10n_pl.tag_pl_30')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_23"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_kraj_22_lub_23')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_22_lub_23')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_kraj_22_lub_23')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_22_lub_23')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_23"/>
     </record>
 
     <record id="vs_kraj_22" model="account.tax.template">
@@ -228,10 +48,33 @@
       <field name="amount">22</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="refund_account_id" ref="chart22030100"/>
-      <field name="account_id" ref="chart22030100"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_09'), ref('l10n_pl.tag_pl_30')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_22"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_kraj_22_lub_23')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030100'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_22_lub_23')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_kraj_22_lub_23')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030100'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_22_lub_23')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_22"/>
     </record>
 
     <record id="vs_kraj_8" model="account.tax.template">
@@ -241,10 +84,33 @@
       <field name="amount">8</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="refund_account_id" ref="chart22030500"/>
-      <field name="account_id" ref="chart22030500"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_08'), ref('l10n_pl.tag_pl_29')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_8"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_kraj_7_lub_8')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030500'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_7_lub_8')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_kraj_7_lub_8')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030500'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_7_lub_8')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_8"/>
     </record>
 
     <record id="vs_kraj_7" model="account.tax.template">
@@ -254,10 +120,33 @@
       <field name="amount">7</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="refund_account_id" ref="chart22030200"/>
-      <field name="account_id" ref="chart22030200"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_08'), ref('l10n_pl.tag_pl_29')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_7"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_kraj_7_lub_8')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030200'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_7_lub_8')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_kraj_7_lub_8')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030200'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_7_lub_8')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_7"/>
     </record>
 
     <record id="vs_kraj_5" model="account.tax.template">
@@ -267,10 +156,33 @@
       <field name="amount">5</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="refund_account_id" ref="chart22030600"/>
-      <field name="account_id" ref="chart22030600"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_07'), ref('l10n_pl.tag_pl_28')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_5"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_kraj_3_lub_5')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030600'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_3_lub_5')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_kraj_3_lub_5')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030600'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_3_lub_5')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_5"/>
     </record>
 
     <record id="vs_kraj_3" model="account.tax.template">
@@ -280,10 +192,33 @@
       <field name="amount">3</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="refund_account_id" ref="chart22030300"/>
-      <field name="account_id" ref="chart22030300"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_07'), ref('l10n_pl.tag_pl_28')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_3"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_kraj_3_lub_5')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030300'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_3_lub_5')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_kraj_3_lub_5')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030300'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_3_lub_5')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_3"/>
     </record>
 
     <record id="vs_kraj_0" model="account.tax.template">
@@ -293,8 +228,29 @@
       <field name="amount">0</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_05')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslugi_kraj_0')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslugi_kraj_0')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
     <record id="vs_kraj_zw" model="account.tax.template">
@@ -304,8 +260,29 @@
       <field name="amount">0</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_02')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_kraj_zwolnione')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_kraj_zwolnione')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
     <record id="vs_kraj_usl_23" model="account.tax.template">
@@ -315,10 +292,33 @@
       <field name="amount">23</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="refund_account_id" ref="chart22030400"/>
-      <field name="account_id" ref="chart22030400"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_09'), ref('l10n_pl.tag_pl_30')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_23"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_kraj_22_lub_23')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_22_lub_23')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_kraj_22_lub_23')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_22_lub_23')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_23"/>
     </record>
 
     <record id="vs_kraj_usl_22" model="account.tax.template">
@@ -328,13 +328,36 @@
       <field name="amount">22</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="refund_account_id" ref="chart22030100"/>
-      <field name="account_id" ref="chart22030100"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_09'), ref('l10n_pl.tag_pl_30')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_22"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_kraj_22_lub_23')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030100'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_22_lub_23')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_kraj_22_lub_23')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030100'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_kraj_22_lub_23')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_22"/>
     </record>
 
-    # VAT domestic purchase
+    <!-- VAT domestic purchase -->
 
     <record id="vz_kraj_23" model="account.tax.template">
       <field name="chart_template_id" ref="pl_chart_template"/>
@@ -344,10 +367,33 @@
       <field name="amount_type">percent</field>
       <field name="sequence" eval="0"/>
       <field name="type_tax_use">purchase</field>
-      <field name="refund_account_id" ref="chart22020400"/>
-      <field name="account_id" ref="chart22020400"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_23"/>
+      <field name="tax_group_id" ref="tax_group_vat_23"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+      ]"/>
     </record>
 
     <record id="vz_kraj_22" model="account.tax.template">
@@ -357,10 +403,33 @@
       <field name="amount">22</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="refund_account_id" ref="chart22020100"/>
-      <field name="account_id" ref="chart22020100"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_22"/>
+      <field name="tax_group_id" ref="tax_group_vat_22"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020100'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020100'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+      ]"/>
     </record>
 
     <record id="vz_kraj_8" model="account.tax.template">
@@ -370,10 +439,33 @@
       <field name="amount">8</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="refund_account_id" ref="chart22020500"/>
-      <field name="account_id" ref="chart22020500"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_8"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020500'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020500'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_8"/>
     </record>
 
     <record id="vz_kraj_7" model="account.tax.template">
@@ -383,10 +475,33 @@
       <field name="amount">7</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="refund_account_id" ref="chart22020200"/>
-      <field name="account_id" ref="chart22020200"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_7"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020200'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020200'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_7"/>
     </record>
 
     <record id="vz_kraj_5" model="account.tax.template">
@@ -396,10 +511,33 @@
       <field name="amount">5</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="refund_account_id" ref="chart22020600"/>
-      <field name="account_id" ref="chart22020600"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_5"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020600'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020600'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_5"/>
     </record>
 
     <record id="vz_kraj_3" model="account.tax.template">
@@ -409,10 +547,33 @@
       <field name="amount">3</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="refund_account_id" ref="chart22020300"/>
-      <field name="account_id" ref="chart22020300"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_3"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020300'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020300'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_3"/>
     </record>
 
     <record id="vz_kraj_0" model="account.tax.template">
@@ -422,8 +583,31 @@
       <field name="amount">0</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
     <record id="vz_kraj_zw" model="account.tax.template">
@@ -433,8 +617,31 @@
       <field name="amount">0</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
     <record id="vz_kraj_usl_23" model="account.tax.template">
@@ -444,10 +651,33 @@
       <field name="amount">23</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="refund_account_id" ref="chart22020400"/>
-      <field name="account_id" ref="chart22020400"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_23"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_23"/>
     </record>
 
     <record id="vz_kraj_usl_22" model="account.tax.template">
@@ -457,96 +687,133 @@
       <field name="amount">22</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="refund_account_id" ref="chart22020100"/>
-      <field name="account_id" ref="chart22020100"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_22"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020100'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020100'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_22"/>
     </record>
 
-    # Vehicle leasing
-    #================================================
-
-    <record id="vp_leas_sale_1" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">VAT - leasing pojazdu 60% x 23%(sale)</field>
-      <field name="description">VLP-1</field>
-      <field name="amount" eval="13.80"/>
-      <field name="sequence" eval="10"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart22020400"/>
-      <field name="account_id" ref="chart22020400"/>
-      <field name="type_tax_use">none</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_43')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_23"/>
-    </record>
-
-    <record id="vp_leas_purchase_1" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">VAT - leasing pojazdu 60% x 23%(purchase)</field>
-      <field name="description">VLP-1</field>
-      <field name="amount" eval="13.80"/>
-      <field name="sequence" eval="10"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart22020400"/>
-      <field name="account_id" ref="chart22020400"/>
-      <field name="type_tax_use">none</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_23"/>
-    </record>
-
-    <record id="vp_leas_sale_2" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">VAT - leasing pojazdu 40% x 23%(sale)</field>
-      <field name="description">VLP-2</field>
-      <field name="amount" eval="9.2"/>
-      <field name="sequence" eval="20"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart76140000"/>
-      <field name="account_id" ref="chart76140000"/>
-      <field name="type_tax_use">none</field>
-                        <field name="tax_group_id" ref="tax_group_vat_23"/>
-    </record>
-
-    <record id="vp_leas_purchase_2" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">VAT - leasing pojazdu 40% x 23%</field>
-      <field name="description">VLP-2</field>
-      <field name="amount" eval="9.2"/>
-      <field name="sequence" eval="20"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart76140000"/>
-      <field name="account_id" ref="chart76140000"/>
-      <field name="type_tax_use">none</field>
-                        <field name="tax_group_id" ref="tax_group_vat_23"/>
-    </record>
+    <!-- Vehicle leasing -->
+    <!-- ================================================ -->
 
     <record id="vp_leas_sale" model="account.tax.template">
       <field name="chart_template_id" ref="pl_chart_template"/>
       <field name="name">VAT - leasing pojazdu(sale)</field>
       <field name="description">VLP</field>
-      <field name="amount">1.00</field>
+      <field name="amount">23.00</field>
       <field name="sequence" eval="1"/>
-      <field name="amount_type">group</field>
+      <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="children_tax_ids" eval="[(6, 0, [ref('vp_leas_sale_1'), ref('vp_leas_sale_2')])]"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_21')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_23"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 60,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 40,
+              'repartition_type': 'tax',
+              'account_id': ref('chart76140000'),
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 60,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 40,
+              'repartition_type': 'tax',
+              'account_id': ref('chart76140000'),
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_23"/>
     </record>
 
     <record id="vp_leas_purchase" model="account.tax.template">
       <field name="chart_template_id" ref="pl_chart_template"/>
       <field name="name">VAT - leasing pojazdu(purchase)</field>
       <field name="description">VLP</field>
-      <field name="amount">1.00</field>
+      <field name="amount">23.00</field>
       <field name="sequence" eval="1"/>
-      <field name="amount_type">group</field>
+      <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="children_tax_ids" eval="[(6, 0, [ref('vp_leas_purchase_1'), ref('vp_leas_purchase_2')])]"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_20')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_23"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 60,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 40,
+              'repartition_type': 'tax',
+              'account_id': ref('chart76140000'),
+          }),
+      ]"/>
+      <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 60,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': 40,
+              'repartition_type': 'tax',
+              'account_id': ref('chart76140000'),
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_23"/>
     </record>
 
-    # Steel trade
+    <!-- Steel trade -->
 
     <record id="vs_stal" model="account.tax.template">
       <field name="chart_template_id" ref="pl_chart_template"/>
@@ -555,52 +822,81 @@
       <field name="amount">0</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_17')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_0"/>
-    </record>
-
-    <record id="vz_stal_podatek_naliczony" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">Zakup stali - podatek naliczony</field>
-      <field name="description">ZST1</field>
-      <field name="amount" eval="23"/>
-      <field name="sequence" eval="100"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart22020400"/>
-      <field name="account_id" ref="chart22020400"/>
-      <field name="type_tax_use">none</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
-    </record>
-
-    <record id="vz_stal_podatek_nalezny" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">Zakup stali - podatek należny</field>
-      <field name="description">ZST2</field>
-      <field name="amount" eval="-23"/>
-      <field name="sequence" eval="110"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart22030400"/>
-      <field name="account_id" ref="chart22030400"/>
-      <field name="type_tax_use">none</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_35')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_podatnik_nabywca')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_podatnik_nabywca')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
     <record id="vz_stal" model="account.tax.template">
       <field name="chart_template_id" ref="pl_chart_template"/>
       <field name="name">Zakup stali</field>
       <field name="description">ZST</field>
-      <field name="amount">1.0</field>
-      <field name="amount_type">group</field>
+      <field name="amount">23.0</field>
+      <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="children_tax_ids" eval="[(6, 0, [ref('vz_stal_podatek_naliczony'), ref('vz_stal_podatek_nalezny')])]"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_20'), ref('l10n_pl.tag_pl_16')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych'), ref('account_tax_report_line_podatnik_nabywca')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': -100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')],
+          }),
+      ]"/>
+      <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych'), ref('account_tax_report_line_podatnik_nabywca')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': -100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
-    # Eurpean Union
-    #===========================================================
+    <!-- Eurpean Union -->
+    <!-- =========================================================== -->
 
     <record id="vs_unia" model="account.tax.template">
       <field name="chart_template_id" ref="pl_chart_template"/>
@@ -609,48 +905,77 @@
       <field name="amount">0</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_10')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_0"/>
-    </record>
-
-    <record id="vz_unia_podatek_naliczony" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">Nab tow unia - podatek naliczony</field>
-      <field name="description">UNT1</field>
-      <field name="amount" eval="23"/>
-      <field name="sequence" eval="100"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart22020400"/>
-      <field name="account_id" ref="chart22020400"/>
-      <field name="type_tax_use">none</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
-    </record>
-
-    <record id="vz_unia_podatek_nalezny" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">Nab tow unia - podatek należny</field>
-      <field name="description">UNT2</field>
-      <field name="amount" eval="-23"/>
-      <field name="sequence" eval="110"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart22030400"/>
-      <field name="account_id" ref="chart22030400"/>
-      <field name="type_tax_use">none</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_31')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_dostawa_towarow')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_dostawa_towarow')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
     <record id="vz_unia" model="account.tax.template">
       <field name="chart_template_id" ref="pl_chart_template"/>
       <field name="name">Nab tow unia</field>
       <field name="description">UNT</field>
-      <field name="amount">1.0</field>
-      <field name="amount_type">group</field>
+      <field name="amount">23.0</field>
+      <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="children_tax_ids" eval="[(6, 0, [ref('vz_unia_podatek_naliczony'), ref('vz_unia_podatek_nalezny')])]"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_20'), ref('l10n_pl.tag_pl_12')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych'), ref('account_tax_report_line_nabycie_towarow')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': -100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')],
+          }),
+      ]"/>
+      <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych'), ref('account_tax_report_line_nabycie_towarow')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': -100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
     <record id="vs_dostu" model="account.tax.template">
@@ -660,53 +985,82 @@
       <field name="amount">0</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_04')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_0"/>
-    </record>
-
-    <record id="vz_nabu_podatek_naliczony" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">Nab Usł - podatek naliczony</field>
-      <field name="description">UNU1</field>
-      <field name="amount" eval="23"/>
-      <field name="sequence" eval="200"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart22020400"/>
-      <field name="account_id" ref="chart22020400"/>
-      <field name="type_tax_use">none</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
-    </record>
-
-    <record id="vz_nabu_2" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">Nab Usł - podatek należny</field>
-      <field name="description">UNU2</field>
-      <field name="amount" eval="-23"/>
-      <field name="sequence" eval="210"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart22030400"/>
-      <field name="account_id" ref="chart22030400"/>
-      <field name="type_tax_use">none</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_34')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslugi_art_100_1_4')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslugi_art_100_1_4')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
     <record id="vz_nabu" model="account.tax.template">
       <field name="chart_template_id" ref="pl_chart_template"/>
       <field name="name">Nab Usł</field>
       <field name="description">UNU</field>
-      <field name="amount">1.0</field>
-      <field name="amount_type">group</field>
+      <field name="amount">23.0</field>
+      <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="children_tax_ids" eval="[(6, 0, [ref('vz_nabu_podatek_naliczony'), ref('vz_nabu_2')])]"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_20'),ref('l10n_pl.tag_pl_15')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych'), ref('account_tax_report_line_art_28b')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': -100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')],
+          }),
+      ]"/>
+      <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych'), ref('account_tax_report_line_art_28b')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': -100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
 
-    # Export / Import
-    #================================================
+    <!-- Export / Import -->
+    <!-- ================================================ -->
 
     <record id="vs_eksp_tow" model="account.tax.template">
       <field name="chart_template_id" ref="pl_chart_template"/>
@@ -715,48 +1069,77 @@
       <field name="amount">0</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_11')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_0"/>
-    </record>
-
-    <record id="vz_imp_tow_podatek_naliczony" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">Imp Tow - podatek naliczony</field>
-      <field name="description">IMT1</field>
-      <field name="amount" eval="23"/>
-      <field name="sequence" eval="200"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart22020400"/>
-      <field name="account_id" ref="chart22020400"/>
-      <field name="type_tax_use">none</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
-    </record>
-
-    <record id="vz_imp_tow_podatek_nalezny" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">Imp Tow - podatek należny</field>
-      <field name="description">IMT2</field>
-      <field name="amount" eval="-23"/>
-      <field name="sequence" eval="210"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart22030400"/>
-      <field name="account_id" ref="chart22030400"/>
-      <field name="type_tax_use">none</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_32')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_eksport_towarow')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+      ]"/>
+      <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_eksport_towarow')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
     <record id="vz_imp_tow" model="account.tax.template">
       <field name="chart_template_id" ref="pl_chart_template"/>
       <field name="name">Imp Tow</field>
       <field name="description">IMT</field>
-      <field name="amount">1.0</field>
-      <field name="amount_type">group</field>
+      <field name="amount">23.0</field>
+      <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="children_tax_ids" eval="[(6, 0, [ref('vz_imp_tow_podatek_naliczony'), ref('vz_imp_tow_podatek_nalezny')])]"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_13'), ref('l10n_pl.tag_pl_20')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych'), ref('account_tax_report_line_art_33a')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': -100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')],
+          }),
+      ]"/>
+      <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych'), ref('account_tax_report_line_art_33a')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': -100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
     <record id="vs_ekspu" model="account.tax.template">
@@ -766,48 +1149,77 @@
       <field name="amount">0</field>
       <field name="amount_type">percent</field>
       <field name="type_tax_use">sale</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_03')])]"/>
-                <field name="tax_group_id" ref="tax_group_vat_0"/>
-    </record>
-
-    <record id="vz_impu_podatek_naliczony" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">Imp Usł - podatek naliczony</field>
-      <field name="description">IMU1</field>
-      <field name="amount" eval="23"/>
-      <field name="sequence" eval="200"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart22020400"/>
-      <field name="account_id" ref="chart22020400"/>
-      <field name="type_tax_use">none</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
-    </record>
-
-    <record id="vz_impu_podatek_nalezny" model="account.tax.template">
-      <field name="chart_template_id" ref="pl_chart_template"/>
-      <field name="name">Imp Usł - podatek należny</field>
-      <field name="description">IMU2</field>
-      <field name="amount" eval="-23"/>
-      <field name="sequence" eval="210"/>
-      <field name="amount_type">percent</field>
-      <field name="refund_account_id" ref="chart22030400"/>
-      <field name="account_id" ref="chart22030400"/>
-      <field name="type_tax_use">none</field>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_33')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_poza_kraj')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+                ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_poza_kraj')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
     <record id="vz_impu" model="account.tax.template">
       <field name="chart_template_id" ref="pl_chart_template"/>
       <field name="name">Imp Usł</field>
       <field name="description">IMU</field>
-      <field name="amount">1.00</field>
-      <field name="amount_type">group</field>
+      <field name="amount">23.00</field>
+      <field name="amount_type">percent</field>
       <field name="type_tax_use">purchase</field>
-      <field name="children_tax_ids" eval="[(6, 0, [ref('vz_impu_podatek_naliczony'), ref('vz_impu_podatek_nalezny')])]"/>
-      <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_14'), ref('l10n_pl.tag_pl_20')])]"/>
-                        <field name="tax_group_id" ref="tax_group_vat_0"/>
+      <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'plus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych'), ref('account_tax_report_line_import_uslug')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': -100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')],
+          }),
+      ]"/>
+      <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'base',
+              'minus_report_line_ids': [ref('account_tax_report_line_uslug_pozostalych'), ref('account_tax_report_line_import_uslug')],
+          }),
+          (0,0, {
+              'factor_percent': 100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22020400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
+          }),
+          (0,0, {
+              'factor_percent': -100,
+              'repartition_type': 'tax',
+              'account_id': ref('chart22030400'),
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')],
+          }),
+      ]"/>
+      <field name="tax_group_id" ref="tax_group_vat_0"/>
     </record>
 
 
diff --git a/addons/l10n_pl/data/account_tax_report_data.xml b/addons/l10n_pl/data/account_tax_report_data.xml
new file mode 100644
index 00000000000..f7b2bb21958
--- /dev/null
+++ b/addons/l10n_pl/data/account_tax_report_data.xml
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="account_tax_report_line_razem_c" model="account.tax.report.line">
+        <field name="name">Podstawa - Razem C</field>
+        <field name="sequence" eval="1"/>
+        <field name="formula">PLTAXC_01_10 + PLTAXC_02_11 + PLTAXC_03_13 + PLTAXC_04_15 + PLTAXC_05_17 + PLTAXC_06_19 + PLTAXC_07_21 + PLTAXC_08_22 + PLTAXC_09_23 + PLTAXC_10_25 + PLTAXC_11_27 + PLTAXC_12_31</field>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_kraj_zwolnione" model="account.tax.report.line">
+        <field name="name">Podstawa - Dostawa towarów/usług, kraj, zwolnione</field>
+        <field name="tag_name">Podstawa - Dostawa towarów/usług, kraj, zwolnione</field>
+        <field name="code">PLTAXC_01_10</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_poza_kraj" model="account.tax.report.line">
+        <field name="name">Podstawa - Dostawa towarów/usług, poza kraj</field>
+        <field name="tag_name">Podstawa - Dostawa towarów/usług, poza kraj</field>
+        <field name="code">PLTAXC_02_11</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_uslugi_art_100_1_4" model="account.tax.report.line">
+        <field name="name">Podstawa - W tym usługi art 100.1.4</field>
+        <field name="tag_name">Podstawa - W tym usługi art 100.1.4</field>
+        <field name="code">PLTAXC_02a_12</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_poza_kraj"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_uslugi_kraj_0" model="account.tax.report.line">
+        <field name="name">Podstawa - Dostawa towarów/usług, kraj, 0%</field>
+        <field name="tag_name">Podstawa - Dostawa towarów/usług, kraj, 0%</field>
+        <field name="code">PLTAXC_03_13</field>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_towary_art_129" model="account.tax.report.line">
+        <field name="name">Podstawa - W tym towary art 129</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_uslugi_kraj_0"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_kraj_3_lub_5" model="account.tax.report.line">
+        <field name="name">Podstawa - Dostawa towarów/usług, kraj, 3% lub 5%</field>
+        <field name="tag_name">Podstawa - Dostawa towarów/usług, kraj, 3% lub 5%</field>
+        <field name="code">PLTAXC_04_15</field>
+        <field name="sequence" eval="4"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_kraj_7_lub_8" model="account.tax.report.line">
+        <field name="name">Podstawa - Dostawa towarów/usług, kraj, 7% lub 8%</field>
+        <field name="tag_name">Podstawa - Dostawa towarów/usług, kraj, 7% lub 8%</field>
+        <field name="code">PLTAXC_05_17</field>
+        <field name="sequence" eval="5"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_kraj_22_lub_23" model="account.tax.report.line">
+        <field name="name">Podstawa - Dostawa towarów/usług, kraj, 22% lub 23%</field>
+        <field name="tag_name">Podstawa - Dostawa towarów/usług, kraj, 22% lub 23%</field>
+        <field name="code">PLTAXC_06_19</field>
+        <field name="sequence" eval="6"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_dostawa_towarow" model="account.tax.report.line">
+        <field name="name">Podstawa - Wew-wspól dostawa towarów</field>
+        <field name="tag_name">Podstawa - Wew-wspól dostawa towarów</field>
+        <field name="code">PLTAXC_07_21</field>
+        <field name="sequence" eval="7"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_eksport_towarow" model="account.tax.report.line">
+        <field name="name">Podstawa - Eksport towarów</field>
+        <field name="tag_name">Podstawa - Eksport towarów</field>
+        <field name="code">PLTAXC_08_22</field>
+        <field name="sequence" eval="8"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_nabycie_towarow" model="account.tax.report.line">
+        <field name="name">Podstawa - Wewn-wspól. nabycie towarów</field>
+        <field name="tag_name">Podstawa - Wewn-wspól. nabycie towarów</field>
+        <field name="code">PLTAXC_09_23</field>
+        <field name="sequence" eval="9"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_art_33a" model="account.tax.report.line">
+        <field name="name">Podstawa - Import towarów art. 33a</field>
+        <field name="tag_name">Podstawa - Import towarów art. 33a</field>
+        <field name="code">PLTAXC_10_25</field>
+        <field name="sequence" eval="10"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_import_uslug" model="account.tax.report.line">
+        <field name="name">Podstawa - Import usług</field>
+        <field name="tag_name">Podstawa - Import usług</field>
+        <field name="code">PLTAXC_11_27</field>
+        <field name="sequence" eval="11"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_art_28b" model="account.tax.report.line">
+        <field name="name">Podstawa - W tym nabycie wg art 28b</field>
+        <field name="tag_name">Podstawa - W tym nabycie wg art 28b</field>
+        <field name="code">PLTAXC_11a_29</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_import_uslug"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatnik_nabywca" model="account.tax.report.line">
+        <field name="name">Podstawa - Dostawa towarów, podatnik nabywca</field>
+        <field name="tag_name">Podstawa - Dostawa towarów, podatnik nabywca</field>
+        <field name="code">PLTAXC_12_31</field>
+        <field name="sequence" eval="12"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_razem_d" model="account.tax.report.line">
+        <field name="name">Podstawa - Razem D</field>
+        <field name="sequence" eval="2"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_uslug_s_trwale" model="account.tax.report.line">
+        <field name="name">Podstawa - Nabycie towarów i usług ś.trwałe</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_d"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_uslug_pozostalych" model="account.tax.report.line">
+        <field name="name">Podstawa - Nabycie towarów i usług pozostałych</field>
+        <field name="tag_name">Podstawa - Nabycie towarów i usług pozostałych</field>
+        <field name="code">PLTAXD_02_41a</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_razem_d"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_do_przeniesienia" model="account.tax.report.line">
+        <field name="name">Podatek - Do przeniesienia</field>
+        <field name="sequence" eval="3"/>
+        <field name="formula">PLTAXC_04_16 + PLTAXC_05_18 + PLTAXC_06_20 + PLTAXC_09_24 + PLTAXC_10_26 + PLTAXC_11_28 + PLTAXC_12_32 + PLTAXD_02_42</field>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_nad_naleznym" model="account.tax.report.line">
+        <field name="name">Podatek - Nadwyżka naliczonego nad należnym</field>
+        <field name="sequence" eval="1"/>
+        <field name="formula">PLTAXC_04_16 + PLTAXC_05_18 + PLTAXC_06_20 + PLTAXC_09_24 + PLTAXC_10_26 + PLTAXC_11_28 + PLTAXC_12_32 + PLTAXD_02_42</field>
+        <field name="parent_id" ref="account_tax_report_line_do_przeniesienia"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_do_US" model="account.tax.report.line">
+        <field name="name">Podatek - Do wpłaty do US</field>
+        <field name="sequence" eval="1"/>
+        <field name="formula">PLTAXC_04_16 + PLTAXC_05_18 + PLTAXC_06_20 + PLTAXC_09_24 + PLTAXC_10_26 + PLTAXC_11_28 + PLTAXC_12_32 + PLTAXD_02_42</field>
+        <field name="parent_id" ref="account_tax_report_line_nad_naleznym"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_kasy_rejestrujace" model="account.tax.report.line">
+        <field name="name">Podatek - Wydatek na kasy rejestrujące</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_do_US"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_zaniechaniem_poboru" model="account.tax.report.line">
+        <field name="name">Podatek - Objęty zaniechaniem poboru</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_line_do_US"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_razem_c" model="account.tax.report.line">
+        <field name="name">Podatek - Razem C</field>
+        <field name="sequence" eval="3"/>
+        <field name="formula">PLTAXC_04_16 + PLTAXC_05_18 + PLTAXC_06_20 + PLTAXC_09_24 + PLTAXC_10_26 + PLTAXC_11_28 + PLTAXC_12_32</field>
+        <field name="parent_id" ref="account_tax_report_line_do_US"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_kraj_3_lub_5" model="account.tax.report.line">
+        <field name="name">Podatek - Dostawa towarów/usług, kraj, 3% lub 5%</field>
+        <field name="tag_name">Podatek - Dostawa towarów/usług, kraj, 3% lub 5%</field>
+        <field name="code">PLTAXC_04_16</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_kraj_7_lub_8" model="account.tax.report.line">
+        <field name="name">Podatek - Dostawa towarów/usług, kraj, 7% lub 8%</field>
+        <field name="tag_name">Podatek - Dostawa towarów/usług, kraj, 7% lub 8%</field>
+        <field name="code">PLTAXC_05_18</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_kraj_22_lub_23" model="account.tax.report.line">
+        <field name="name">Podatek - Dostawa towarów/usług, kraj, 22% lub 23%</field>
+        <field name="tag_name">Podatek - Dostawa towarów/usług, kraj, 22% lub 23%</field>
+        <field name="code">PLTAXC_06_20</field>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_nabycie_towarow" model="account.tax.report.line">
+        <field name="name">Podatek - Wewn-wspól. nabycie towarów</field>
+        <field name="tag_name">Podatek - Wewn-wspól. nabycie towarów</field>
+        <field name="code">PLTAXC_09_24</field>
+        <field name="sequence" eval="4"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_art_33a" model="account.tax.report.line">
+        <field name="name">Podatek - Import towarów art. 33a</field>
+        <field name="tag_name">Podatek - Import towarów art. 33a</field>
+        <field name="code">PLTAXC_10_26</field>
+        <field name="sequence" eval="5"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_import_uslug" model="account.tax.report.line">
+        <field name="name">Podatek - Import usług</field>
+        <field name="tag_name">Podatek - Import usług</field>
+        <field name="code">PLTAXC_11_28</field>
+        <field name="sequence" eval="6"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_art_28b" model="account.tax.report.line">
+        <field name="name">Podatek - W tym nabycie wg art 28b</field>
+        <field name="tag_name">Podatek - W tym nabycie wg art 28b</field>
+        <field name="code">PLTAXC_11a_30</field>
+        <field name="sequence" eval="6"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_import_uslug"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_podatnik_nabywca" model="account.tax.report.line">
+        <field name="name">Podatek - Dostawa towarów, podatnik nabywca</field>
+        <field name="tag_name">Podatek - Dostawa towarów, podatnik nabywca</field>
+        <field name="code">PLTAXC_12_32</field>
+        <field name="sequence" eval="7"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_art_14_5" model="account.tax.report.line">
+        <field name="name">Podatek - Ze spisu z natury art 14.5</field>
+        <field name="sequence" eval="8"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_transp_termin" model="account.tax.report.line">
+        <field name="name">Podatek - Wew.wspól. nabycie środk. transp. termin</field>
+        <field name="sequence" eval="9"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_razem_d" model="account.tax.report.line">
+        <field name="name">Podatek - Razem D</field>
+        <field name="sequence" eval="4"/>
+        <field name="parent_id" ref="account_tax_report_line_do_US"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_deklaracji" model="account.tax.report.line">
+        <field name="name">Podatek - Nadwyżka z poprzedniej deklaracji</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_d"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_pl_03_01_01_04_02" model="account.tax.report.line">
+        <field name="name">Podatek - Naliczony ze spisu z natury, art.113</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_d"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_s_trwale" model="account.tax.report.line">
+        <field name="name">Podatek - Nabycie towarów i usług ś.trwałe</field>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_d"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_uslug_pozostalych" model="account.tax.report.line">
+        <field name="name">Podatek - Nabycie towarów i usług pozostałych</field>
+        <field name="tag_name">Podatek - Nabycie towarów i usług pozostałych</field>
+        <field name="code">PLTAXD_02_42</field>
+        <field name="sequence" eval="4"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_d"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_s_trwalych" model="account.tax.report.line">
+        <field name="name">Podatek - Korekta naliczonego od nabycia ś.trwałych</field>
+        <field name="sequence" eval="5"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_d"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_pozostalych_nabyc" model="account.tax.report.line">
+        <field name="name">Podatek - Korekta naliczonego od pozostałych nabyć</field>
+        <field name="sequence" eval="6"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_razem_d"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_okresie" model="account.tax.report.line">
+        <field name="name">Podatek - Wydatek na kasy do zwrotu w tym okresie</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_line_nad_naleznym"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_podatek_do_zwrotu" model="account.tax.report.line">
+        <field name="name">Podatek - Do zwrotu</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_line_do_przeniesienia"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_do_zwrotu_25_dni" model="account.tax.report.line">
+        <field name="name">Podatek - Do zwrotu 25 dni</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_do_zwrotu"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_do_zwrotu_60_dni" model="account.tax.report.line">
+        <field name="name">Podatek - Do zwrotu 60 dni</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_do_zwrotu"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+    <record id="account_tax_report_line_do_zwrotu_180_dni" model="account.tax.report.line">
+        <field name="name">Podatek - Do zwrotu 180 dni</field>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref="account_tax_report_line_podatek_do_zwrotu"/>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
+</odoo>
-- 
cgit v1.2.3