From 146e0692e538110caf1a2be5ff5ce38da17a311f Mon Sep 17 00:00:00 2001
From: Yenthe666 <yenthevg@gmail.com>
Date: Fri, 25 Jan 2019 09:34:53 +0000
Subject: [PATCH] [FIX] l10n_nl: don't set VAT accounts on grouped tax + follow
 official Dutch tag names

closes odoo/odoo#30539
---
 addons/l10n_nl/data/account_account_tag.xml  | 13 +++++++------
 addons/l10n_nl/data/account_tax_template.xml |  2 --
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_nl/data/account_account_tag.xml b/addons/l10n_nl/data/account_account_tag.xml
index 73520f6f031..f5519a03ee2 100644
--- a/addons/l10n_nl/data/account_account_tag.xml
+++ b/addons/l10n_nl/data/account_account_tag.xml
@@ -158,7 +158,7 @@
             <field name="applicability">taxes</field>
         </record>
         <record id="tag_nl_06" model="account.account.tag">
-            <field name="name">1c. Leveringen/diensten belast met overige tarieven behalve 0% (omzet)</field>
+            <field name="name">1c. Leveringen/diensten belast met overige tarieven, behalve 0% (omzet)</field>
             <field name="applicability">taxes</field>
         </record>
         <record id="tag_nl_07" model="account.account.tag">
@@ -174,7 +174,7 @@
             <field name="applicability">taxes</field>
         </record>
         <record id="tag_nl_10" model="account.account.tag">
-            <field name="name">2a. Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (omzet)</field>
+            <field name="name">2a. Leveringen/diensten waarbij de omzetbelasting naar u is verlegd (omzet)</field>
             <field name="applicability">taxes</field>
         </record>
         <record id="tag_nl_11" model="account.account.tag">
@@ -187,11 +187,11 @@
         </record>
         <!-- Keep tag_nl_40 & tag_nl_41 to avoid migration issue. -->
         <record id="tag_nl_40" model="account.account.tag">
-            <field name="name">3b. Leveringen naar/diensten in landen binnen de EU (omzet) (producten)</field>
+            <field name="name">3b. Leveringen naar of diensten in landen binnen de EU (omzet) (producten)</field>
             <field name="applicability">taxes</field>
         </record>
         <record id="tag_nl_41" model="account.account.tag">
-            <field name="name">3b. Leveringen naar/diensten in landen binnen de EU (omzet) (diensten)</field>
+            <field name="name">3b. Leveringen naar of diensten in landen binnen de EU (omzet) (diensten)</field>
             <field name="applicability">taxes</field>
         </record>
         <record id="tag_nl_14" model="account.account.tag">
@@ -231,7 +231,7 @@
             <field name="applicability">taxes</field>
         </record>
         <record id="tag_nl_23" model="account.account.tag">
-            <field name="name">1c. Leveringen/diensten belast met overige tarieven behalve 0% (BTW)</field>
+            <field name="name">1c. Leveringen/diensten belast met overige tarieven, behalve 0% (BTW)</field>
             <field name="applicability">taxes</field>
         </record>
         <record id="tag_nl_24" model="account.account.tag">
@@ -247,7 +247,7 @@
             <field name="applicability">taxes</field>
         </record>
         <record id="tag_nl_27" model="account.account.tag">
-            <field name="name">2a. Leveringen/diensten waarbij de heffing van Heffing van omzetbelasting naar u is verlegd (BTW)</field>
+            <field name="name">2a. Leveringen/diensten waarbij de omzetbelasting naar u is verlegd (BTW)</field>
             <field name="applicability">taxes</field>
         </record>
         <record id="tag_nl_28" model="account.account.tag">
@@ -297,3 +297,4 @@
 
     </data>
 </odoo>
+
diff --git a/addons/l10n_nl/data/account_tax_template.xml b/addons/l10n_nl/data/account_tax_template.xml
index 0eccb372d52..44f42f7d71b 100644
--- a/addons/l10n_nl/data/account_tax_template.xml
+++ b/addons/l10n_nl/data/account_tax_template.xml
@@ -331,8 +331,6 @@
             <field name="description">21% BTW verlegd</field>
             <field eval="21" name="amount"/>
             <field name="amount_type">group</field>
-            <field name="refund_account_id" ref="vat_payable_v"/>
-            <field name="account_id" ref="vat_payable_v"/>
             <field name="type_tax_use">purchase</field>
             <field name="tag_ids" eval="[(6,0,[ref('tag_nl_10')])]"/>
             <field name="children_tax_ids" eval="[(6, 0, [ref('btw_ink_0_1'), ref('btw_ink_0_2')])]"/>