[MERGE] forward port branch 9.0 up to 81908899fc4

3 files changed, 105 insertions, 84 deletions

diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index 8b760d20fda..aa4557c9563 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Thailand - Accounting',
-    'version': '1.0',
+    'version': '2.0',
     'category': 'Localization',
     'description': """
 Chart of Accounts for Thailand.
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index e1939abc979..b99f6100bf5 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -242,75 +242,94 @@
 
 <!-- Account Tax Tags -->
 
-<record id="tag_input_vat_7" model="account.account.tag">
-    <field name="name">Input VAT 7%</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_output_7" model="account.account.tag">
-    <field name="name">Output VAT 7%</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_comp_tax_trans_1" model="account.account.tag">
-    <field name="name">Company Tax 1% (Transportation)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_comp_tax_advt_2" model="account.account.tag">
-    <field name="name">Company Tax 2% (Advertising)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_comp_tax_serv_3" model="account.account.tag">
-    <field name="name">Company Tax 3% (Service)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_comp_tax_rent_5" model="account.account.tag">
-    <field name="name">Company Tax 5% (Rental)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_pers_tax_trans_1" model="account.account.tag">
-    <field name="name">Personal Tax 1% (Transportation)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_pers_tax_advt_2" model="account.account.tag">
-    <field name="name">Personal Tax 2% (Advertising)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_pers_tax_serv_3" model="account.account.tag">
-    <field name="name">Personal Tax 3% (Service)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_pers_tax_rent_5" model="account.account.tag">
-    <field name="name">Personal Tax 5% (Rental)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_income_tax_trans_1" model="account.account.tag">
-    <field name="name">Income Tax 1% (Transportation)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_income_tax_advt_2" model="account.account.tag">
-    <field name="name">Income Tax 2% (Advertising)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_income_tax_serv_3" model="account.account.tag">
-    <field name="name">Income Tax 3% (Service)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_income_tax_rent_5" model="account.account.tag">
-    <field name="name">Income Tax 5% (Rental)</field>
-    <field name="applicability">taxes</field>
-</record>
+    <record id="tag_th_01" model="account.account.tag">
+        <field name="name">Taxes to be paid</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_02" model="account.account.tag">
+        <field name="name">Withholding Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_03" model="account.account.tag">
+        <field name="name">Personal Withholding Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_04" model="account.account.tag">
+        <field name="name">Personal Withholding Tax (Service)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_05" model="account.account.tag">
+        <field name="name">Personal Withholding Tax (Other)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_06" model="account.account.tag">
+        <field name="name">Company Withholding Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_07" model="account.account.tag">
+        <field name="name">Company Withholding Tax (Service)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_08" model="account.account.tag">
+        <field name="name">Company Withholding Tax (Other)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_09" model="account.account.tag">
+        <field name="name">Value Added Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_10" model="account.account.tag">
+        <field name="name">Output VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
+     <record id="tag_th_11" model="account.account.tag">
+        <field name="name">Input VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_12" model="account.account.tag">
+        <field name="name">Taxable amounts</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_13" model="account.account.tag">
+        <field name="name">Withholding Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_14" model="account.account.tag">
+        <field name="name">Personal Withholding Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_15" model="account.account.tag">
+        <field name="name">Personal Withholding Tax (Service)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_16" model="account.account.tag">
+        <field name="name">Personal Withholding Tax (Other)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_17" model="account.account.tag">
+        <field name="name">Company Withholding Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_18" model="account.account.tag">
+        <field name="name">Company Withholding Tax (Service)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_19" model="account.account.tag">
+        <field name="name">Company Withholding Tax (Other)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_20" model="account.account.tag">
+        <field name="name">Value Added Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_21" model="account.account.tag">
+        <field name="name">Output VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_22" model="account.account.tag">
+        <field name="name">Input VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
 
 <!-- TAXES -->
 
@@ -322,7 +341,7 @@
     <field name="account_id" ref="a_input_vat"/>
     <field name="refund_account_id" ref="a_input_vat"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_input_vat_7')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_22'), ref('tag_th_11')])]"/>
 </record>
 
 <record id="tax_output_vat" model="account.tax.template">
@@ -333,7 +352,7 @@
     <field name="account_id" ref="a_output_vat"/>
     <field name="refund_account_id" ref="a_output_vat"/>
     <field name="type_tax_use">sale</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_output_7')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_21'), ref('tag_th_10')])]"/>
 </record>
 
 <record id="tax_wht_co_1" model="account.tax.template">
@@ -344,7 +363,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_comp_tax_trans_1')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_19'),ref('tag_th_08')])]"/>
 </record>
 
 <record id="tax_wht_co_2" model="account.tax.template">
@@ -355,7 +374,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_comp_tax_advt_2')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_19'),ref('tag_th_08')])]"/>
 </record>
 
 <record id="tax_wht_co_3" model="account.tax.template">
@@ -366,7 +385,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_comp_tax_serv_3')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_18'),ref('tag_th_07')])]"/>
 </record>
 
 <record id="tax_wht_co_5" model="account.tax.template">
@@ -377,7 +396,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_comp_tax_rent_5')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_19'),ref('tag_th_08')])]"/>
 </record>
 
 <record id="tax_wht_pers_1" model="account.tax.template">
@@ -388,7 +407,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_pers_tax_trans_1')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_05'),ref('tag_th_19')])]"/>
 </record>
 
 <record id="tax_wht_pers_2" model="account.tax.template">
@@ -399,7 +418,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_pers_tax_advt_2')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_05'),ref('tag_th_19')])]"/>
 </record>
 
 <record id="tax_wht_pers_3" model="account.tax.template">
@@ -410,7 +429,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_pers_tax_serv_3')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_15'),ref('tag_th_04')])]"/>
 </record>
 
 <record id="tax_wht_pers_5" model="account.tax.template">
@@ -421,7 +440,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_pers_tax_rent_5')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_05'),ref('tag_th_19')])]"/>
 </record>
 
 <record id="tax_wht_income_1" model="account.tax.template">
@@ -432,7 +451,6 @@
     <field name="account_id" ref="a_wht_income"/>
     <field name="refund_account_id" ref="a_wht_income"/>
     <field name="type_tax_use">sale</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_income_tax_trans_1')])]"/>
 </record>
 
 <record id="tax_wht_income_2" model="account.tax.template">
@@ -443,7 +461,6 @@
     <field name="account_id" ref="a_wht_income"/>
     <field name="refund_account_id" ref="a_wht_income"/>
     <field name="type_tax_use">sale</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_income_tax_advt_2')])]"/>
 </record>
 
 <record id="tax_wht_income_3" model="account.tax.template">
@@ -454,7 +471,6 @@
     <field name="account_id" ref="a_wht_income"/>
     <field name="refund_account_id" ref="a_wht_income"/>
     <field name="type_tax_use">sale</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_income_tax_serv_3')])]"/>
 </record>
 
 <record id="tax_wht_income_5" model="account.tax.template">
@@ -465,7 +481,6 @@
     <field name="account_id" ref="a_wht_income"/>
     <field name="refund_account_id" ref="a_wht_income"/>
     <field name="type_tax_use">sale</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_income_tax_rent_5')])]"/>
 </record>
 
 </odoo>
diff --git a/addons/l10n_th/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_th/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_th/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)