[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-rework-addons-23-march-aag

bzr revid: rpa@tinyerp.com-20110330095756-ofobhy9y8f5gbvvq

addons/account/configurable_account_chart.xml

@@ -617,7 +617,7 @@
 			<field name="name">Generate Chart of Accounts from a Chart Template</field>
 			<field name="action_id" ref="account.action_wizard_multi_chart"/>
 			<field name="state">open</field>
-			<field name="restart">onskip</field>
+			<field name="restart">on_trigger</field>
 		</record>
 
 

addons/base_setup/installer.py

@@ -19,6 +19,7 @@
 #
 ##############################################################################
 from osv import fields, osv
+import pooler
 
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
@@ -119,6 +120,7 @@ class base_setup_installer(osv.osv_memory):
         if context is None:
              context = {}
         modules = self.pool.get('ir.module.module')
+        upgrade_obj = self.pool.get('base.module.upgrade')
         modules_selected = []
         datas = self.read(cr, uid, ids, context=context)[0]
         key = datas.keys()
@@ -138,7 +140,9 @@ class base_setup_installer(osv.osv_memory):
         for i in inst:
             if i.state == 'uninstalled':
                 sect_mod_id = i.id
-                modules.button_install(cr, uid, [sect_mod_id], context=context)
+                modules.state_update(cr, uid, [sect_mod_id], 'to install', ['uninstalled'], context)
+                cr.commit()
+                new_db, self.pool = pooler.restart_pool(cr.dbname, update_module=True)
             elif i.state == 'installed':
                 if modules_selected:
                     for instl in modules_selected: