odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] account: Fixed installing chart of account problem. 

bzr revid: uco@tinyerp.com-20120313093232-2wwiiz8nznc82q5c
This commit is contained in:
Ujjvala Collins (OpenERP) 2012-03-13 15:02:32 +05:30
parent 8b7aeb05b3
commit e53252a565
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/account/res_config.py
View File

@ -198,9 +198,9 @@ class account_configuration(osv.osv_memory):
res.update({'fiscalyear_id': fiscalyear_ids[0]})
if taxes:
sale_tax_id = taxes.get('taxes_id')
res.update({'sale_tax': sale_tax_id and sale_tax_id[0]})
res.update({'sale_tax': isinstance(sale_tax_id,list) and sale_tax_id[0] or False})
purchase_tax_id = taxes.get('supplier_taxes_id')
res.update({'purchase_tax': purchase_tax_id and purchase_tax_id[0]})
res.update({'purchase_tax': isinstance(purchase_tax_id,list) and purchase_tax_id[0] or False})
return res
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@ -243,22 +243,19 @@ class account_configuration(osv.osv_memory):
return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}}
return {}
def execute(self, cr, uid, ids, context=None):
self.execute_simple(cr, uid, ids, context)
super(account_configuration, self).execute(cr, uid, ids, context=context)
def execute_simple(self, cr, uid, ids, context=None):
def install_chartofaccounts(self, cr, uid, ids, context=None):
ir_module = self.pool.get('ir.module.module')
if context is None:
context = {}
for res in self.read(cr, uid, ids, context=context):
if res.get('charts') == 'configurable':
chart = res.get('charts')
if chart == 'configurable':
#load generic chart of account
fp = tools.file_open(opj('account', 'configurable_account_chart.xml'))
tools.convert_xml_import(cr, 'account', fp, {}, 'init', True, None)
fp.close()
else:
mod_ids = ir_module.search(cr, uid, [('name','=',res.get('charts'))])
elif chart.startswith('l10n_'):
mod_ids = ir_module.search(cr, uid, [('name','=',chart)])
if mod_ids and ir_module.browse(cr, uid, mod_ids[0], context).state == 'uninstalled':
ir_module.button_immediate_install(cr, uid, mod_ids, context)

2
addons/account/res_config_view.xml
View File

@ -12,7 +12,7 @@
<group col="4" colspan="4" string="Warning" attrs="{'invisible': [('chart_template_id','!=',False)]}">
<label string="You have no chart of accounts or taxes defined for this company. Select a chart of account to proceed." colspan="4"/>
<field name="charts"/>
<button name="action_next" string="Install Chart of Account" icon="gtk-execute" type="object"/>
<button name="install_chartofaccounts" string="Install Chart of Account" icon="gtk-execute" type="object"/>
</group>
<field name="fiscalyear_id" invisible="1"/>
<group col="4" colspan="4" string="Warning" attrs="{'invisible': [('fiscalyear_id','!=',False)]}">