Merge lp:~openerp-dev/openobject-addons/7.0-bug-1224691-tpa into lp:openobject-addons/7.0

[Turkesh Patel (openERP)]

[FIX] Error on custom chart of accounts installation

[Thibault Delavallée (OpenERP) (tde-openerp)]

Already fixed in 7.0 and trunk. Thanks anyway !

Unmerged revisions

9439. By Turkesh Patel (openERP) on 2013-09-13

[FIX]Error on custom chart of accounts installation

=== modified file 'account/account.py'
--- account/account.py	2013-09-12 11:32:47 +0000
+++ account/account.py	2013-09-13 06:19:59 +0000
@@ -3123,7 +3123,8 @@
                 chart_id = max(ids)
                 if context.get("default_charts"):
                     data_id = data_obj.search(cr, uid, [('model', '=', 'account.chart.template'), ('module', '=', context.get("default_charts"))], context=context)
-                    chart_id = data_obj.browse(cr, uid, data_id[0], context=context).res_id
+                    if data_id:
+                        chart_id = data_obj.browse(cr, uid, data_id[0], context=context).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"

=== modified file 'account/installer.py'
--- account/installer.py	2013-06-07 11:38:29 +0000
+++ account/installer.py	2013-09-13 06:19:59 +0000
@@ -66,7 +66,7 @@
             charts.update((m.name, m.shortdesc) for m in modules.browse(cr, uid, ids, context=context))
 
         charts = sorted(charts.items(), key=itemgetter(1))
-        charts.insert(0, ('configurable', _('Custom')))
+        charts.insert(0, ('account', _('Custom')))
         return charts
 
     _columns = {
@@ -97,7 +97,7 @@
         'period': 'month',
         'company_id': _default_company,
         'has_default_company': _default_has_default_company,
-        'charts': 'configurable'
+        'charts': 'account'
     }
     
     def get_unconfigured_cmp(self, cr, uid, context=None):