[FIX] Chart of accounts: fixed currency not selected on COA.

This fix replaced the fix merged into 7.0 / saas-1 (rev 9434), by adding a new currency_id field on
the model. XML data for the various COAs have been updated accordingly.

bzr revid: tde@openerp.com-20130912132032-8k2dj2t3n5hi6s43
This commit is contained in:
Thibault Delavallée 2013-09-12 15:20:32 +02:00
commit a3cf19a28e
47 changed files with 77 additions and 23 deletions

View File

@ -2788,6 +2788,7 @@ class account_chart_template(osv.osv):
'parent_id': fields.many2one('account.chart.template', 'Parent Chart Template'),
'code_digits': fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
'visible': fields.boolean('Can be Visible?', help="Set this to False if you don't want this template to be used actively in the wizard that generate Chart of Accounts from templates, this is useful when you want to generate accounts of this template only when loading its child template."),
'currency_id': fields.many2one('res.currency', 'Currency'),
'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sale and purchase rates or choose from list of taxes. This last choice assumes that the set of tax defined on this template is complete'),
'account_root_id': fields.many2one('account.account.template', 'Root Account', domain=[('parent_id','=',False)]),
'tax_code_root_id': fields.many2one('account.tax.code.template', 'Root Tax Code', domain=[('parent_id','=',False)]),
@ -3052,7 +3053,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
res['value'] = {'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False}
if chart_template_id:
data = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
res['value'].update({'complete_tax_set': data.complete_tax_set})
currency_id = data.currency_id and data.currency_id.id or self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
res['value'].update({'complete_tax_set': data.complete_tax_set, 'currency_id': currency_id})
if data.complete_tax_set:
# default tax is given by the lowest sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
@ -3084,7 +3086,11 @@ class wizard_multi_charts_accounts(osv.osv_memory):
ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
if ids:
if 'chart_template_id' in fields:
res.update({'only_one_chart_template': len(ids) == 1, 'chart_template_id': ids[0]})
#in order to get set default chart which was last created set max of ids.
chart_id = max(ids)
if context.get("default_charts"):
chart_id = self.pool.get('ir.model.data').search_read(cr, uid, [('model','=','account.chart.template'),('module','=',context.get("default_charts"))], ['res_id'], context=context)[0]['res_id']
res.update({'only_one_chart_template': len(ids) == 1, 'chart_template_id': chart_id})
if 'sale_tax' in fields:
sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
, "=", ids[0]), ('type_tax_use', 'in', ('sale','all'))], order="sequence")

View File

@ -10,7 +10,7 @@
</form>
<footer position="replace">
<footer>
<button name="action_next" type="object" string="Continue" class="oe_highlight"/>
<button name="action_next" context="{'default_charts':charts}" type="object" string="Continue" class="oe_highlight"/>
</footer>
</footer>
<separator string="title" position="replace">

View File

@ -252,6 +252,7 @@
<field name="property_account_payable" ref="211"/>
<field name="property_account_expense_categ" ref="61_01"/>
<field name="property_account_income_categ" ref="411_01"/>
<field name="currency_id" ref="base.ARS"/>
</record>

View File

@ -2518,6 +2518,7 @@
<field name="property_account_income_categ" ref="chart4000"/>
<field name="property_account_expense" ref="chart5000"/>
<field name="property_account_income" ref="chart4000"/>
<field name="currency_id" ref="base.EUR"/>
</record>

View File

@ -13,6 +13,7 @@
<field name="property_account_expense_categ" ref="a_expense"/>
<field name="property_account_income_categ" ref="a_sale"/>
<field name="spoken_languages" eval="'nl_BE'"/>
<field name="currency_id" ref="base.EUR"/>
</record>

View File

@ -249,6 +249,7 @@
<field name="property_account_payable" ref="211"/>
<field name="property_account_expense_categ" ref="61_01"/>
<field name="property_account_income_categ" ref="411_01"/>
<field name="currency_id" ref="base.BOB"/>
</record>

View File

@ -11,6 +11,7 @@
<field name="property_account_payable" ref="account_template_201010100" />
<field name="property_account_expense_categ" ref="account_template_3010103010000" />
<field name="property_account_income_categ" ref="account_template_3010101010200" />
<field name="currency_id" ref="base.BRL"/>
</record>
</data>

View File

@ -13,6 +13,7 @@
<field name="property_account_payable" ref="chart2111_en"/>
<field name="property_account_income_categ" ref="chart411_en"/>
<field name="property_account_expense_categ" ref="chart5111_en"/>
<field name="currency_id" ref="base.CAD"/>
</record>
<record id="stock.property_stock_account_input_categ" model="ir.property">

View File

@ -12,6 +12,7 @@
<field name="property_account_payable" ref="chart2111_fr"/>
<field name="property_account_income_categ" ref="chart411_fr"/>
<field name="property_account_expense_categ" ref="chart5111_fr"/>
<field name="currency_id" ref="base.CAD"/>
</record>
<record id="stock.property_stock_account_input_categ" model="ir.property">

View File

@ -11812,6 +11812,7 @@
<field name="property_reserve_and_surplus_account" ref="ch_2991"/>
<field name="code_digits" eval="0"/>
<field name="spoken_languages" eval="'it_IT;de_DE'"/>
<field name="currency_id" ref="base.CHF"/>
</record>
</data>
</openerp>

View File

@ -248,6 +248,7 @@
<field name="property_account_payable" ref="211"/>
<field name="property_account_expense_categ" ref="61_01"/>
<field name="property_account_income_categ" ref="411_01"/>
<field name="currency_id" ref="base.AUD"/>
</record>

View File

@ -957,6 +957,7 @@
<field name="property_account_payable" ref="chart2202"/>
<field name="property_account_expense_categ" ref="chart1401"/>
<field name="property_account_income_categ" ref="chart6001"/>
<field name="currency_id" ref="base.CNY"/>
</record>
<!-- 增值税 -->
<record id="vats" model="account.tax.template">

View File

@ -103348,6 +103348,7 @@ participacion, de conformidad con las disposiciones legales vigentes.
<field name="property_account_payable" ref="chart238095999"/>
<field name="property_account_expense_categ" ref="chart529595999"/>
<field name="property_account_income_categ" ref="chart413595999"/>
<field name="currency_id" ref="base.COP"/>
</record>
</data>

View File

@ -16,6 +16,7 @@
<field name="property_account_expense" ref="account_account_template_0_511301"/>
<field name="property_account_income_categ" ref="account_account_template_0_410001"/>
<field name="property_account_expense_categ" ref="account_account_template_0_511301"/>
<field name="currency_id" ref="base.CRC"/>
</record>
<record id="account_chart_template_x" model="account.chart.template">
<field name="name">Costa Rica - Company 1</field>
@ -28,6 +29,7 @@
<field name="property_account_expense" ref="account_account_template_x511301"/>
<field name="property_account_income_categ" ref="account_account_template_x410001"/>
<field name="property_account_expense_categ" ref="account_account_template_x511301"/>
<field name="currency_id" ref="base.CRC"/>
</record>
</data>
</openerp>

View File

@ -12,6 +12,7 @@
<field name="property_account_payable" ref="account_1610"/>
<field name="property_account_expense_categ" ref="account_3400"/>
<field name="property_account_income_categ" ref="account_8400"/>
<field name="currency_id" ref="base.EUR"/>
</record>
</data>
</openerp>

View File

@ -12,6 +12,7 @@
<field name="property_account_payable" ref="chart_skr04_3301"/>
<field name="property_account_expense_categ" ref="chart_skr04_5400"/>
<field name="property_account_income_categ" ref="chart_skr04_4400"/>
<field name="currency_id" ref="base.EUR"/>
</record>
</data>
</openerp>

View File

@ -4202,7 +4202,8 @@
<field name="property_account_receivable" ref="4"/>
<field name="property_account_payable" ref="5"/>
<field name="property_account_expense_categ" ref="60101"/>
<field name="property_account_income_categ" ref="710101"/>
<field name="property_account_income_categ" ref="710101"/>
<field name="currency_id" ref="base.ECS"/>
</record>
</data>

View File

@ -13333,6 +13333,7 @@
<field name="property_account_payable" ref="pgc_4100_child"/>
<field name="property_account_expense_categ" ref="pgc_600_child"/>
<field name="property_account_income_categ" ref="pgc_7000_child"/>
<field name="currency_id" ref="base.EUR"/>
</record>
</data>
</openerp>

View File

@ -12420,6 +12420,7 @@
<field name="property_account_payable" ref="pgc_assoc_4100_child"/>
<field name="property_account_expense_categ" ref="pgc_assoc_600_child"/>
<field name="property_account_income_categ" ref="pgc_assoc_7000_child"/>
<field name="currency_id" ref="base.EUR"/>
</record>
</data>

View File

@ -11464,6 +11464,7 @@
<field name="property_account_payable" ref="pgc_pymes_4100_child"/>
<field name="property_account_expense_categ" ref="pgc_pymes_600_child"/>
<field name="property_account_income_categ" ref="pgc_pymes_7000_child"/>
<field name="currency_id" ref="base.EUR"/>
</record>
</data>
</openerp>

View File

@ -441,6 +441,7 @@
<field name="property_account_payable" ref="fr_pcg_pay"/>
<field name="property_account_expense_categ" ref="pcg_6071"/>
<field name="property_account_income_categ" ref="pcg_7071"/>
<field name="currency_id" ref="base.EUR"/>
</record>
</data>

View File

@ -21,6 +21,7 @@
<field name="property_account_payable" ref="chartgr_50_00"/>
<field name="property_account_expense_categ" ref="chartgr_64_98"/>
<field name="property_account_income_categ" ref="chartgr_71_00"/>
<field name="currency_id" ref="base.EUR"/>
</record>

View File

@ -31,6 +31,7 @@
<field name="property_account_payable" ref="cta210101"/>
<field name="property_account_income_categ" ref="cta410101"/>
<field name="property_account_expense_categ" ref="cta510101"/>
<field name="currency_id" ref="base.QTQ"/>
</record>
<!-- Compras e IVA por Cobrar -->

View File

@ -17,6 +17,7 @@
<field name="property_account_payable" ref="cta210101"/>
<field name="property_account_income_categ" ref="cta410101"/>
<field name="property_account_expense_categ" ref="cta510101"/>
<field name="currency_id" ref="base.HNL"/>
</record>
<!-- Compras e ISV por Cobrar -->

View File

@ -15,6 +15,7 @@
<field name="property_account_expense_categ" ref="kp_rrif4199"/>
<field name="property_account_income_categ" ref="kp_rrif7500"/>
<field name="currency_id" ref="base.HRK"/>
</record>
</data>

View File

@ -550,6 +550,7 @@
<field name="property_account_payable" ref="a215"/>
<field name="property_account_expense_categ" ref="a540"/>
<field name="property_account_income_categ" ref="a311"/>
<field name="currency_id" ref="base.INR"/>
</record>

View File

@ -988,6 +988,7 @@
<field name="property_account_payable" ref="p21000"/>
<field name="property_account_expense_categ" ref="p41010"/>
<field name="property_account_income_categ" ref="p31010"/>
<field name="currency_id" ref="base.INR"/>
</record>
</data>

View File

@ -11,6 +11,7 @@
<field name="property_account_payable" ref="2501"/>
<field name="property_account_expense_categ" ref="4101"/>
<field name="property_account_income_categ" ref="3101"/>
<field name="currency_id" ref="base.EUR"/>
</record>
</data>
</openerp>

View File

@ -13,6 +13,7 @@
<field name="property_account_income_categ" ref="lu_2011_account_7051"/>
<field name="property_account_income_opening" ref="lu_2011_account_141"/>
<field name="property_account_expense_opening" ref="lu_2011_account_141"/>
<field name="currency_id" ref="base.EUR"/>
</record>
</data>

View File

@ -742,7 +742,9 @@
<field name="account_root_id" ref="pcg_0"/>
<field name="tax_code_root_id" ref="vat_ma_tax_root"/>
<field name="bank_account_view_id" ref="pcg_514"/>
<field name="property_account_receivable" ref="pcg_3488"/>
<field name="property_account_payable" ref="pcg_4488"/>
<field name="currency_id" ref="base.MAD"/>
</record>
<record model="account.tax.template" id="tva_exo">

View File

@ -3695,6 +3695,7 @@ Cuentas del plan
<field name="property_account_income_categ" ref="cuenta5111001000"/>
<field name="property_stock_account_input_categ" ref="cuenta4111003000"/>
<field name="property_stock_account_output_categ" ref="cuenta4511003000"/>
<field name="currency_id" ref="base.MXN"/>
</record>

View File

@ -4102,6 +4102,7 @@
<field name="property_account_payable" ref="a_pay"/> <!-- crediteuren -->
<field name="property_account_expense_categ" ref="a_expense"/><!-- aankoop grondstoffen -->
<field name="property_account_income_categ" ref="a_sale"/> <!-- verkoop rekening -->
<field name="currency_id" ref="base.EUR"/>
</record>
<!-- BTW Template

View File

@ -242,6 +242,7 @@
<field name="property_account_payable" ref="211"/>
<field name="property_account_expense_categ" ref="62_01"/>
<field name="property_account_income_categ" ref="411_01"/>
<field name="currency_id" ref="base.PAB"/>
</record>

View File

@ -2257,7 +2257,8 @@
<field name="property_account_receivable" ref="121100"/>
<field name="property_account_payable" ref="421100"/>
<field name="property_account_expense_categ" ref="6011_01"/>
<field name="property_account_income_categ" ref="70111_01"/>
<field name="property_account_income_categ" ref="70111_01"/>
<field name="currency_id" ref="base.PEN"/>
</record>

View File

@ -3202,6 +3202,7 @@
<field name="property_account_payable" ref="chart221000000"/>
<field name="property_account_expense_categ" ref="chart330020000"/>
<field name="property_account_income_categ" ref="chart773010000"/>
<field name="currency_id" ref="base.PLZ"/>
</record>
</data>

View File

@ -16,6 +16,7 @@
<field name="property_account_income_categ" ref="chart_711"/>
<field name="property_account_expense_categ" ref="chart_311"/>
<field name="property_reserve_and_surplus_account" ref="chart_811"/>
<field name="currency_id" ref="base.EUR"/>
</record>
</data>

View File

@ -4587,7 +4587,7 @@
<field name="property_account_payable" ref="ro_pcg_pay"/> <!-- 4011 -->
<field name="property_account_expense_categ" ref="ro_pcg_expense"/> <!-- 607 -->
<field name="property_account_income_categ" ref="ro_pcg_sale"/> <!-- 707 -->
<field name="currency_id" ref="base.ROL"/>
</record>
</data>
</openerp>

View File

@ -1850,6 +1850,7 @@
<field name="property_account_payable" ref="pcg_4011"/>
<field name="property_account_expense_categ" ref="pcg_6011" />
<field name="property_account_income_categ" ref="pcg_7011" />
<field name="currency_id" ref="base.XOF"/>
</record>
<record model="account.tax.code.template" id="tax_col_ht">

View File

@ -477,6 +477,7 @@
<field name="property_account_income_categ" ref="a_sales"/>
<field name="property_account_expense" ref="a_exp_office"/>
<field name="property_account_income" ref="a_sales"/>
<field name="currency_id" ref="base.THB"/>
</record>

View File

@ -12,6 +12,7 @@
<field name="property_account_payable" ref="tr320"/>
<field name="property_account_expense_categ" ref="tr150"/>
<field name="property_account_income_categ" ref="tr600"/>
<field name="currency_id" ref="base.TRL"/>
</record>

View File

@ -6,6 +6,7 @@
<field name="name">Basic Chart of Account</field>
<field name="visible" eval="False" />
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_cogs" model="account.chart.template">
@ -13,45 +14,53 @@
<field name="visible" eval="False" />
<field name="parent_id" ref="account_chart_template_basic"/>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_advertising" model="account.chart.template">
<field name="name">Advertising</field>
<field name="complete_tax_set" eval="False" />
<field name="parent_id" ref="account_chart_template_cogs"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_agriculture" model="account.chart.template">
<field name="name">Agriculture</field>
<field name="complete_tax_set" eval="False" />
<field name="parent_id" ref="account_chart_template_basic"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_construction" model="account.chart.template">
<field name="name">Construction Trades (Plumber, Electrician, HVAC, etc.)</field>
<field name="complete_tax_set" eval="False" />
<field name="parent_id" ref="account_chart_template_cogs"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_financial_service" model="account.chart.template">
<field name="name">Financial Services other than Accounting or Bookkeeping</field>
<field name="complete_tax_set" eval="False" />
<field name="parent_id" ref="account_chart_template_cogs"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_general_service" model="account.chart.template">
<field name="name">General Service-Based Business</field>
<field name="complete_tax_set" eval="False" />
<field name="parent_id" ref="account_chart_template_cogs"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_legal_service" model="account.chart.template">
<field name="name">Legal Services</field>
<field name="complete_tax_set" eval="False" />
<field name="parent_id" ref="account_chart_template_basic"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_general_product" model="account.chart.template">
<field name="name">General Product-Based Business</field>
<field name="complete_tax_set" eval="False" />
<field name="parent_id" ref="account_chart_template_basic"/>
<field name="currency_id" ref="base.USD"/>
</record>
</data>
</openerp>

View File

@ -6,33 +6,43 @@
<field name="account_root_id" ref="coa_basic"/>
<field name="bank_account_view_id" ref="cash_expenditure"/>
<field name="tax_code_root_id" ref="tax_code_chart_root"/>
<field name="property_account_receivable" ref="account_receivable"/>
<field name="property_account_payable" ref="account_payable"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_advertising" model="account.chart.template">
<field name="bank_account_view_id" ref="cash_expenditure"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_agriculture" model="account.chart.template">
<field name="bank_account_view_id" ref="cash_expenditure"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_construction" model="account.chart.template">
<field name="bank_account_view_id" ref="cash_expenditure"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_financial_service" model="account.chart.template">
<field name="bank_account_view_id" ref="cash_expenditure"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_general_service" model="account.chart.template">
<field name="bank_account_view_id" ref="cash_expenditure"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_legal_service" model="account.chart.template">
<field name="bank_account_view_id" ref="cash_expenditure"/>
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_general_product" model="account.chart.template">
<field name="bank_account_view_id" ref="cash_expenditure"/>
<field name="currency_id" ref="base.USD"/>
</record>
</data>
</openerp>

View File

@ -1,5 +1,6 @@
<openerp>
<data noupdate="1">
<record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
<field name="state">open</field>
</record>

View File

@ -1895,6 +1895,7 @@
<field name="property_account_payable" ref="uy_code_21100"/>
<field name="property_account_income_categ" ref="uy_code_4100"/>
<field name="property_account_expense_categ" ref="uy_code_5100"/>
<field name="currency_id" ref="base.UYP"/>
</record>

View File

@ -3315,6 +3315,7 @@
<field name="property_account_payable" ref="account_activa_account_2122001"/>
<field name="property_account_expense_categ" ref="account_activa_account_7151001"/>
<field name="property_account_income_categ" ref="account_activa_account_5111001"/>
<field name="currency_id" ref="base.VUB"/>
</record>
</data>
</openerp>

View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record id="tax0sale" model="account.tax.template">
<record id="tax0all" model="account.tax.template">
<field name="chart_template_id" ref="ve_chart_template_amd"/>
<field name="name">Exento</field>
<field name="amount">0.00000</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>
<field name="type_tax_use">all</field>
<field name="collected_id" ref="account_activa_account_2172003"/>
<field name="paid_id" ref="account_activa_account_2172003"/>
<field name="base_code_id" ref="vat_code_base_due"/>
@ -54,19 +54,6 @@
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
<field name="ref_tax_code_id" ref="vat_code_payable"/>
</record>
<record id="tax0purchase" model="account.tax.template">
<field name="chart_template_id" ref="ve_chart_template_amd"/>
<field name="name">Exento</field>
<field name="amount">0.00000</field>
<field name="type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="collected_id" ref="account_activa_account_2172003"/>
<field name="paid_id" ref="account_activa_account_2172003"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
<field name="ref_tax_code_id" ref="vat_code_payable"/>
</record>
<record id="tax1purchase" model="account.tax.template">
<field name="chart_template_id" ref="ve_chart_template_amd"/>
<field name="name">IVA (12.0%) compras</field>

View File

@ -2015,7 +2015,7 @@
<field name="property_account_payable" ref="chart331" />
<field name="property_account_expense_categ" ref="chart1561" />
<field name="property_account_income_categ" ref="chart5111" />
<field name="currency_id" ref="base.VND"/>
</record>
</data>