From 8527c5adab5a44c9df786789e072dd673d7fd290 Mon Sep 17 00:00:00 2001
From: Yenthe666 <yenthevg@gmail.com>
Date: Tue, 26 Mar 2019 13:26:37 +0000
Subject: [PATCH] [FIX] l10n_nl: set correct VAT codes on fiscal position lines

Before this PR quite a lot of the lines on the fiscal positions
"EU landen", "Niet-EU landen" and "Installatie en Afstandsverkopen"
where mapped wrong, some of the lines even referred to another
tax percentage.

Changes:
- The tax "BTW te vorderen laag (inkopen) 9%" on the product
mapped to the tax to apply named "Inkopen import buiten EU laag 6%",
which should be "Inkopen import buiten EU laag 9%" to correctly
counterpart the taxes. All the other changes where similar,
either invalid tax rates where applied or it mapped to a wrong category.
- "Verkopen/omzet overig diensten" on the product would map to
"Installatie/afstandsverkopen buiten EU" as the VAT to apply.
This should map to "Verkopen export buiten EU".
- Added 3 accounts for Omzet NL handelsgoederen 1,
Omzet NL handelsgoederen 2 and Omzet NL handelsgoederen 3
- Mapped the 3 accounts to the fiscal position
"Installatie en Afstandsverkopen" their relevant lines.
- Removed purchase taxes from fiscal position "Installatie en Afstandsverkopen" .
- Mapped the right taxes to the three fiscal positions their VAT tabels.
- Updated .pot file to add the three extra accounts.

Closes #31403

closes odoo/odoo#32130

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
---
 .../l10n_nl/data/account.account.template.csv |  3 +
 ...count_fiscal_position_account_template.xml | 27 +++++++-
 .../account_fiscal_position_tax_template.xml  | 41 ++++++-----
 .../data/account_fiscal_position_template.xml | 68 ++++++-------------
 addons/l10n_nl/i18n/l10n_nl.pot               | 17 +++++
 5 files changed, 87 insertions(+), 69 deletions(-)

diff --git a/addons/l10n_nl/data/account.account.template.csv b/addons/l10n_nl/data/account.account.template.csv
index ef2fd529278..2164c15119f 100644
--- a/addons/l10n_nl/data/account.account.template.csv
+++ b/addons/l10n_nl/data/account.account.template.csv
@@ -324,6 +324,9 @@
 "8043","Omzet buiten EU werk derden","8043","account.data_account_type_revenue","l10n_nl.l10nnl_chart_template","l10n_nl.account_tag_11","False"
 "8044","Omzet Intercompany werk derden","8044","account.data_account_type_revenue","l10n_nl.l10nnl_chart_template","l10n_nl.account_tag_11","False"
 "8090","Diverse overige opbrengsten","8090","account.data_account_type_revenue","l10n_nl.l10nnl_chart_template","l10n_nl.account_tag_11","False"
+"8110","Installatie/afstandsverkopen binnen EU handelsgoederen 1","80011","account.data_account_type_revenue","l10n_nl.l10nnl_chart_template","l10n_nl.account_tag_11","False"
+"8120","Installatie/afstandsverkopen binnen EU handelsgoederen 2","80012","account.data_account_type_revenue","l10n_nl.l10nnl_chart_template","l10n_nl.account_tag_11","False"
+"8130","Installatie/afstandsverkopen binnen EU handelsgoederen 3","80013","account.data_account_type_revenue","l10n_nl.l10nnl_chart_template","l10n_nl.account_tag_11","False"
 "8920","Koersverschillen","8920","account.data_account_type_revenue","l10n_nl.l10nnl_chart_template","l10n_nl.account_tag_31","False"
 "9011","Resultaat deelneming 1","9011","account.data_account_type_other_income","l10n_nl.l10nnl_chart_template","l10n_nl.account_tag_12","False"
 "9012","Resultaat deelneming 2","9012","account.data_account_type_other_income","l10n_nl.l10nnl_chart_template","l10n_nl.account_tag_12","False"
diff --git a/addons/l10n_nl/data/account_fiscal_position_account_template.xml b/addons/l10n_nl/data/account_fiscal_position_account_template.xml
index ab156438382..81647963b10 100644
--- a/addons/l10n_nl/data/account_fiscal_position_account_template.xml
+++ b/addons/l10n_nl/data/account_fiscal_position_account_template.xml
@@ -92,5 +92,30 @@
             <field name="account_dest_id" ref="8022" />
         </record>
 
+        <!-- Installatie / afstandsverkopen -->
+        <record
+            id="fiscal_position_account_installatie_afstand_1"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu_no_taxes_report" />
+            <field name="account_src_id"  ref="8001" />
+            <field name="account_dest_id" ref="8110" />
+        </record>
+
+        <record
+            id="fiscal_position_account_installatie_afstand_2"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu_no_taxes_report" />
+            <field name="account_src_id"  ref="8011" />
+            <field name="account_dest_id" ref="8120" />
+        </record>
+
+        <record
+            id="fiscal_position_account_installatie_afstand_3"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu_no_taxes_report" />
+            <field name="account_src_id"  ref="8021" />
+            <field name="account_dest_id" ref="8130" />
+        </record>
+
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_nl/data/account_fiscal_position_tax_template.xml b/addons/l10n_nl/data/account_fiscal_position_tax_template.xml
index e59c852ef24..05e54233bcf 100644
--- a/addons/l10n_nl/data/account_fiscal_position_tax_template.xml
+++ b/addons/l10n_nl/data/account_fiscal_position_tax_template.xml
@@ -34,7 +34,7 @@
         <record id="position_tax_extracom_d_0" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_non_eu"/>
             <field name="tax_src_id" ref="btw_0_d"/>
-            <field name="tax_dest_id" ref="btw_X3"/>
+            <field name="tax_dest_id" ref="btw_X1"/>
         </record>
         <record id="position_tax_extracom_d_6" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_non_eu"/>
@@ -49,12 +49,12 @@
         <record id="position_tax_extracom_d_21" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_non_eu"/>
             <field name="tax_src_id" ref="btw_21_d"/>
-            <field name="tax_dest_id" ref="btw_X3"/>
+            <field name="tax_dest_id" ref="btw_X1"/>
         </record>
         <record id="position_tax_extracom_d_overig" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_non_eu"/>
             <field name="tax_src_id" ref="btw_overig_d"/>
-            <field name="tax_dest_id" ref="btw_X3"/>
+            <field name="tax_dest_id" ref="btw_X1"/>
         </record>
         <!-- VAT on buying from outside the EU -->
         <record id="position_tax_extracom_6" model="account.fiscal.position.tax.template">
@@ -65,7 +65,7 @@
         <record id="position_tax_extracom_9" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_non_eu"/>
             <field name="tax_src_id" ref="btw_9_buy"/>
-            <field name="tax_dest_id" ref="btw_E1"/>
+            <field name="tax_dest_id" ref="btw_E1_9"/>
         </record>
         <record id="position_tax_extracom_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_non_eu"/>
@@ -85,7 +85,7 @@
         <record id="position_tax_extracom_d_9" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_non_eu"/>
             <field name="tax_src_id" ref="btw_9_buy_d"/>
-            <field name="tax_dest_id" ref="btw_E1"/>
+            <field name="tax_dest_id" ref="btw_E1_9"/>
         </record>
         <record id="position_tax_extracom_d_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_non_eu"/>
@@ -95,59 +95,59 @@
         <record id="position_tax_extracom_d_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_non_eu"/>
             <field name="tax_src_id" ref="btw_overig_buy_d"/>
-            <field name="tax_dest_id" ref="btw_E_overig"/>
+            <field name="tax_dest_id" ref="btw_E_overig_d"/>
         </record>
 
         <!-- EU Countries -->
         <record id="position_tax_intracom_1" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_0"/>
-            <field name="tax_dest_id" ref="btw_X0_diensten"/>
+            <field name="tax_dest_id" ref="btw_X0_producten"/>
         </record>
         <record id="position_tax_intracom_2" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_6"/>
-            <field name="tax_dest_id" ref="btw_X0_diensten"/>
+            <field name="tax_dest_id" ref="btw_X0_producten"/>
         </record>
         <record id="position_tax_intracom_2_9" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_9"/>
-            <field name="tax_dest_id" ref="btw_X0_diensten"/>
+            <field name="tax_dest_id" ref="btw_X0_producten"/>
         </record>
         <record id="position_tax_intracom_3" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_21"/>
-            <field name="tax_dest_id" ref="btw_X0_diensten"/>
+            <field name="tax_dest_id" ref="btw_X0_producten"/>
         </record>
         <record id="position_tax_intracom_4" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_overig"/>
-            <field name="tax_dest_id" ref="btw_X0_diensten"/>
+            <field name="tax_dest_id" ref="btw_X0_producten"/>
         </record>
         <record id="position_tax_intracom_d_1" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_0_d"/>
-            <field name="tax_dest_id" ref="btw_X2"/>
+            <field name="tax_dest_id" ref="btw_X0_diensten"/>
         </record>
         <record id="position_tax_intracom_d_2" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_6_d"/>
-            <field name="tax_dest_id" ref="btw_X2"/>
+            <field name="tax_dest_id" ref="btw_X0_diensten"/>
         </record>
         <record id="position_tax_intracom_d_2_9" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_9_d"/>
-            <field name="tax_dest_id" ref="btw_X2"/>
+            <field name="tax_dest_id" ref="btw_X0_diensten"/>
         </record>
         <record id="position_tax_intracom_d_3" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_21_d"/>
-            <field name="tax_dest_id" ref="btw_X2"/>
+            <field name="tax_dest_id" ref="btw_X0_diensten"/>
         </record>
         <record id="position_tax_intracom_d_4" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_overig_d"/>
-            <field name="tax_dest_id" ref="btw_X2"/>
+            <field name="tax_dest_id" ref="btw_X0_diensten"/>
         </record>
         <record id="position_tax_intracom_6" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
@@ -172,22 +172,22 @@
         <record id="position_tax_intracom_d_6" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_6_buy_d"/>
-            <field name="tax_dest_id" ref="btw_I_6"/>
+            <field name="tax_dest_id" ref="btw_I_6_d"/>
         </record>
         <record id="position_tax_intracom_d_9" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_9_buy_d"/>
-            <field name="tax_dest_id" ref="btw_I_9"/>
+            <field name="tax_dest_id" ref="btw_I_9_d"/>
         </record>
         <record id="position_tax_intracom_d_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_21_buy_d"/>
-            <field name="tax_dest_id" ref="btw_I_21"/>
+            <field name="tax_dest_id" ref="btw_I_21_d"/>
         </record>
         <record id="position_tax_intracom_d_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_overig_buy_d"/>
-            <field name="tax_dest_id" ref="btw_I_overig"/>
+            <field name="tax_dest_id" ref="btw_I_overig_d"/>
         </record>
 
         <!-- BTW verlegd -->
@@ -196,6 +196,5 @@
             <field name="tax_src_id" ref="btw_21_buy"/>
             <field name="tax_dest_id" ref="btw_ink_0"/>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/l10n_nl/data/account_fiscal_position_template.xml b/addons/l10n_nl/data/account_fiscal_position_template.xml
index f70c6fc6e1b..a6519cac9d7 100644
--- a/addons/l10n_nl/data/account_fiscal_position_template.xml
+++ b/addons/l10n_nl/data/account_fiscal_position_template.xml
@@ -28,83 +28,57 @@
         <record id="position_tax_eu_no_taxes_report_1" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
             <field name="tax_src_id" ref="btw_0"/>
+            <field name="tax_dest_id" ref="btw_X2"/>
         </record>
         <record id="position_tax_eu_no_taxes_report_2" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_6"/>
+            <field name="tax_src_id" ref="btw_verk_0"/>
+            <field name="tax_dest_id" ref="btw_X2"/>
         </record>
         <record id="position_tax_eu_no_taxes_report_3" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_21"/>
+            <field name="tax_src_id" ref="btw_6"/>
+            <field name="tax_dest_id" ref="btw_X2"/>
         </record>
         <record id="position_tax_eu_no_taxes_report_4" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_overig"/>
+            <field name="tax_src_id" ref="btw_9"/>
+            <field name="tax_dest_id" ref="btw_X2"/>
         </record>
         <record id="position_tax_eu_no_taxes_report_5" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_0_d"/>
+            <field name="tax_src_id" ref="btw_21"/>
+            <field name="tax_dest_id" ref="btw_X2"/>
         </record>
         <record id="position_tax_eu_no_taxes_report_6" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_6_d"/>
+            <field name="tax_src_id" ref="btw_overig"/>
+            <field name="tax_dest_id" ref="btw_X2"/>
         </record>
         <record id="position_tax_eu_no_taxes_report_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_21_d"/>
+            <field name="tax_src_id" ref="btw_0_d"/>
+            <field name="tax_dest_id" ref="btw_X2"/>
         </record>
         <record id="position_tax_eu_no_taxes_report_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_overig_d"/>
+            <field name="tax_src_id" ref="btw_6_d"/>
+            <field name="tax_dest_id" ref="btw_X2"/>
         </record>
         <record id="position_tax_eu_no_taxes_report_9" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_6_buy"/>
+            <field name="tax_src_id" ref="btw_9_d"/>
+            <field name="tax_dest_id" ref="btw_X2"/>
         </record>
         <record id="position_tax_eu_no_taxes_report_10" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_6_buy_incl"/>
+            <field name="tax_src_id" ref="btw_21_d"/>
+            <field name="tax_dest_id" ref="btw_X2"/>
         </record>
         <record id="position_tax_eu_no_taxes_report_11" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_21_buy"/>
+            <field name="tax_src_id" ref="btw_overig_d"/>
+            <field name="tax_dest_id" ref="btw_X2"/>
         </record>
-        <record id="position_tax_eu_no_taxes_report_12" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_21_buy_incl"/>
-        </record>
-        <record id="position_tax_eu_no_taxes_report_13" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_overig_buy"/>
-        </record>
-        <record id="position_tax_eu_no_taxes_report_14" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_6_buy_d"/>
-        </record>
-        <record id="position_tax_eu_no_taxes_report_15" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_21_buy_d"/>
-        </record>
-        <record id="position_tax_eu_no_taxes_report_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_overig_buy_d"/>
-        </record>
-        <record id="position_tax_eu_no_taxes_report_17" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_verk_0"/>
-        </record>
-        <record id="position_tax_eu_no_taxes_report_18" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_ink_0_1"/>
-        </record>
-        <record id="position_tax_eu_no_taxes_report_19" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_ink_0_2"/>
-        </record>
-        <record id="position_tax_eu_no_taxes_report_20" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu_no_taxes_report"/>
-            <field name="tax_src_id" ref="btw_ink_0"/>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/l10n_nl/i18n/l10n_nl.pot b/addons/l10n_nl/i18n/l10n_nl.pot
index b4506f4c22c..ff7ba5e6f60 100644
--- a/addons/l10n_nl/i18n/l10n_nl.pot
+++ b/addons/l10n_nl/i18n/l10n_nl.pot
@@ -1430,6 +1430,23 @@ msgstr ""
 msgid "Inst./afst.verkopen binnen EU"
 msgstr ""
 
+
+#. module: l10n_nl
+#: model:account.account.template,name:l10n_nl.8110
+msgid "Installatie/afstandsverkopen binnen EU handelsgoederen 1"
+msgstr ""
+
+
+#. module: l10n_nl
+#: model:account.account.template,name:l10n_nl.8120
+msgid "Installatie/afstandsverkopen binnen EU handelsgoederen 2"
+msgstr ""
+
+#. module: l10n_nl
+#: model:account.account.template,name:l10n_nl.8130
+msgid "Installatie/afstandsverkopen binnen EU handelsgoederen 3"
+msgstr ""
+
 #. module: l10n_nl
 #: model:account.tax.template,description:l10n_nl.btw_X3
 msgid "Inst./afst.verkopen buiten EU"