[MERGE] forward port of branch 9.0 up to 8e69043

4 files changed, 31 insertions, 19 deletions

diff --git a/addons/l10n_de_skr03/__openerp__.py b/addons/l10n_de_skr03/__openerp__.py
index 9b74ff17b63..6d2f4eb1d1e 100644
--- a/addons/l10n_de_skr03/__openerp__.py
+++ b/addons/l10n_de_skr03/__openerp__.py
@@ -53,7 +53,7 @@
 
 {
     'name': 'Deutschland SKR03 - Accounting',
-    'version': '1.0',
+    'version': '2.0',
     'author': 'openbig.org',
     'website': 'http://www.openbig.org',
     'category': 'Localization/Account Charts',
diff --git a/addons/l10n_de_skr03/account_tax_fiscal_position.xml b/addons/l10n_de_skr03/account_tax_fiscal_position.xml
index deacc193a08..e8122211c65 100644
--- a/addons/l10n_de_skr03/account_tax_fiscal_position.xml
+++ b/addons/l10n_de_skr03/account_tax_fiscal_position.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="True">
+    <data>
         <!-- ust Codes -->
         <!-- Purchases + Input ust -->
 
@@ -13,7 +13,7 @@
             <field name="refund_account_id" ref="account_1774"/>
             <field name="account_id" ref="account_1774"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_innergem_erwerb_USt_19')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_15')])]"/>
         </record>
         <record id="tax_eu_19_purchase_vst_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -24,7 +24,7 @@
             <field name="refund_account_id" ref="account_1574"/>
             <field name="account_id" ref="account_1574"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_innergem_erwerb_VSt_19')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_27')])]"/>
         </record>
         <record id="tax_eu_19_purchase_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -34,7 +34,7 @@
             <field name="amount">0</field>
             <field name="type_tax_use">purchase</field>
             <field name="children_tax_ids" eval="[(6,0,[ref('tax_eu_19_purchase_ust_skr03'), ref('tax_eu_19_purchase_vst_skr03')])]"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_innergem_erwerb_19')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_53')])]"/>
         </record>
         <record id="tax_eu_7_purchase_ust_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -45,7 +45,7 @@
             <field name="refund_account_id" ref="account_1772"/>
             <field name="account_id" ref="account_1772"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_innergem_erwerb_USt_7')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_54')])]"/>
         </record>
         <record id="tax_eu_7_purchase_vst_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -56,7 +56,7 @@
             <field name="refund_account_id" ref="account_1572"/>
             <field name="account_id" ref="account_1572"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_innergem_erwerb_VSt_7')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_27')])]"/>
         </record>
         <record id="tax_eu_7_purchase_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -66,7 +66,7 @@
             <field name="amount">0</field>
             <field name="type_tax_use">purchase</field>
             <field name="children_tax_ids" eval="[(6,0,[ref('tax_eu_7_purchase_ust_skr03'), ref('tax_eu_7_purchase_vst_skr03')])]"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_innergem_erwerb_7')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_53')])]"/>
         </record>
         <record id="tax_eu_sale_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -77,7 +77,7 @@
             <field name="refund_account_id" ref="account_1770"/>
             <field name="account_id" ref="account_1770"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_steuerfreie_Lieferung')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_36')])]"/>
         </record>
         <record id="tax_export_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -88,7 +88,7 @@
             <field name="refund_account_id" ref="account_1770"/>
             <field name="account_id" ref="account_1770"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_steuerfreie_Ausfuhr')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_37')])]"/>
         </record>
         <record id="tax_import_19_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -99,7 +99,7 @@
             <field name="refund_account_id" ref="account_1588"/>
             <field name="account_id" ref="account_1588"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_EUSt_19')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_28'), ref('l10n_de.tag_de_67')])]"/>
         </record>
         <record id="tax_import_7_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -110,7 +110,7 @@
             <field name="refund_account_id" ref="account_1588"/>
             <field name="account_id" ref="account_1588"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_EUSt_7')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_28'), ref('l10n_de.tag_de_68')])]"/>
         </record>
         <record id="tax_not_taxable_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -121,7 +121,7 @@
             <field name="refund_account_id" ref="account_1770"/>
             <field name="account_id" ref="account_1770"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_nicht_steuerbar')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_59')])]"/>
         </record>
         <record id="tax_ust_19_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -132,7 +132,7 @@
             <field name="refund_account_id" ref="account_1776"/>
             <field name="account_id" ref="account_1776"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_USt_19')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_09'), ref('l10n_de.tag_de_44')])]"/>
         </record>
         <record id="tax_ust_7_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -143,7 +143,7 @@
             <field name="refund_account_id" ref="account_1771"/>
             <field name="account_id" ref="account_1771"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_USt_7')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_10'), ref('l10n_de.tag_de_45')])]"/>
         </record>
         <record id="tax_vst_19_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -154,7 +154,7 @@
             <field name="refund_account_id" ref="account_1576"/>
             <field name="account_id" ref="account_1576"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_VSt_19')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_31'), ref('l10n_de.tag_de_70')])]"/>
         </record>
         <record id="tax_vst_7_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -165,7 +165,7 @@
             <field name="refund_account_id" ref="account_1571"/>
             <field name="account_id" ref="account_1571"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_VSt_7')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_31'), ref('l10n_de.tag_de_71')])]"/>
         </record>
         <record id="tax_ust_19_eu_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -176,7 +176,7 @@
             <field name="refund_account_id" ref="account_1778"/>
             <field name="account_id" ref="account_1778"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_USt_EU_19')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_09'), ref('l10n_de.tag_de_44')])]"/>
         </record>
         <record id="tax_ust_eu_skr03" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -187,7 +187,7 @@
             <field name="refund_account_id" ref="account_1777"/>
             <field name="account_id" ref="account_1777"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_USt_EU')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_45'), ref('l10n_de.tag_de_10')])]"/>
         </record>
 
 
diff --git a/addons/l10n_de_skr03/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_de_skr03/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_de_skr03/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_de_skr03/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_de_skr03/migrations/2.0/pre-set_tags_and_taxes_updatable.py
new file mode 100644
index 00000000000..4950b7607ff
--- /dev/null
+++ b/addons/l10n_de_skr03/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_de_skr03')