From 0282fc16791f50a4a4454a8ffde52f3a421dff4d Mon Sep 17 00:00:00 2001
From: pvy <pvy@odoo.com>
Date: Tue, 18 Aug 2015 12:00:24 +0200
Subject: [PATCH] [FIX] l10n_th is back, compliant with the new accounting

---
 addons/l10n_th/__openerp__.py             |   9 +-
 addons/l10n_th/account_chart_template.yml |   3 +
 addons/l10n_th/account_data.xml           | 392 +++++++++++++---------
 3 files changed, 235 insertions(+), 169 deletions(-)
 create mode 100644 addons/l10n_th/account_chart_template.yml

diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index 2be68df177c..eb17c8d1375 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -13,7 +13,10 @@ Thai accounting chart and localization.
     """,
     'author': 'Almacom',
     'website': 'http://almacom.co.th/',
-    'depends': [],
-    'data': [ 'account_data.xml' ],
-    'installable': False,
+    'depends': ['account'],
+    'data': [
+        'account_data.xml',
+        'account_chart_template.yml',
+    ],
+    'installable': True,
 }
diff --git a/addons/l10n_th/account_chart_template.yml b/addons/l10n_th/account_chart_template.yml
new file mode 100644
index 00000000000..99bbac243aa
--- /dev/null
+++ b/addons/l10n_th/account_chart_template.yml
@@ -0,0 +1,3 @@
+-
+  !python {model: account.chart.template, id: chart}: |
+    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 69793e75bce..9137a65039a 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -1,12 +1,8 @@
-<openerp>
-<data>
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
 
 <!-- ACCOUNT TYPES -->
 
-<record id="acc_type_view" model="account.account.type">
-    <field name="name">View</field>
-</record>
-
 <record id="acc_type_reconciled" model="account.account.type">
     <field name="name">Reconciled</field>
 </record>
@@ -15,397 +11,461 @@
     <field name="name">Other</field>
 </record>
 
-<!-- CHART OF ACCOUNTS -->
+<!-- CHART OF Template -->
 
-<record id="a_root" model="account.account.template">
-    <field name="code">0</field>
-    <field name="name">Simple chart of accounts</field>
-    <field name="user_type_id" ref="acc_type_view"/>
+<record id="transfer_account" model="account.account.template">
+    <field name="name">Transfer Account</field>
+    <field name="code">16</field>
+    <field name="reconcile" eval="True"/>
+    <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+</record>
+<record id="chart" model="account.chart.template">
+    <field name="name">Thailand - Chart of Accounts</field>
+    <field name="currency_id" ref="base.THB"/>
+    <field name="transfer_account_id" ref="transfer_account"/>
+</record>
+<record id="transfer_account" model="account.account.template">
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <!-- 1. ASSETS -->
 
-<record id="a_assets" model="account.account.template">
-    <field name="code">1</field>
-    <field name="name">Assets</field>
-    <field name="user_type_id" ref="acc_type_view"/>
-</record>
-
-<record id="a_cash" model="account.account.template">
-    <field name="code">1100</field>
-    <field name="name">Cash</field>
-    <field name="user_type_id" ref="acc_type_view"/>
-</record>
-
-<record id="a_bank" model="account.account.template">
-    <field name="code">1110</field>
-    <field name="name">Cash at Bank</field>
-    <field name="user_type_id" ref="acc_type_other"/>
-</record>
-
-<record id="a_petty" model="account.account.template">
-    <field name="code">1120</field>
-    <field name="name">Petty Cash</field>
-    <field name="user_type_id" ref="acc_type_other"/>
-</record>
 
 <record id="a_recv" model="account.account.template">
     <field name="code">1200</field>
     <field name="name">Account Receivable</field>
-    <field name="user_type_id" ref="acc_type_reconciled"/>
+    <field name="user_type_id" ref="account.data_account_type_receivable"/>
+    <field name="chart_template_id" ref="chart"/>
     <field name="reconcile" eval="True"/>
 </record>
 
 <record id="a_cheque" model="account.account.template">
     <field name="code">1201</field>
     <field name="name">Outstanding Cheques</field>
-    <field name="user_type_id" ref="acc_type_reconciled"/>
+    <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+    <field name="chart_template_id" ref="chart"/>
     <field name="reconcile" eval="True"/>
 </record>
 
 <record id="a_invent" model="account.account.template">
     <field name="code">1300</field>
     <field name="name">Inventory</field>
-    <field name="user_type_id" ref="acc_type_other"/>
-</record>
-
-<record id="a_building" model="account.account.template">
-    <field name="code">1410</field>
-    <field name="name">Building</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_building_depr" model="account.account.template">
     <field name="code">1411</field>
     <field name="name">Accumulated Depreciation - Building</field>
-    <field name="user_type_id" ref="acc_type_other"/>
-</record>
-
-<record id="a_equipment" model="account.account.template">
-    <field name="code">1420</field>
-    <field name="name">Equipment</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_depreciation"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_equipment_dept" model="account.account.template">
     <field name="code">1421</field>
     <field name="name">Accumulated Depreciation - Equipment</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_depreciation"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_input_vat" model="account.account.template">
     <field name="code">1510</field>
     <field name="name">Input VAT</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_wht_income" model="account.account.template">
     <field name="code">1520</field>
     <field name="name">Withholding Income Tax</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <!-- 2. LIABILITIES -->
 
-<record id="a_liabilities" model="account.account.template">
-    <field name="code">2</field>
-    <field name="name">Liabilities</field>
-    <field name="user_type_id" ref="acc_type_view"/>
-</record>
-
 <record id="a_pay" model="account.account.template">
     <field name="code">2101</field>
     <field name="name">Account Payable</field>
-    <field name="user_type_id" ref="acc_type_reconciled"/>
+    <field name="user_type_id" ref="account.data_account_type_payable"/>
+    <field name="chart_template_id" ref="chart"/>
     <field name="reconcile" eval="True"/>
 </record>
 
 <record id="a_accr_exp" model="account.account.template">
     <field name="code">2102</field>
     <field name="name">Accrued Expenses</field>
-    <field name="user_type_id" ref="acc_type_reconciled"/>
+    <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+    <field name="chart_template_id" ref="chart"/>
     <field name="reconcile" eval="True"/>
 </record>
 
 <record id="a_uninvoiced_receipts" model="account.account.template">
     <field name="code">2103</field>
     <field name="name">Uninvoiced Receipts</field>
-    <field name="user_type_id" ref="acc_type_reconciled"/>
+    <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+    <field name="chart_template_id" ref="chart"/>
     <field name="reconcile" eval="True"/>
 </record>
 
 <record id="a_loan" model="account.account.template">
     <field name="code">2200</field>
     <field name="name">Loans</field>
-    <field name="user_type_id" ref="acc_type_reconciled"/>
+    <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+    <field name="chart_template_id" ref="chart"/>
     <field name="reconcile" eval="True"/>
 </record>
 
 <record id="a_output_vat" model="account.account.template">
     <field name="code">2310</field>
     <field name="name">Output VAT</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_wht" model="account.account.template">
     <field name="code">2320</field>
     <field name="name">Withholding Tax</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <!-- 3. EQUITY -->
 
-<record id="a_equity" model="account.account.template">
-    <field name="code">3</field>
-    <field name="name">Equity</field>
-    <field name="user_type_id" ref="acc_type_view"/>
-</record>
-
 <record id="a_common_stock" model="account.account.template">
     <field name="code">3100</field>
     <field name="name">Capital Stock</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_equity"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_retained_earnings" model="account.account.template">
     <field name="code">3200</field>
     <field name="name">Retained Earnings</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_equity"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_dividends" model="account.account.template">
     <field name="code">3300</field>
     <field name="name">Dividends</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_equity"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_income_summary" model="account.account.template">
     <field name="code">3400</field>
     <field name="name">Income Summary</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_equity"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <!-- 4. INCOME -->
 
-<record id="a_income" model="account.account.template">
-    <field name="code">4</field>
-    <field name="name">Income</field>
-    <field name="user_type_id" ref="acc_type_view"/>
-</record>
-
 <record id="a_sales" model="account.account.template">
     <field name="code">4100</field>
     <field name="name">Income</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_revenue"/>
+    <field name="chart_template_id" ref="chart"/>
+</record>
+
+<record id="a_income_gain" model="account.account.template">
+    <field name="code">4200</field>
+    <field name="name">Gain Account</field>
+    <field name="user_type_id" ref="account.data_account_type_other_income"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <!-- 5. EXPENSES -->
 
-<record id="a_expenses" model="account.account.template">
-    <field name="code">5</field>
-    <field name="name">Expenses</field>
-    <field name="user_type_id" ref="acc_type_view"/>
-</record>
-
 <record id="a_exp_cogs" model="account.account.template">
     <field name="code">5100</field>
     <field name="name">Cost of goods sold</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_expenses"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_exp_salary" model="account.account.template">
     <field name="code">5201</field>
     <field name="name">Salary</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_expenses"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_exp_rent" model="account.account.template">
     <field name="code">5202</field>
     <field name="name">Rent</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_expenses"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_exp_office" model="account.account.template">
     <field name="code">5203</field>
     <field name="name">Office Expenses</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_expenses"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_exp_interest" model="account.account.template">
     <field name="code">5300</field>
     <field name="name">Interest expenses</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_expenses"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
 <record id="a_exp_income_tax" model="account.account.template">
     <field name="code">5400</field>
     <field name="name">Income tax expenses</field>
-    <field name="user_type_id" ref="acc_type_other"/>
+    <field name="user_type_id" ref="account.data_account_type_expenses"/>
+    <field name="chart_template_id" ref="chart"/>
 </record>
 
-<!-- CHART OF ACCOUNTS/TAXES -->
+<record id="a_exp_loss" model="account.account.template">
+    <field name="code">5500</field>
+    <field name="name">Loss Account</field>
+    <field name="user_type_id" ref="account.data_account_type_expenses"/>
+    <field name="chart_template_id" ref="chart"/>
+</record>
+
+<!-- CHART OF Template -->
 
 <record id="chart" model="account.chart.template">
-    <field name="name">Thailand - Chart of Accounts</field>
-    <field name="account_root_id" ref="a_root"/>
-    <field name="bank_account_view_id" ref="a_bank"/>
     <field name="property_account_receivable_id" ref="a_recv"/>
     <field name="property_account_payable_id" ref="a_pay"/>
-    <field name="property_account_expense_categ_id" ref="a_exp_office"/>
+    <field name="property_account_expense_categ_id" ref="a_exp_cogs"/>
     <field name="property_account_income_categ_id" ref="a_sales"/>
-    <field name="property_account_expense_id" ref="a_exp_office"/>
-    <field name="property_account_income_id" ref="a_sales"/>
-    <field name="currency_id" ref="base.THB"/>
+    <field name="income_currency_exchange_account_id" ref="a_income_gain"/>
+    <field name="expense_currency_exchange_account_id" ref="a_exp_loss"/>
+    <field name="cash_account_code_prefix">1100</field>
+    <field name="bank_account_code_prefix">1110</field>
 </record>
 
+<!-- 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>
 
 <!-- TAXES -->
 
 <record id="tax_input_vat" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Input VAT</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.07"/>
-    <field name="account_collected_id" ref="a_input_vat"/>
-    <field name="account_paid_id" ref="a_input_vat"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="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')])]"/>
 </record>
 
 <record id="tax_output_vat" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Output VAT</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.07"/>
-    <field name="account_collected_id" ref="a_output_vat"/>
-    <field name="account_paid_id" ref="a_output_vat"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="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')])]"/>
 </record>
 
 <record id="tax_wht_co_1" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Company Withholding Tax 1% (Transportation)</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.01"/>
-    <field name="account_collected_id" ref="a_wht"/>
-    <field name="account_paid_id" ref="a_wht"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="1"/>
+    <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')])]"/>
 </record>
 
 <record id="tax_wht_co_2" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Company Withholding Tax 2% (Advertising)</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.02"/>
-    <field name="account_collected_id" ref="a_wht"/>
-    <field name="account_paid_id" ref="a_wht"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="2"/>
+    <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')])]"/>
 </record>
 
 <record id="tax_wht_co_3" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Company Withholding Tax 3% (Service)</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.03"/>
-    <field name="account_collected_id" ref="a_wht"/>
-    <field name="account_paid_id" ref="a_wht"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="3"/>
+    <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')])]"/>
 </record>
 
 <record id="tax_wht_co_5" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Company Withholding Tax 5% (Rental)</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.05"/>
-    <field name="account_collected_id" ref="a_wht"/>
-    <field name="account_paid_id" ref="a_wht"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="5"/>
+    <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')])]"/>
 </record>
 
 <record id="tax_wht_pers_1" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Personal Withholding Tax 1% (Transportation)</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.01"/>
-    <field name="account_collected_id" ref="a_wht"/>
-    <field name="account_paid_id" ref="a_wht"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="1"/>
+    <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')])]"/>
 </record>
 
 <record id="tax_wht_pers_2" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Personal Withholding Tax 2% (Advertising)</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.02"/>
-    <field name="account_collected_id" ref="a_wht"/>
-    <field name="account_paid_id" ref="a_wht"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="2"/>
+    <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')])]"/>
 </record>
 
 <record id="tax_wht_pers_3" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Personal Withholding Tax 3% (Service)</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.03"/>
-    <field name="account_collected_id" ref="a_wht"/>
-    <field name="account_paid_id" ref="a_wht"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="3"/>
+    <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')])]"/>
 </record>
 
 <record id="tax_wht_pers_5" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Personal Withholding Tax 5% (Rental)</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.05"/>
-    <field name="account_collected_id" ref="a_wht"/>
-    <field name="account_paid_id" ref="a_wht"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="5"/>
+    <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')])]"/>
 </record>
 
 <record id="tax_wht_income_1" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Withholding Income Tax 1% (Transportation)</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.01"/>
-    <field name="account_collected_id" ref="a_wht_income"/>
-    <field name="account_paid_id" ref="a_wht_income"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="1"/>
+    <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">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Withholding Income Tax 2% (Advertising)</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.02"/>
-    <field name="account_collected_id" ref="a_wht_income"/>
-    <field name="account_paid_id" ref="a_wht_income"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="2"/>
+    <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">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Withholding Income Tax 3% (Service)</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.03"/>
-    <field name="account_collected_id" ref="a_wht_income"/>
-    <field name="account_paid_id" ref="a_wht_income"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="3"/>
+    <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">
     <field name="chart_template_id" ref="chart"/>
     <field name="name">Withholding Income Tax 5% (Rental)</field>
-    <field name="type">percent</field>
-    <field name="amount" eval="0.05"/>
-    <field name="account_collected_id" ref="a_wht_income"/>
-    <field name="account_paid_id" ref="a_wht_income"/>
+    <field name="amount_type">percent</field>
+    <field name="amount" eval="5"/>
+    <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>
-</data>
 
-<data noupdate="1">
-        <!-- INSTALL ACTION -->
-        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
-            <field name="state">open</field>
-        </record>
-</data>
-</openerp>
+</odoo>