Merge lp:~openerp-dev/openobject-addons/trunk-bug-785147-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

Fix: Bad code in New Company Financial Setting, or more likely in every localisation module in 6

Thanks,
ara

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[qdp (OpenERP) (qdp)]

you can't do that change, it's just wrong, it means you can not run again the configuration for a company from the menuiten, as the second step will never be shown.

Solution has to be chosen accordingly to last development on the accounting wizard and thus, should be discussed first with Antony.

review: Disapprove

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2011-07-22 13:42:35 +0000
+++ account/account_view.xml	2011-08-02 07:31:35 +0000
@@ -2433,7 +2433,7 @@
             <field name="model_id" ref="base.model_ir_actions_todo"/>
             <field eval="5" name="sequence"/>
             <field name="code">
-act_window_ids = self.pool.get('ir.actions.act_window').search(cr, uid,[('name', 'in', ('Accounting Chart Configuration', 'Generate Chart of Accounts from a Chart Template'))], context=context)
+act_window_ids = self.pool.get('ir.actions.act_window').search(cr, uid,[('name', '=', ('Accounting Chart Configuration'))], context=context)
 todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, [('action_id', 'in', act_window_ids)], context=context)
 self.pool.get('ir.actions.todo').write(cr, uid, todo_ids, {'state':'open'}, context=context)
 action = self.pool.get('res.config').next(cr, uid, [], context)