diff --git a/addons/l10n_lu/data/account.account.template-2011.csv b/addons/l10n_lu/data/account.account.template-2011.csv
index 768f01822189fb2a6a104c0e734e451c821f54b6..6231d573b9c76602731be89d119129c14232e6a0 100644
--- a/addons/l10n_lu/data/account.account.template-2011.csv
+++ b/addons/l10n_lu/data/account.account.template-2011.csv
@@ -213,7 +213,7 @@ lu_2020_account_42145,42145,Withholding tax on financial investment income,accou
lu_2020_account_42146,42146,Withholding tax on director's fees,account.data_account_type_current_liabilities,FALSE,lu_2011_chart_1
lu_2020_account_42148,42148,ACD - Other amounts receivable,account.data_account_type_current_liabilities,FALSE,lu_2011_chart_1
lu_2011_account_4215,4215,Customs and Excise Authority (ADA),account.data_account_type_current_assets,FALSE,lu_2011_chart_1
-lu_2020_account_421611,421611,VAT paid and recoverable,account.data_account_type_current_liabilities,FALSE,lu_2011_chart_1
+lu_2020_account_421611,421611,VAT paid and recoverable,account.data_account_type_current_assets,FALSE,lu_2011_chart_1
lu_2011_account_421612,421612,VAT receivable,account.data_account_type_current_assets,FALSE,lu_2011_chart_1
lu_2011_account_421613,421613,VAT down payments made,account.data_account_type_current_assets,FALSE,lu_2011_chart_1
lu_2011_account_421618,421618,VAT - Other receivables,account.data_account_type_current_assets,FALSE,lu_2011_chart_1
diff --git a/addons/l10n_lu/data/account.tax.group.csv b/addons/l10n_lu/data/account.tax.group.csv
index e175371ef4400a007fc439c6d331eee28f7cc831..28af98e1489683a4da35bf080f165a7fe1d7126a 100644
--- a/addons/l10n_lu/data/account.tax.group.csv
+++ b/addons/l10n_lu/data/account.tax.group.csv
@@ -1,10 +1,10 @@
-id,name
-tax_group_0,TVA 0%
-tax_group_3,TVA 3%
-tax_group_6,TVA 6%
-tax_group_8,TVA 8%
-tax_group_10,TVA 10%
-tax_group_12,TVA 12%
-tax_group_14,TVA 14%
-tax_group_15,TVA 15%
-tax_group_17,TVA 17%
+id,name,property_tax_payable_account_id:id,property_tax_receivable_account_id:id,property_advance_tax_payment_account_id:id
+tax_group_0,TVA 0%,lu_2011_account_461412,lu_2011_account_421612,lu_2011_account_421613
+tax_group_3,TVA 3%,lu_2011_account_461412,lu_2011_account_421612,lu_2011_account_421613
+tax_group_6,TVA 6%,lu_2011_account_461412,lu_2011_account_421612,lu_2011_account_421613
+tax_group_8,TVA 8%,lu_2011_account_461412,lu_2011_account_421612,lu_2011_account_421613
+tax_group_10,TVA 10%,lu_2011_account_461412,lu_2011_account_421612,lu_2011_account_421613
+tax_group_12,TVA 12%,lu_2011_account_461412,lu_2011_account_421612,lu_2011_account_421613
+tax_group_14,TVA 14%,lu_2011_account_461412,lu_2011_account_421612,lu_2011_account_421613
+tax_group_15,TVA 15%,lu_2011_account_461412,lu_2011_account_421612,lu_2011_account_421613
+tax_group_17,TVA 17%,lu_2011_account_461412,lu_2011_account_421612,lu_2011_account_421613
diff --git a/addons/l10n_lu/data/account_tax_report_line.xml b/addons/l10n_lu/data/account_tax_report_line.xml
index cd2c40a09251cb944c9447145c2447f31b28fa6c..942c213c5ed58b64fdc4bf6a6eeea029f9b646d5 100644
--- a/addons/l10n_lu/data/account_tax_report_line.xml
+++ b/addons/l10n_lu/data/account_tax_report_line.xml
@@ -478,15 +478,16 @@
<field name="name">IV.C. Exceeding amount (105)</field>
<field name="sequence">3</field>
<field name="parent_id" ref="account_tax_report_line_4_tax_tobe_paid_or_reclaimed"/>
- <field name="formula">LUTAX_103-LUTAX_104</field>
+ <field name="formula">(LUTAX_702+LUTAX_704+LUTAX_706+LUTAX_040+LUTAX_IIA+LUTAX_712+LUTAX_714+LUTAX_716+LUTAX_054+LUTAX_722+LUTAX_724+LUTAX_726+LUTAX_068+LUTAX_732+LUTAX_734+LUTAX_736+LUTAX_073+LUTAX_742+LUTAX_744+LUTAX_746+LUTAX_432+LUTAX_752+LUTAX_754+LUTAX_756+LUTAX_442+LUTAX_762+LUTAX_764+LUTAX_227)-(LUTAX_458+LUTAX_459+LUTAX_460+LUTAX_090+LUTAX_461+LUTAX_092+LUTAX_228+LUTAX_094+LUTAX_095)</field>
<field name="country_id" ref="base.lu"/>
</record>
+ <!-- Note: this should have same formula as of section `II.H. Total tax due (076)` here above -->
<record id="account_tax_report_line_4a_total_tax_due" model="account.tax.report.line">
<field name="name">IV.A. Total tax due (103)</field>
<field name="sequence">1</field>
<field name="parent_id" ref="account_tax_report_line_4_tax_tobe_paid_or_reclaimed"/>
- <field name="code">LUTAX_103</field>
+ <field name="formula">LUTAX_702+LUTAX_704+LUTAX_706+LUTAX_040+LUTAX_IIA+LUTAX_712+LUTAX_714+LUTAX_716+LUTAX_054+LUTAX_722+LUTAX_724+LUTAX_726+LUTAX_068+LUTAX_732+LUTAX_734+LUTAX_736+LUTAX_073+LUTAX_742+LUTAX_744+LUTAX_746+LUTAX_432+LUTAX_752+LUTAX_754+LUTAX_756+LUTAX_442+LUTAX_762+LUTAX_764+LUTAX_227</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -517,6 +518,7 @@
<field name="tag_name">II.F. tax 8% (764)</field>
<field name="sequence">1</field>
<field name="parent_id" ref="account_tax_report_line_2f_supply_goods_tax"/>
+ <field name="code">LUTAX_764</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -524,13 +526,16 @@
<field name="name">II.G. Special arrangement for tax suspension: adjustment (Art.60bis, (5) and (8)) (227)</field>
<field name="sequence">12</field>
<field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
+ <field name="code">LUTAX_227</field>
<field name="country_id" ref="base.lu"/>
</record>
+ <!-- Note: any change in formula here should be reflected in section `IV.A. Total tax due (103)` below -->
<record id="account_tax_report_line_2h_total_tax_due" model="account.tax.report.line">
<field name="name">II.H. Total tax due (076)</field>
<field name="sequence">13</field>
<field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
+ <field name="formula">LUTAX_702+LUTAX_704+LUTAX_706+LUTAX_040+LUTAX_IIA+LUTAX_712+LUTAX_714+LUTAX_716+LUTAX_054+LUTAX_722+LUTAX_724+LUTAX_726+LUTAX_068+LUTAX_732+LUTAX_734+LUTAX_736+LUTAX_073+LUTAX_742+LUTAX_744+LUTAX_746+LUTAX_432+LUTAX_752+LUTAX_754+LUTAX_756+LUTAX_442+LUTAX_762+LUTAX_764+LUTAX_227</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -546,6 +551,7 @@
<field name="tag_name">II.A. tax 3% (040)</field>
<field name="sequence">9</field>
<field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_tax"/>
+ <field name="code">LUTAX_040</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -554,6 +560,7 @@
<field name="tag_name">II.A. tax 0%</field>
<field name="sequence">10</field>
<field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_tax"/>
+ <field name="code">LUTAX_IIA</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -562,6 +569,7 @@
<field name="tag_name">II.A. tax 17% (702)</field>
<field name="sequence">6</field>
<field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_tax"/>
+ <field name="code">LUTAX_702</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -570,6 +578,7 @@
<field name="tag_name">II.A. tax 14% (704)</field>
<field name="sequence">7</field>
<field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_tax"/>
+ <field name="code">LUTAX_704</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -578,6 +587,7 @@
<field name="tag_name">II.A. tax 8% (706)</field>
<field name="sequence">8</field>
<field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_tax"/>
+ <field name="code">LUTAX_706</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -593,6 +603,7 @@
<field name="tag_name">II.B. tax 3% (054)</field>
<field name="sequence">8</field>
<field name="parent_id" ref="account_tax_report_line_2b_intra_community_acquisitions_goods_tax"/>
+ <field name="code">LUTAX_054</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -601,6 +612,7 @@
<field name="tag_name">II.B. tax 17% (712)</field>
<field name="sequence">5</field>
<field name="parent_id" ref="account_tax_report_line_2b_intra_community_acquisitions_goods_tax"/>
+ <field name="code">LUTAX_712</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -609,6 +621,7 @@
<field name="tag_name">II.B. tax 14% (714)</field>
<field name="sequence">6</field>
<field name="parent_id" ref="account_tax_report_line_2b_intra_community_acquisitions_goods_tax"/>
+ <field name="code">LUTAX_714</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -617,6 +630,7 @@
<field name="tag_name">II.B. tax 8% (716)</field>
<field name="sequence">7</field>
<field name="parent_id" ref="account_tax_report_line_2b_intra_community_acquisitions_goods_tax"/>
+ <field name="code">LUTAX_716</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -632,6 +646,7 @@
<field name="tag_name">II.D.1. for business purposes: tax 14% (724)</field>
<field name="sequence">2</field>
<field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
+ <field name="code">LUTAX_724</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -640,6 +655,7 @@
<field name="tag_name">II.D.1. for business purposes: tax 8% (726)</field>
<field name="sequence">3</field>
<field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
+ <field name="code">LUTAX_726</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -648,6 +664,7 @@
<field name="tag_name">II.D.2. for non-business purposes: tax 17% (732)</field>
<field name="sequence">5</field>
<field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
+ <field name="code">LUTAX_732</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -656,6 +673,7 @@
<field name="tag_name">II.D.2. for non-business purposes: tax 14% (734)</field>
<field name="sequence">6</field>
<field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
+ <field name="code">LUTAX_734</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -664,6 +682,7 @@
<field name="tag_name">II.D.2. for non-business purposes: tax 8% (736)</field>
<field name="sequence">7</field>
<field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
+ <field name="code">LUTAX_736</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -672,6 +691,7 @@
<field name="tag_name">II.D.1. for business purposes: tax 3% (068)</field>
<field name="sequence">4</field>
<field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
+ <field name="code">LUTAX_068</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -680,6 +700,7 @@
<field name="tag_name">II.D.2. for non-business purposes: tax 3% (073)</field>
<field name="sequence">8</field>
<field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
+ <field name="code">LUTAX_073</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -688,6 +709,7 @@
<field name="tag_name">II.D.1. for business purposes: tax 17% (722)</field>
<field name="sequence">1</field>
<field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
+ <field name="code">LUTAX_722</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -710,6 +732,7 @@
<field name="tag_name">II.E.1.a) not exempt within the territory: tax 3% (432)</field>
<field name="sequence">8</field>
<field name="parent_id" ref="account_tax_report_line_2e_1_a_tax"/>
+ <field name="code">LUTAX_432</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -718,6 +741,7 @@
<field name="tag_name">II.E.1.a) not exempt within the territory: tax 17% (742)</field>
<field name="sequence">5</field>
<field name="parent_id" ref="account_tax_report_line_2e_1_a_tax"/>
+ <field name="code">LUTAX_742</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -726,6 +750,7 @@
<field name="tag_name">II.E.1.a) not exempt within the territory: tax 14% (744)</field>
<field name="sequence">6</field>
<field name="parent_id" ref="account_tax_report_line_2e_1_a_tax"/>
+ <field name="code">LUTAX_744</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -734,6 +759,7 @@
<field name="tag_name">II.E.1.a) not exempt within the territory: tax 8% (746)</field>
<field name="sequence">7</field>
<field name="parent_id" ref="account_tax_report_line_2e_1_a_tax"/>
+ <field name="code">LUTAX_746</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -749,6 +775,7 @@
<field name="tag_name">II.E.2. not established or residing within the Community: tax 3% (442)</field>
<field name="sequence">8</field>
<field name="parent_id" ref="account_tax_report_line_2e_2_tax"/>
+ <field name="code">LUTAX_442</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -757,6 +784,7 @@
<field name="tag_name">II.E.2. not established or residing within the Community: tax 17% (752)</field>
<field name="sequence">5</field>
<field name="parent_id" ref="account_tax_report_line_2e_2_tax"/>
+ <field name="code">LUTAX_752</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -765,6 +793,7 @@
<field name="tag_name">II.E.2. not established or residing within the Community: tax 14% (754)</field>
<field name="sequence">6</field>
<field name="parent_id" ref="account_tax_report_line_2e_2_tax"/>
+ <field name="code">LUTAX_754</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -773,6 +802,7 @@
<field name="tag_name">II.E.2. not established or residing within the Community: tax 8% (756)</field>
<field name="sequence">7</field>
<field name="parent_id" ref="account_tax_report_line_2e_2_tax"/>
+ <field name="code">LUTAX_756</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -788,14 +818,16 @@
<field name="tag_name">II.E.3. suppliers established within the territory: tax 17% (762)</field>
<field name="sequence">2</field>
<field name="parent_id" ref="account_tax_report_line_2e_3_tax"/>
+ <field name="code">LUTAX_762</field>
<field name="country_id" ref="base.lu"/>
</record>
+ <!-- Note: this should have same formula as of section `III.C. Total input tax deductible (102)` here below -->
<record id="account_tax_report_line_4a_total_input_tax_deductible" model="account.tax.report.line">
<field name="name">IV.B. Total input tax deductible (104)</field>
<field name="sequence">2</field>
<field name="parent_id" ref="account_tax_report_line_4_tax_tobe_paid_or_reclaimed"/>
- <field name="code">LUTAX_104</field>
+ <field name="formula">LUTAX_458+LUTAX_459+LUTAX_460+LUTAX_090+LUTAX_461+LUTAX_092+LUTAX_228+LUTAX_094+LUTAX_095</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -823,6 +855,7 @@
<field name="name">III.B.1. relating to transactions which are exempt pursuant to articles 44 and 56quater (094)</field>
<field name="sequence">1</field>
<field name="parent_id" ref="account_tax_report_line_3b_total_input_tax_nd"/>
+ <field name="code">LUTAX_094</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -830,13 +863,16 @@
<field name="name">III.B.2. where the deductible proportion determined in accordance to article 50 is applied (095)</field>
<field name="sequence">2</field>
<field name="parent_id" ref="account_tax_report_line_3b_total_input_tax_nd"/>
+ <field name="code">LUTAX_095</field>
<field name="country_id" ref="base.lu"/>
</record>
+ <!-- Note: any change in formula here should be reflected in section `IV.B. Total input tax deductible (104)` above -->
<record id="account_tax_report_line_3c_total_input_tax_deductible" model="account.tax.report.line">
<field name="name">III.C. Total input tax deductible (102)</field>
<field name="sequence">3</field>
<field name="parent_id" ref="account_tax_report_line_3_assessment_deducible_tax"/>
+ <field name="formula">LUTAX_458+LUTAX_459+LUTAX_460+LUTAX_090+LUTAX_461+LUTAX_092+LUTAX_228+LUTAX_094+LUTAX_095</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -845,6 +881,7 @@
<field name="tag_name">III.A.4. Due in respect of the application of goods for business purposes (Art.48(1)(d)) (090)</field>
<field name="sequence">4</field>
<field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
+ <field name="code">LUTAX_090</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -853,6 +890,7 @@
<field name="tag_name">III.A.6. Paid as joint and several guarantee (092)</field>
<field name="sequence">6</field>
<field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
+ <field name="code">LUTAX_092</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -861,6 +899,7 @@
<field name="tag_name">III.A.7. Adjusted tax - special arrangement for tax suspension (Art.60bis(9), subpar. 2) (228)</field>
<field name="sequence">7</field>
<field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
+ <field name="code">LUTAX_228</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -869,6 +908,7 @@
<field name="tag_name">III.A.1. Invoiced by other taxable persons for goods or services supplied (Art.48(1)(a)) (458)</field>
<field name="sequence">1</field>
<field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
+ <field name="code">LUTAX_458</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -877,6 +917,7 @@
<field name="tag_name">III.A.2. Due in respect of intra-Community acquisitions of goods (Art.48(1)(b)) (459)</field>
<field name="sequence">2</field>
<field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
+ <field name="code">LUTAX_459</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -885,6 +926,7 @@
<field name="tag_name">III.A.3. Due or paid in respect of importation of goods (Art.48(1)(c)) (460)</field>
<field name="sequence">3</field>
<field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
+ <field name="code">LUTAX_460</field>
<field name="country_id" ref="base.lu"/>
</record>
@@ -893,6 +935,7 @@
<field name="tag_name">III.A.5. Due under the reverse charge (see points II.E and F) (461)</field>
<field name="sequence">5</field>
<field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
+ <field name="code">LUTAX_461</field>
<field name="country_id" ref="base.lu"/>
</record>