Merge lp:~openerp-dev/openobject-addons/trunk-bug-876260-mdi into lp:openobject-addons

[DJ Patel (OpenERP)]

hello sir,

I have fix the issue of "install chart of account" and "install chart of account from a chart template" must be triggered automatically.

Thanks
Divyesh Makwana

[qdp (OpenERP) (qdp)]

i didn't test but i feel like it's very weird to fix it that way. It means that the following code will never be reached:
314 if 'html' in context:
315 return {'type' : 'ir.actions.reload'}
316 else:
317 return {'type' : 'ir.actions.act_window_close'}

so i think that instead you should always return self.pool.get('res.config').next(cr, uid, [], context=context) at the end of that method, and in def _next() of server/trunk/openerp/addons/base/res/res_config.py, you need to treat the case where 'html' is given in the context or not.

stw, do you confirm?

[qdp (OpenERP) (qdp)]

in other words, i would do this:
=== modified file 'base_setup/base_setup.py'
--- base_setup/base_setup.py 2011-10-21 11:39:58 +0000
+++ base_setup/base_setup.py 2011-10-26 10:28:36 +0000
@@ -310,11 +310,8 @@
+ return self.pool.get('res.config').next(cr, uid, [], context=context)
- if 'html' in context:
- return {'type' : 'ir.actions.reload'}
- else:
- return {'type' : 'ir.actions.act_window_close'}

=== modified file 'openerp/addons/base/res/res_config.py'
--- openerp/addons/base/res/res_config.py 2011-10-02 11:51:31 +0000
+++ openerp/addons/base/res/res_config.py 2011-10-26 10:32:09 +0000
@@ -70,6 +70,8 @@
             res = next.action_launch(context=context)
             res['nodestroy'] = False
             return res
+ if 'html' in context:
+ return {'type' : 'ir.actions.reload'}
         return {'type' : 'ir.actions.act_window_close'}

Divyesh, can you test and if it's correct make new merge proposals on both server and addons?

thanks

[Aline (OpenERP) (apr-tinyerp)]

seems ok but the page is not reloaded if i install warehouse, don't know if it is due to this branch

review: Needs Fixing

[DJ Patel (OpenERP) (mdi-openerp)]

Hello Aline,

I check the issue, but it works fine.There are two merge proposal for this bug one for 'server'
and another for 'addons'.

I think you miss to check with both the branches.

Only one time the 'Chart of accounts' is triggered, the next time both the wizard are in 'done' state.

Thanks and Regards,

Divyesh Makwana

=== modified file 'base_setup/base_setup.py'
--- base_setup/base_setup.py	2011-10-21 11:39:58 +0000
+++ base_setup/base_setup.py	2011-10-31 06:31:26 +0000
@@ -311,10 +311,7 @@
                 cr.commit()
                 self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
 
-        if 'html' in context:
-            return {'type' : 'ir.actions.reload'}
-        else:
-            return {'type' : 'ir.actions.act_window_close'}
+        return self.pool.get('res.config').next(cr, uid, [], context=context)
 
 #Migrate data from another application Conf wiz