[MERGE] forward port branch 9.0 up to 81908899fc4

4 files changed, 259 insertions, 233 deletions

diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index 734e5bfc6ce..57c0efba0a9 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     'name' : 'Poland - Accounting',
-    'version' : '1.02',
+    'version' : '2.0',
     'author' : 'Grzegorz Grzelak (OpenGLOBE)',
     'website': 'http://www.openglobe.pl',
     'category': 'Localization',
diff --git a/addons/l10n_pl/account_tax.xml b/addons/l10n_pl/account_tax.xml
index 88cd7707782..cae3cad3dda 100644
--- a/addons/l10n_pl/account_tax.xml
+++ b/addons/l10n_pl/account_tax.xml
@@ -1,193 +1,209 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
-    <!-- Account Tags -->
+<data>
 
-        <record id="tax_Z23" model="account.account.tag">
-            <field name="name">Z23</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_V23" model="account.account.tag">
-            <field name="name">V23</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_Z0" model="account.account.tag">
-            <field name="name">Z0</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_ZZW" model="account.account.tag">
-            <field name="name">ZZW</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VLPS" model="account.account.tag">
-            <field name="name">VLPSale</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VLPP" model="account.account.tag">
-            <field name="name">VLPPurchase</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VST" model="account.account.tag">
-            <field name="name">VST</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_zst" model="account.account.tag">
-            <field name="name">zst</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_udt" model="account.account.tag">
-            <field name="name">udt</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_unt" model="account.account.tag">
-            <field name="name">unt</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_V0" model="account.account.tag">
-            <field name="name">V0</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_UNU" model="account.account.tag">
-            <field name="name">UNU</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_EXT" model="account.account.tag">
-            <field name="name">EXT</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_IMT" model="account.account.tag">
-            <field name="name">IMT</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_EXU" model="account.account.tag">
-            <field name="name">EXU</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_IMU" model="account.account.tag">
-            <field name="name">IMU</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_V22" model="account.account.tag">
-            <field name="name">V22</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_V8" model="account.account.tag">
-            <field name="name">V8</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_v7" model="account.account.tag">
-            <field name="name">v7</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_v5" model="account.account.tag">
-            <field name="name">v5</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_v3" model="account.account.tag">
-            <field name="name">v3</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VU23" model="account.account.tag">
-            <field name="name">VU23</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VU22" model="account.account.tag">
-            <field name="name">VU22</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_UDU" model="account.account.tag">
-            <field name="name">UDU</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VZW" model="account.account.tag">
-            <field name="name">VZW</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VLP-1_sale" model="account.account.tag">
-            <field name="name">VLP-1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VLP-1_purchase" model="account.account.tag">
-            <field name="name">VLP-1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VLP-2_sale" model="account.account.tag">
-            <field name="name">VLP-2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VLP-2_purchase" model="account.account.tag">
-            <field name="name">VLP-2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_UNT1" model="account.account.tag">
-            <field name="name">UNT1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_ZST1" model="account.account.tag">
-            <field name="name">ZST1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_UNT2" model="account.account.tag">
-            <field name="name">UNT2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_ZST2" model="account.account.tag">
-            <field name="name">ZST2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_UNU1" model="account.account.tag">
-            <field name="name">UNU1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_IMT1" model="account.account.tag">
-            <field name="name">IMT1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_IMU1" model="account.account.tag">
-            <field name="name">IMU1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_IMT2" model="account.account.tag">
-            <field name="name">IMT2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_UNU2" model="account.account.tag">
-            <field name="name">UNU2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_IMU2" model="account.account.tag">
-            <field name="name">IMU2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_Z22" model="account.account.tag">
-            <field name="name">Z22</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_Z8" model="account.account.tag">
-            <field name="name">Z8</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_Z7" model="account.account.tag">
-            <field name="name">Z7</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_Z5" model="account.account.tag">
-            <field name="name">Z5</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_Z3" model="account.account.tag">
-            <field name="name">Z3</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_ZU23" model="account.account.tag">
-            <field name="name">ZU23</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_ZU22" model="account.account.tag">
-            <field name="name">ZU22</field>
-            <field name="applicability">taxes</field>
-        </record>
+    <!-- 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
 
@@ -201,7 +217,7 @@
                 <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.tax_V23')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_09'), ref('l10n_pl.tag_pl_30')])]"/>
         </record>
 
         <record id="vs_kraj_22" model="account.tax.template">
@@ -213,7 +229,7 @@
                 <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.tax_V22')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_09'), ref('l10n_pl.tag_pl_30')])]"/>
         </record>
 
         <record id="vs_kraj_8" model="account.tax.template">
@@ -225,7 +241,7 @@
                 <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.tax_V8')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_08'), ref('l10n_pl.tag_pl_29')])]"/>
         </record>
 
         <record id="vs_kraj_7" model="account.tax.template">
@@ -237,7 +253,7 @@
                 <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.tax_v7')])]"/>
+                <field name="tag_ids" eval="[ref('l10n_pl.tag_pl_08'), ref('l10n_pl.tag_pl_29')]"/>
         </record>
 
         <record id="vs_kraj_5" model="account.tax.template">
@@ -249,7 +265,7 @@
                 <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.tax_v5')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_07'), ref('l10n_pl.tag_pl_28')])]"/>
         </record>
 
         <record id="vs_kraj_3" model="account.tax.template">
@@ -261,7 +277,7 @@
                 <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.tax_v3')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_07'), ref('l10n_pl.tag_pl_28')])]"/>
         </record>
 
         <record id="vs_kraj_0" model="account.tax.template">
@@ -271,7 +287,7 @@
                 <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.tax_V0')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_05')])]"/>
         </record>
 
         <record id="vs_kraj_zw" model="account.tax.template">
@@ -281,7 +297,7 @@
                 <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.tax_VZW')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_02')])]"/>
         </record>
 
         <record id="vs_kraj_usl_23" model="account.tax.template">
@@ -293,7 +309,7 @@
                 <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.tax_VU23')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_09'), ref('l10n_pl.tag_pl_30')])]"/>
         </record>
 
         <record id="vs_kraj_usl_22" model="account.tax.template">
@@ -305,7 +321,7 @@
                 <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.tax_VU22')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_09'), ref('l10n_pl.tag_pl_30')])]"/>
         </record>
 
 # VAT domestic purchase
@@ -320,7 +336,7 @@
                 <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.tax_Z23')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_22" model="account.tax.template">
@@ -332,7 +348,7 @@
                 <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.tax_Z22')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_8" model="account.tax.template">
@@ -344,7 +360,7 @@
                 <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.tax_Z8')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_7" model="account.tax.template">
@@ -356,7 +372,7 @@
                 <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.tax_Z7')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_5" model="account.tax.template">
@@ -368,7 +384,7 @@
                 <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.tax_Z5')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_3" model="account.tax.template">
@@ -380,7 +396,7 @@
                 <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.tax_Z3')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_0" model="account.tax.template">
@@ -390,7 +406,7 @@
                 <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.tax_Z0')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_zw" model="account.tax.template">
@@ -400,7 +416,7 @@
                 <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.tax_ZZW')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_usl_23" model="account.tax.template">
@@ -412,7 +428,7 @@
                 <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.tax_ZU23')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_usl_22" model="account.tax.template">
@@ -424,7 +440,7 @@
                 <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.tax_ZU22')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
 # Vehicle leasing
@@ -440,7 +456,7 @@
                         <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.tax_VLP-1_sale')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_43')])]"/>
                 </record>
 
                 <record id="vp_leas_purchase_1" model="account.tax.template">
@@ -453,7 +469,7 @@
                         <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.tax_VLP-1_purchase')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
                 </record>
 
                 <record id="vp_leas_sale_2" model="account.tax.template">
@@ -466,7 +482,6 @@
                         <field name="refund_account_id" ref="chart76140000"/>
                         <field name="account_id" ref="chart76140000"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_VLP-2_sale')])]"/>
                 </record>
 
                 <record id="vp_leas_purchase_2" model="account.tax.template">
@@ -479,7 +494,6 @@
                         <field name="refund_account_id" ref="chart76140000"/>
                         <field name="account_id" ref="chart76140000"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_VLP-2_purchase')])]"/>
                 </record>
 
                 <record id="vp_leas_sale" model="account.tax.template">
@@ -491,7 +505,7 @@
                         <field name="amount_type">group</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.tax_VLPS')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_21')])]"/>
                 </record>
 
                 <record id="vp_leas_purchase" model="account.tax.template">
@@ -503,7 +517,7 @@
                         <field name="amount_type">group</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.tax_VLPP')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_20')])]"/>
                 </record>
 
 # Steel trade
@@ -515,7 +529,7 @@
                 <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.tax_VST')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_17')])]"/>
         </record>
 
                 <record id="vz_stal_podatek_naliczony" model="account.tax.template">
@@ -528,7 +542,7 @@
                         <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.tax_ZST1')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
                 </record>
 
                 <record id="vz_stal_podatek_nalezny" model="account.tax.template">
@@ -541,7 +555,7 @@
                         <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.tax_ZST2')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_35')])]"/>
                 </record>
 
                 <record id="vz_stal" model="account.tax.template">
@@ -552,7 +566,7 @@
                         <field name="amount_type">group</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.tax_zst')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_20'), ref('l10n_pl.tag_pl_16')])]"/>
                 </record>
 
 # Eurpean Union
@@ -565,7 +579,7 @@
                 <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.tax_udt')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_10')])]"/>
         </record>
 
                 <record id="vz_unia_podatek_naliczony" model="account.tax.template">
@@ -578,7 +592,7 @@
                         <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.tax_UNT1')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
                 </record>
 
                 <record id="vz_unia_podatek_nalezny" model="account.tax.template">
@@ -591,7 +605,7 @@
                         <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.tax_UNT2')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_31')])]"/>
                 </record>
 
                 <record id="vz_unia" model="account.tax.template">
@@ -602,7 +616,7 @@
                         <field name="amount_type">group</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.tax_unt')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_20'), ref('l10n_pl.tag_pl_12')])]"/>
                 </record>
 
         <record id="vs_dostu" model="account.tax.template">
@@ -612,7 +626,7 @@
                 <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.tax_UDU')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_04')])]"/>
         </record>
 
                 <record id="vz_nabu_podatek_naliczony" model="account.tax.template">
@@ -625,7 +639,7 @@
                         <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.tax_UNU1')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
                 </record>
 
                 <record id="vz_nabu_2" model="account.tax.template">
@@ -638,7 +652,7 @@
                         <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.tax_UNU2')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_34')])]"/>
                 </record>
 
                 <record id="vz_nabu" model="account.tax.template">
@@ -649,7 +663,7 @@
                         <field name="amount_type">group</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.tax_UNU')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_20'),ref('l10n_pl.tag_pl_15')])]"/>
                 </record>
 
 
@@ -663,7 +677,7 @@
                 <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.tax_EXT')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_11')])]"/>
         </record>
 
                 <record id="vz_imp_tow_podatek_naliczony" model="account.tax.template">
@@ -676,7 +690,7 @@
                         <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.tax_IMT1')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
                 </record>
 
                 <record id="vz_imp_tow_podatek_nalezny" model="account.tax.template">
@@ -689,7 +703,7 @@
                         <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.tax_IMT2')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_32')])]"/>
                 </record>
 
                 <record id="vz_imp_tow" model="account.tax.template">
@@ -700,7 +714,7 @@
                         <field name="amount_type">group</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.tax_IMT')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_13'), ref('l10n_pl.tag_pl_20')])]"/>
                 </record>
 
         <record id="vs_ekspu" model="account.tax.template">
@@ -710,7 +724,7 @@
                 <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.tax_EXU')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_03')])]"/>
         </record>
 
                 <record id="vz_impu_podatek_naliczony" model="account.tax.template">
@@ -723,7 +737,7 @@
                         <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.tax_IMU1')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
                 </record>
 
                 <record id="vz_impu_podatek_nalezny" model="account.tax.template">
@@ -736,7 +750,7 @@
                         <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.tax_IMU2')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_33')])]"/>
                 </record>
 
                 <record id="vz_impu" model="account.tax.template">
@@ -747,7 +761,7 @@
                         <field name="amount_type">group</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.tax_IMU')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_14'), ref('l10n_pl.tag_pl_20')])]"/>
                 </record>
 
 
diff --git a/addons/l10n_pl/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_pl/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_pl/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_pl/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_pl/migrations/2.0/pre-set_tags_and_taxes_updatable.py
new file mode 100644
index 00000000000..b587dd4a3b8
--- /dev/null
+++ b/addons/l10n_pl/migrations/2.0/pre-set_tags_and_taxes_updatable.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable
+    migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_pl')