From 43690eb21f88759f76f591247f43cf6aa548e611 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 1 Mar 2011 12:52:41 +0530
Subject: [PATCH 01/18] [IMP] REWORK-SERVERSIDE :Improvement Config wiz , ON
 SERVER SIDE

bzr revid: aag@tinyerp.co.in-20110301072241-a8s1iialq6xeot23
---
 openerp/addons/base/ir/ir.xml                 |  2 +-
 openerp/addons/base/ir/ir_actions.py          |  4 +--
 .../wizard/base_module_configuration_view.xml |  2 +-
 .../addons/base/res/partner/partner_view.xml  |  4 ++-
 openerp/addons/base/res/res_config.py         | 31 +------------------
 5 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index a7e9922331b..d1917a4a52f 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1908,7 +1908,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Actions">
-                    <filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','onskip')]" help="Todo State Or (Skip State And Onskip Restart)"/>
+                    <filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','on_trigger')]" help="Todo State Or (Skip State And ontrigger Restart)"/>
                     <separator orientation="vertical"/>
                     <field name="state"/>
                     <field name="restart"/>
diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 7a07ca40ef8..1d73ad70171 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -794,14 +794,14 @@ class ir_actions_todo(osv.osv):
         'sequence': fields.integer('Sequence'),
         'state': fields.selection(TODO_STATES, string='State', required=True),
         'name':fields.char('Name', size=64),
-        'restart': fields.selection([('onskip','On Skip'),('always','Always'),('never','Never')],'Restart',required=True),
+        'restart': fields.selection([('on_trigger','On Trigger'),('always','Always'),('never','Never')],'Restart',required=True),
         'groups_id':fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'),
         'note':fields.text('Text', translate=True),
     }
     _defaults={
         'state': 'open',
         'sequence': 10,
-        'restart': 'onskip',
+        'restart': 'on_trigger',
     }
     _order="sequence,name,id"
 
diff --git a/openerp/addons/base/module/wizard/base_module_configuration_view.xml b/openerp/addons/base/module/wizard/base_module_configuration_view.xml
index f8abf1e2732..be86145a156 100644
--- a/openerp/addons/base/module/wizard/base_module_configuration_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_configuration_view.xml
@@ -24,7 +24,7 @@
             <field name="code">action = obj.start()</field>
         </record>
 
-        <menuitem name="Reconfigure"
+        <menuitem name="Add More Features"
             action="action_start_configurator"
             id="menu_view_base_module_configuration" parent="base.menu_config"
             type="server" icon="STOCK_EXECUTE" sequence="100" />
diff --git a/openerp/addons/base/res/partner/partner_view.xml b/openerp/addons/base/res/partner/partner_view.xml
index 9d46404132c..e32e73deedb 100644
--- a/openerp/addons/base/res/partner/partner_view.xml
+++ b/openerp/addons/base/res/partner/partner_view.xml
@@ -3,7 +3,9 @@
     <data>
         <menuitem icon="terp-partner" id="menu_base_partner" name="Sales" sequence="0"
                   web_icon="data/sales.png"
-                  web_icon_hover="data/sales-hover.png"/>
+                  web_icon_hover="data/sales-hover.png"
+                  groups="base.group_sale_salesman,base.group_sale_salesman"/>
+                  
 
         <menuitem id="menu_address_book" name="Address Book" parent="menu_base_partner" sequence="2"/>
 
diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 3f8c6f20b8d..2f0b5c44509 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -120,7 +120,7 @@ class res_config_configurable(osv.osv_memory):
     def start(self, cr, uid, ids, context=None):
         ids2 = self.pool.get('ir.actions.todo').search(cr, uid, [], context=context)
         for todo in self.pool.get('ir.actions.todo').browse(cr, uid, ids2, context=context):
-            if (todo.restart=='always') or (todo.restart=='onskip' and (todo.state in ('skip','cancel'))):
+            if (todo.restart=='always') or (todo.restart=='on_trigger' and (todo.state in ('skip','cancel'))):
                 todo.write({'state':'open'})
         return self.next(cr, uid, ids, context)
 
@@ -355,35 +355,6 @@ class res_config_installer(osv.osv_memory):
         return (base | hooks_results | additionals) - set(
             map(attrgetter('name'), self._already_installed(cr, uid, context)))
 
-    def default_get(self, cr, uid, fields_list, context=None):
-        ''' If an addon is already installed, check it by default
-        '''
-        defaults = super(res_config_installer, self).default_get(
-            cr, uid, fields_list, context=context)
-
-        return dict(defaults,
-                    **dict.fromkeys(
-                        map(attrgetter('name'),
-                            self._already_installed(cr, uid, context=context)),
-                        True))
-
-    def fields_get(self, cr, uid, fields=None, context=None, write_access=True):
-        """ If an addon is already installed, set it to readonly as
-        res.config.installer doesn't handle uninstallations of already
-        installed addons
-        """
-        fields = super(res_config_installer, self).fields_get(
-            cr, uid, fields, context, write_access)
-
-        for module in self._already_installed(cr, uid, context=context):
-            if module.name not in fields:
-                continue
-            fields[module.name].update(
-                readonly=True,
-                help= ustr(fields[module.name].get('help', '')) +
-                     _('\n\nThis addon is already installed on your system'))
-        return fields
-
     def execute(self, cr, uid, ids, context=None):
         modules = self.pool.get('ir.module.module')
         to_install = list(self.modules_to_install(

From 73378da514dd636ddafcd6ca4d552ae9db637efe Mon Sep 17 00:00:00 2001
From: sus <sus@sus-desktop>
Date: Tue, 1 Mar 2011 13:10:35 +0530
Subject: [PATCH 02/18] [IMP] : Improvement in server(module.py file)

bzr revid: sus@sus-desktop-20110301074035-7fx0v3gv8889slbb
---
 openerp/addons/__init__.py                    |  2 +-
 openerp/addons/base/module/module.py          | 58 ++++++++++++++-----
 openerp/addons/base/module/module_view.xml    |  2 +-
 .../base/module/wizard/base_module_upgrade.py | 31 ----------
 .../wizard/base_module_upgrade_view.xml       | 16 ++---
 openerp/addons/base/res/res_user.py           |  1 -
 6 files changed, 50 insertions(+), 60 deletions(-)

diff --git a/openerp/addons/__init__.py b/openerp/addons/__init__.py
index af080724136..ee6cd5eba49 100644
--- a/openerp/addons/__init__.py
+++ b/openerp/addons/__init__.py
@@ -843,7 +843,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
         if 'base' in tools.config['update'] or 'all' in tools.config['update']:
             cr.execute("update ir_module_module set state=%s where name=%s and state=%s", ('to upgrade', 'base', 'installed'))
 
-        # STEP 1: LOAD BASE (must be done before module dependencies can be computed for later steps) 
+        # STEP 1: LOAD BASE (must be done before module dependencies can be computed for later steps)
         graph = create_graph(cr, ['base'], force)
         if not graph:
             logger.notifyChannel('init', netsvc.LOG_CRITICAL, 'module base cannot be loaded! (hint: verify addons-path)')
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 2e276433e63..fd701ba353e 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -200,6 +200,7 @@ class module(osv.osv):
 
     def _name_uniq_msg(self, cr, uid, ids, context=None):
         return _('The name of the module must be unique !')
+
     def _certificate_uniq_msg(self, cr, uid, ids, context=None):
         return _('The certificate ID of the module must be unique !')
 
@@ -285,8 +286,41 @@ class module(osv.osv):
             demo = demo or mdemo
         return demo
 
+    def upgrade(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.module.module')
+        ids = mod_obj.search(cr, uid, [('state', 'in', ['to upgrade', 'to remove', 'to install'])])
+        unmet_packages = []
+        mod_dep_obj = self.pool.get('ir.module.module.dependency')
+        for mod in mod_obj.browse(cr, uid, ids, context=context):
+            depends_mod_ids = mod_dep_obj.search(cr, uid, [('module_id', '=', mod.id)], context=context)
+            for dep_mod in mod_dep_obj.browse(cr, uid, depends_mod_ids):
+                if dep_mod.state in ('unknown','uninstalled'):
+                    unmet_packages.append(dep_mod.name)
+        if len(unmet_packages):
+            raise osv.except_osv(_('Unmet dependency !'), _('Following modules are not installed or unknown: %s') % ('\n\n' + '\n'.join(unmet_packages)))
+        mod_obj.download(cr, uid, ids, context=context)
+        cr.commit()
+        _db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+        return True
+
     def button_install(self, cr, uid, ids, context=None):
-        return self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
+        self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
+        self.upgrade(cr, uid, ids, context=context)
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_upgrade_install')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        return {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'base.module.upgrade',
+                'views': [(id2, 'form')],
+                'view_id': False,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy':True,
+            }
+
 
     def button_install_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'uninstalled', 'demo':False})
@@ -305,49 +339,41 @@ class module(osv.osv):
             res = cr.fetchall()
             if res:
                 raise orm.except_orm(_('Error'), _('Some installed modules depend on the module you plan to Uninstall :\n %s') % '\n'.join(map(lambda x: '\t%s: %s' % (x[0], x[1]), res)))
+
         self.write(cr, uid, ids, {'state': 'to remove'})
+        self.upgrade(cr, uid, ids, context=context)
         return True
 
     def button_uninstall_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'installed'})
         return True
 
+
     def button_upgrade(self, cr, uid, ids, context=None):
         depobj = self.pool.get('ir.module.module.dependency')
         todo = self.browse(cr, uid, ids, context=context)
         self.update_list(cr, uid)
-
         i = 0
         while i<len(todo):
             mod = todo[i]
             i += 1
-            if mod.state not in ('installed','to upgrade'):
-                raise orm.except_orm(_('Error'),
-                        _("Can not upgrade module '%s'. It is not installed.") % (mod.name,))
-            self.check_external_dependencies(mod.name, 'to upgrade')
-            iids = depobj.search(cr, uid, [('name', '=', mod.name)], context=context)
-            for dep in depobj.browse(cr, uid, iids, context=context):
-                if dep.module_id.state=='installed' and dep.module_id not in todo:
-                    todo.append(dep.module_id)
-
         ids = map(lambda x: x.id, todo)
         self.write(cr, uid, ids, {'state':'to upgrade'}, context=context)
-
         to_install = []
         for mod in todo:
             for dep in mod.dependencies_id:
                 if dep.state == 'unknown':
                     raise orm.except_orm(_('Error'), _('You try to upgrade a module that depends on the module: %s.\nBut this module is not available in your system.') % (dep.name,))
-                if dep.state == 'uninstalled':
+                if dep.state == 'installed':
                     ids2 = self.search(cr, uid, [('name','=',dep.name)])
                     to_install.extend(ids2)
-
-        self.button_install(cr, uid, to_install, context=context)
+        self.upgrade(cr, uid, to_install, context=context)
         return True
 
     def button_upgrade_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'installed'})
         return True
+
     def button_update_translations(self, cr, uid, ids, context=None):
         self.update_translations(cr, uid, ids)
         return True
@@ -383,7 +409,7 @@ class module(osv.osv):
                 updated_values = {}
                 for key in values:
                     old = getattr(mod, key)
-                    updated = isinstance(values[key], basestring) and tools.ustr(values[key]) or values[key] 
+                    updated = isinstance(values[key], basestring) and tools.ustr(values[key]) or values[key]
                     if not old == updated:
                         updated_values[key] = values[key]
                 if terp.get('installable', True) and mod.state == 'uninstallable':
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 16527641656..5e9bb539de1 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -112,7 +112,7 @@
                             <newline/>
                             <field name="state" readonly="1" select="1"/>
                             <group col="6" colspan="2">
-                                <button name="button_install" states="uninstalled" string="Schedule for Installation" icon="terp-gtk-jump-to-ltr" type="object"/>
+                                <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object"/>
                                 <button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
                                 <button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"/>
                                 <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index ca82cfb20d2..e1ba1644387 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import pooler
 from osv import osv, fields
 from tools.translate import _
 
@@ -81,36 +80,6 @@ class base_module_upgrade(osv.osv_memory):
         res = mod_obj.read(cr, uid, ids, ['name','state'], context)
         return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+x['state'], res))}
 
-    def upgrade_module(self, cr, uid, ids, context=None):
-        mod_obj = self.pool.get('ir.module.module')
-        ids = mod_obj.search(cr, uid, [('state', 'in', ['to upgrade', 'to remove', 'to install'])])
-        unmet_packages = []
-        mod_dep_obj = self.pool.get('ir.module.module.dependency')
-        for mod in mod_obj.browse(cr, uid, ids):
-            depends_mod_ids = mod_dep_obj.search(cr, uid, [('module_id', '=', mod.id)])
-            for dep_mod in mod_dep_obj.browse(cr, uid, depends_mod_ids):
-                if dep_mod.state in ('unknown','uninstalled'):
-                    unmet_packages.append(dep_mod.name)
-        if len(unmet_packages):
-            raise osv.except_osv(_('Unmet dependency !'), _('Following modules are not installed or unknown: %s') % ('\n\n' + '\n'.join(unmet_packages)))
-        mod_obj.download(cr, uid, ids, context=context)
-        cr.commit()
-        _db, pool = pooler.restart_pool(cr.dbname, update_module=True)
-
-        data_obj = pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_upgrade_install')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-
-        return {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'base.module.upgrade',
-                'views': [(id2, 'form')],
-                'view_id': False,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-            }
 
     def config(self, cr, uid, ids, context=None):
         return self.pool.get('res.config').next(cr, uid, [], context=context)
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index b8bb282d6ed..4c15335c28e 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -30,17 +30,13 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem
-        name="Apply Scheduled Upgrades"
-        action="action_view_base_module_upgrade"
-        id="menu_view_base_module_upgrade"
-       parent="menu_management"
-       sequence="3"/>
+<!--        <menuitem-->
+<!--        name="Apply Scheduled Upgrades"-->
+<!--        action="action_view_base_module_upgrade"-->
+<!--        id="menu_view_base_module_upgrade"-->
+<!--       parent="menu_management"-->
+<!--       sequence="3"/>-->
 
-       <act_window id="action_view_base_module_upgrade_window"
-            key2="client_action_multi" name="Apply Scheduled Upgrades"
-            res_model="base.module.upgrade" src_model="ir.module.module"
-            view_mode="form" target="new" view_type="form" />
 
        <record id="view_base_module_upgrade_install" model="ir.ui.view">
             <field name="name">Module Upgrade Install</field>
diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py
index 261ec699659..6be35854ff2 100644
--- a/openerp/addons/base/res/res_user.py
+++ b/openerp/addons/base/res/res_user.py
@@ -571,7 +571,6 @@ class groups2(osv.osv): ##FIXME: Is there a reason to inherit this object ?
         for record in self.read(cr, uid, ids, ['users'], context=context):
             if record['users']:
                 group_users.extend(record['users'])
-
         if group_users:
             user_names = [user.name for user in self.pool.get('res.users').browse(cr, uid, group_users, context=context)]
             if len(user_names) >= 5:

From 7ddf04e324b668d020c2bed77a7dae28bc74e992 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 1 Mar 2011 14:24:43 +0530
Subject: [PATCH 03/18] [IMP] REWORK-SERVERSIDE :Add sale manager in Sale menu
 , ON SERVER SIDE

bzr revid: aag@tinyerp.co.in-20110301085443-5amgb5oh64469hwa
---
 openerp/addons/base/res/partner/partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/partner/partner_view.xml b/openerp/addons/base/res/partner/partner_view.xml
index e32e73deedb..e9a2ca1b762 100644
--- a/openerp/addons/base/res/partner/partner_view.xml
+++ b/openerp/addons/base/res/partner/partner_view.xml
@@ -4,7 +4,7 @@
         <menuitem icon="terp-partner" id="menu_base_partner" name="Sales" sequence="0"
                   web_icon="data/sales.png"
                   web_icon_hover="data/sales-hover.png"
-                  groups="base.group_sale_salesman,base.group_sale_salesman"/>
+                  groups="base.group_sale_salesman,base.group_sale_manager"/>
                   
 
         <menuitem id="menu_address_book" name="Address Book" parent="menu_base_partner" sequence="2"/>

From 6a165fd4a4e53a27d3eab738d30df40f0cb17637 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 1 Mar 2011 18:58:44 +0530
Subject: [PATCH 04/18] [IMP] REWORK-SERVERSIDE :Sale menu is not shown when
 Any appl not install , ON SERVER SIDE

bzr revid: aag@tinyerp.co.in-20110301132844-3w2q2czymhuyuvgb
---
 openerp/addons/base/res/partner/partner_view.xml | 2 +-
 openerp/addons/base/security/base_security.xml   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/partner/partner_view.xml b/openerp/addons/base/res/partner/partner_view.xml
index e9a2ca1b762..a104825ea1b 100644
--- a/openerp/addons/base/res/partner/partner_view.xml
+++ b/openerp/addons/base/res/partner/partner_view.xml
@@ -4,7 +4,7 @@
         <menuitem icon="terp-partner" id="menu_base_partner" name="Sales" sequence="0"
                   web_icon="data/sales.png"
                   web_icon_hover="data/sales-hover.png"
-                  groups="base.group_sale_salesman,base.group_sale_manager"/>
+                  groups="base.group_sale_salesman"/>
                   
 
         <menuitem id="menu_address_book" name="Address Book" parent="menu_base_partner" sequence="2"/>
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index eb39dbf43d5..3b699f6686e 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -35,6 +35,11 @@
     <record id="group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
+    
+    <record id="group_sale_salesman" model="res.groups">
+        <field eval="[(3,1)]" name="users"/>
+    </record>
+    
     <!-- Set accesses to menu -->
     <record model="ir.ui.menu" id="base.menu_administration">
         <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>

From 2f343a608390019d48e232e4e740f01f2abcfd43 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 4 Mar 2011 17:03:27 +0530
Subject: [PATCH 05/18] [IMP] REWORK-SERVERSIDE :Now skip wiz not Shown , ON
 SERVER SIDE

bzr revid: aag@tinyerp.co.in-20110304113327-wviumoee6o7n3n0u
---
 openerp/addons/base/module/wizard/base_module_configuration.py | 2 +-
 openerp/addons/base/res/res_config.py                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/module/wizard/base_module_configuration.py b/openerp/addons/base/module/wizard/base_module_configuration.py
index 866b22905e0..e4da656d646 100644
--- a/openerp/addons/base/module/wizard/base_module_configuration.py
+++ b/openerp/addons/base/module/wizard/base_module_configuration.py
@@ -27,7 +27,7 @@ class base_module_configuration(osv.osv_memory):
     _name = "base.module.configuration"
 
     def start(self, cr, uid, ids, context=None):
-        todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, ['|', '|', ('restart','=','always'), ('state', '=', 'open'), '&', ('state', '=', 'skip'), ('restart', '=', 'onskip')])
+        todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, ['|', '|', ('restart','=','always'), ('state', '=', 'open'), '&', ('state', '=', 'skip'), ('restart', '=', 'on_trigger')])
         if not todo_ids:
             # When there is no wizard todo it will display message
             data_obj = self.pool.get('ir.model.data')
diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 2f0b5c44509..748405b8473 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -120,7 +120,7 @@ class res_config_configurable(osv.osv_memory):
     def start(self, cr, uid, ids, context=None):
         ids2 = self.pool.get('ir.actions.todo').search(cr, uid, [], context=context)
         for todo in self.pool.get('ir.actions.todo').browse(cr, uid, ids2, context=context):
-            if (todo.restart=='always') or (todo.restart=='on_trigger' and (todo.state in ('skip','cancel'))):
+            if (todo.restart=='always'):
                 todo.write({'state':'open'})
         return self.next(cr, uid, ids, context)
 

From 189917c479dcaf7b218e5b4c980521ebc7bc8644 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 15 Mar 2011 18:04:44 +0530
Subject: [PATCH 06/18] [FIX]: Fixed direct use of userID 1 in xml, used
 context on creation of group

bzr revid: rpa@tinyerp.com-20110315123444-ihprzymdmcmwhxuy
---
 openerp/addons/base/security/base_security.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index 3b699f6686e..41d98fe4bb4 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -29,17 +29,13 @@
         <field name="name">Useability / No One</field>
     </record>
 
-    <record id="group_sale_manager" model="res.groups">
+    <record id="group_sale_manager" context="{'noadmin':True}" model="res.groups">
         <field name="name">Sales / Manager</field>
     </record>
-    <record id="group_sale_salesman" model="res.groups">
+    <record id="group_sale_salesman" context="{'noadmin':True}" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
-    
-    <record id="group_sale_salesman" model="res.groups">
-        <field eval="[(3,1)]" name="users"/>
-    </record>
-    
+
     <!-- Set accesses to menu -->
     <record model="ir.ui.menu" id="base.menu_administration">
         <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>

From 4b3c2c7514a24b73991cc4949d36906c035ed4fc Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 16 Mar 2011 17:34:44 +0530
Subject: [PATCH 07/18] [IMP]: res_config: Improvement for the main
 application: like HR, we want them to be able to re-thick an installed
 application but in HRs configuration, if hr_holidays is already installed,
 the boolean "holidays management" should be thick and readonly

bzr revid: rpa@tinyerp.com-20110316120444-vqllngptthlfmeo5
---
 openerp/addons/base/res/res_config.py | 29 +++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 748405b8473..e9d7867237b 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -355,6 +355,35 @@ class res_config_installer(osv.osv_memory):
         return (base | hooks_results | additionals) - set(
             map(attrgetter('name'), self._already_installed(cr, uid, context)))
 
+    def default_get(self, cr, uid, fields_list, context=None):
+        ''' If an addon is already installed, check it by default
+        '''
+        defaults = super(res_config_installer, self).default_get(
+            cr, uid, fields_list, context=context)
+
+        return dict(defaults,
+                    **dict.fromkeys(
+                        map(attrgetter('name'),
+                            self._already_installed(cr, uid, context=context)),
+                        True))
+
+    def fields_get(self, cr, uid, fields=None, context=None, write_access=True):
+        """ If an addon is already installed, set it to readonly as
+        res.config.installer doesn't handle uninstallations of already
+        installed addons
+        """
+        fields = super(res_config_installer, self).fields_get(
+            cr, uid, fields, context, write_access)
+
+        for module in self._already_installed(cr, uid, context=context):
+            if module.name not in fields:
+                continue
+            fields[module.name].update(
+                readonly=True,
+                help= ustr(fields[module.name].get('help', '')) +
+                     _('\n\nThis addon is already installed on your system'))
+        return fields
+
     def execute(self, cr, uid, ids, context=None):
         modules = self.pool.get('ir.module.module')
         to_install = list(self.modules_to_install(

From 0c6da1259cd3caf1492c2c686c2cc31d5f609a72 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 16 Mar 2011 19:09:01 +0530
Subject: [PATCH 08/18] [IMP]: Minor usability improvement

bzr revid: rpa@tinyerp.com-20110316133901-hcset7z5obd2793n
---
 openerp/addons/base/module/module_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 5e9bb539de1..3c77d9cce06 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -153,9 +153,9 @@
                     <field name="installed_version"/>
                     <field name="latest_version"/>
                     <field name="state"/>
-                    <button name="button_install" states="uninstalled" string="Schedule for Installation" icon="terp-gtk-jump-to-ltr" type="object"/>
+                    <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object"/>
                     <button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
-                    <button name="button_upgrade" states="installed" string="Schedule Upgrade" icon="terp-gtk-go-back-rtl" type="object"/>
+                    <button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object"/>
                     <button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"/>
                     <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
                     <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" icon="gtk-cancel" type="object"/>

From 2a718069d6dbf35a9f0d334fc4bf4171b297ec6f Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 18 Mar 2011 18:08:52 +0530
Subject: [PATCH 09/18] [IMP]: Improvement in module install/uninstall/upgrade
 so after this updates we will have a better dialog box to see the changes
 applied

bzr revid: rpa@tinyerp.com-20110318123852-vzifr66nmq3tk4tl
---
 openerp/addons/base/base_update.xml           |  2 +-
 openerp/addons/base/module/module.py          | 16 ++++---
 .../base/module/wizard/base_module_upgrade.py | 45 ++++---------------
 .../wizard/base_module_upgrade_view.xml       | 36 ++++++++++++---
 4 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 7432018fd94..3121bc56e86 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -354,7 +354,7 @@
         </record>
         <record id="config_wizard_simple_view" model="ir.actions.todo">
             <field name="action_id" ref="action_config_simple_view_form"/>
-            <field name="restart">always</field>
+            <field name="restart">never</field>
             <field name="sequence">1</field>
         </record>
     </data>
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 26558900a44..d613cd6fa28 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -286,7 +286,7 @@ class module(osv.osv):
             demo = demo or mdemo
         return demo
 
-    def upgrade(self, cr, uid, ids, context=None):
+    def apply_upgrade(self, cr, uid, ids, mode='install', context=None):
         mod_obj = self.pool.get('ir.module.module')
         ids = mod_obj.search(cr, uid, [('state', 'in', ['to upgrade', 'to remove', 'to install'])])
         unmet_packages = []
@@ -303,7 +303,11 @@ class module(osv.osv):
         _db, pool = pooler.restart_pool(cr.dbname, update_module=True)
         
         data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_upgrade_install')
+        if ids:
+            view_name = 'view_base_module_upgrade_install'
+        else:
+            view_name = 'view_base_module_upgrade'
+        id2 = data_obj._get_id(cr, uid, 'base', view_name)
         if id2:
             id2 = data_obj.browse(cr, uid, id2, context=context).res_id
         return {
@@ -315,11 +319,12 @@ class module(osv.osv):
                 'type': 'ir.actions.act_window',
                 'target': 'new',
                 'nodestroy':True,
+                'context': {'modules': ids, 'mode': mode}
             }
 
     def button_install(self, cr, uid, ids, context=None):
         self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
-        res = self.upgrade(cr, uid, ids, context=context)
+        res = self.apply_upgrade(cr, uid, ids, mode='install', context=context)
         return res
 
 
@@ -342,8 +347,7 @@ class module(osv.osv):
                 raise orm.except_orm(_('Error'), _('Some installed modules depend on the module you plan to Uninstall :\n %s') % '\n'.join(map(lambda x: '\t%s: %s' % (x[0], x[1]), res)))
 
         self.write(cr, uid, ids, {'state': 'to remove'})
-        self.upgrade(cr, uid, ids, context=context)
-        return True
+        return self.apply_upgrade(cr, uid, ids, mode='uninstall', context=context)
 
     def button_uninstall_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'installed'})
@@ -368,7 +372,7 @@ class module(osv.osv):
                 if dep.state == 'installed':
                     ids2 = self.search(cr, uid, [('name','=',dep.name)])
                     to_install.extend(ids2)
-        res = self.upgrade(cr, uid, ids, context=context)
+        res = self.apply_upgrade(cr, uid, ids, mode='upgrade', context=context)
         return res
 
     def button_upgrade_cancel(self, cr, uid, ids, context=None):
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index e1ba1644387..d151064891e 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -32,39 +32,6 @@ class base_module_upgrade(osv.osv_memory):
         'module_info': fields.text('Modules to update',readonly=True),
     }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        """ Changes the view dynamically
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param context: A standard dictionary
-         @return: New arch of view.
-        """
-        res = super(base_module_upgrade, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        record_id = context and context.get('active_id', False) or False
-        active_model = context.get('active_model')
-        if (not record_id) or (not active_model):
-            return res
-
-        ids = self.get_module_list(cr, uid, context=context)
-        if not ids:
-            res['arch'] = '''<form string="Apply Scheduled Upgrades">
-                                <separator string="System update completed" colspan="4"/>
-                                <label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
-                                <label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
-                                 <separator string="" colspan="4"/>
-                                <newline/>
-                                <button special="cancel" string="Close" icon="gtk-cancel"/>
-                                <button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
-                             </form>'''
-
-        return res
-
-    def get_module_list(self, cr, uid, context=None):
-        mod_obj = self.pool.get('ir.module.module')
-        ids = mod_obj.search(cr, uid, [
-            ('state', 'in', ['to upgrade', 'to remove', 'to install'])])
-        return ids
 
     def default_get(self, cr, uid, fields, context=None):
         """
@@ -76,9 +43,15 @@ class base_module_upgrade(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         """
         mod_obj = self.pool.get('ir.module.module')
-        ids = self.get_module_list(cr, uid, context=context)
-        res = mod_obj.read(cr, uid, ids, ['name','state'], context)
-        return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+x['state'], res))}
+        ids = context.get('modules', [])
+        mode = context.get('mode', 'install')
+        mode_string = {
+                'install': 'Installed',
+                'upgrade': 'Upgraded',
+                'uninstall': 'Uninstalled'
+            }
+        res = mod_obj.read(cr, uid, ids, ['name'], context)
+        return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+ mode_string[mode], res))}
 
 
     def config(self, cr, uid, ids, context=None):
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index 146fafed12f..91803f37ec8 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -36,18 +36,40 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-            <form string="Apply Scheduled Upgrades">
-            <separator string="System update completed" colspan="4"/>
-            <label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
-            <label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
-             <separator string="" colspan="4"/>
+            <form string="System update message">
+                <separator string="System update completed" colspan="4"/>
+                <label align="0.0" string="Update Processed. Please note that if you were installing a module with dependencies on uninstalled modules, those module have been installed too." colspan="4"/>
+                <label align="0.0" string="You'll find hereunder the list of modifications done in your database." colspan="4"/>
+                <field name="module_info" nolabel="1" colspan="4"/>
+                <label align="0.0" string="We suggest you to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
+                <separator string="" colspan="4"/>
                 <newline/>
-                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
+                <label string=""/>
+                <button special="cancel" string="_Ok" icon="gtk-ok"/>
              </form>
             </field>
         </record>
 
+       <record id="view_base_module_upgrade" model="ir.ui.view">
+            <field name="name">Module Upgrade Install</field>
+            <field name="model">base.module.upgrade</field>
+            <field name="type">form</field>
+            <field name="priority" eval="20"/>
+            <field name="arch" type="xml">
+            <form string="System update message">
+                <separator string="System update completed" colspan="4"/>
+                <label align="0.0" string="Update Processed. Please note that if you were installing a module with dependencies on uninstalled modules, those module have been installed too." colspan="4"/>
+                <label align="0.0" string="You'll find hereunder the list of modifications done in your database." colspan="4"/>
+                <label align="0.0" string="We suggest you to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
+                <separator string="" colspan="4"/>
+                <newline/>
+                <label string=""/>
+                <button special="cancel" string="_Ok" icon="gtk-ok"/>
+             </form>
+            </field>
+        </record>
+
+        <!-- Check if its really used somewhere or not -->
         <record id="action_view_base_module_upgrade_install" model="ir.actions.act_window">
             <field name="name">Module Upgrade Install</field>
             <field name="type">ir.actions.act_window</field>

From a384b6c1374351fe0af5b5226cf4f1914923cfc9 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 23 Mar 2011 17:41:10 +0530
Subject: [PATCH 10/18] [REVERT]: Applied reverse changes for revno:3364

bzr revid: rpa@tinyerp.com-20110323121110-ji6ir01aemzrqru4
---
 openerp/addons/base/base_update.xml           |  2 +-
 openerp/addons/base/module/module.py          | 16 +++----
 .../base/module/wizard/base_module_upgrade.py | 45 +++++++++++++++----
 .../wizard/base_module_upgrade_view.xml       | 36 +++------------
 4 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 3121bc56e86..7432018fd94 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -354,7 +354,7 @@
         </record>
         <record id="config_wizard_simple_view" model="ir.actions.todo">
             <field name="action_id" ref="action_config_simple_view_form"/>
-            <field name="restart">never</field>
+            <field name="restart">always</field>
             <field name="sequence">1</field>
         </record>
     </data>
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index d613cd6fa28..26558900a44 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -286,7 +286,7 @@ class module(osv.osv):
             demo = demo or mdemo
         return demo
 
-    def apply_upgrade(self, cr, uid, ids, mode='install', context=None):
+    def upgrade(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.module.module')
         ids = mod_obj.search(cr, uid, [('state', 'in', ['to upgrade', 'to remove', 'to install'])])
         unmet_packages = []
@@ -303,11 +303,7 @@ class module(osv.osv):
         _db, pool = pooler.restart_pool(cr.dbname, update_module=True)
         
         data_obj = self.pool.get('ir.model.data')
-        if ids:
-            view_name = 'view_base_module_upgrade_install'
-        else:
-            view_name = 'view_base_module_upgrade'
-        id2 = data_obj._get_id(cr, uid, 'base', view_name)
+        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_upgrade_install')
         if id2:
             id2 = data_obj.browse(cr, uid, id2, context=context).res_id
         return {
@@ -319,12 +315,11 @@ class module(osv.osv):
                 'type': 'ir.actions.act_window',
                 'target': 'new',
                 'nodestroy':True,
-                'context': {'modules': ids, 'mode': mode}
             }
 
     def button_install(self, cr, uid, ids, context=None):
         self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
-        res = self.apply_upgrade(cr, uid, ids, mode='install', context=context)
+        res = self.upgrade(cr, uid, ids, context=context)
         return res
 
 
@@ -347,7 +342,8 @@ class module(osv.osv):
                 raise orm.except_orm(_('Error'), _('Some installed modules depend on the module you plan to Uninstall :\n %s') % '\n'.join(map(lambda x: '\t%s: %s' % (x[0], x[1]), res)))
 
         self.write(cr, uid, ids, {'state': 'to remove'})
-        return self.apply_upgrade(cr, uid, ids, mode='uninstall', context=context)
+        self.upgrade(cr, uid, ids, context=context)
+        return True
 
     def button_uninstall_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'installed'})
@@ -372,7 +368,7 @@ class module(osv.osv):
                 if dep.state == 'installed':
                     ids2 = self.search(cr, uid, [('name','=',dep.name)])
                     to_install.extend(ids2)
-        res = self.apply_upgrade(cr, uid, ids, mode='upgrade', context=context)
+        res = self.upgrade(cr, uid, ids, context=context)
         return res
 
     def button_upgrade_cancel(self, cr, uid, ids, context=None):
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index d151064891e..e1ba1644387 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -32,6 +32,39 @@ class base_module_upgrade(osv.osv_memory):
         'module_info': fields.text('Modules to update',readonly=True),
     }
 
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """ Changes the view dynamically
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return: New arch of view.
+        """
+        res = super(base_module_upgrade, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        record_id = context and context.get('active_id', False) or False
+        active_model = context.get('active_model')
+        if (not record_id) or (not active_model):
+            return res
+
+        ids = self.get_module_list(cr, uid, context=context)
+        if not ids:
+            res['arch'] = '''<form string="Apply Scheduled Upgrades">
+                                <separator string="System update completed" colspan="4"/>
+                                <label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
+                                <label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
+                                 <separator string="" colspan="4"/>
+                                <newline/>
+                                <button special="cancel" string="Close" icon="gtk-cancel"/>
+                                <button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
+                             </form>'''
+
+        return res
+
+    def get_module_list(self, cr, uid, context=None):
+        mod_obj = self.pool.get('ir.module.module')
+        ids = mod_obj.search(cr, uid, [
+            ('state', 'in', ['to upgrade', 'to remove', 'to install'])])
+        return ids
 
     def default_get(self, cr, uid, fields, context=None):
         """
@@ -43,15 +76,9 @@ class base_module_upgrade(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         """
         mod_obj = self.pool.get('ir.module.module')
-        ids = context.get('modules', [])
-        mode = context.get('mode', 'install')
-        mode_string = {
-                'install': 'Installed',
-                'upgrade': 'Upgraded',
-                'uninstall': 'Uninstalled'
-            }
-        res = mod_obj.read(cr, uid, ids, ['name'], context)
-        return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+ mode_string[mode], res))}
+        ids = self.get_module_list(cr, uid, context=context)
+        res = mod_obj.read(cr, uid, ids, ['name','state'], context)
+        return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+x['state'], res))}
 
 
     def config(self, cr, uid, ids, context=None):
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index 91803f37ec8..146fafed12f 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -36,40 +36,18 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-            <form string="System update message">
-                <separator string="System update completed" colspan="4"/>
-                <label align="0.0" string="Update Processed. Please note that if you were installing a module with dependencies on uninstalled modules, those module have been installed too." colspan="4"/>
-                <label align="0.0" string="You'll find hereunder the list of modifications done in your database." colspan="4"/>
-                <field name="module_info" nolabel="1" colspan="4"/>
-                <label align="0.0" string="We suggest you to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
-                <separator string="" colspan="4"/>
+            <form string="Apply Scheduled Upgrades">
+            <separator string="System update completed" colspan="4"/>
+            <label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
+            <label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
+             <separator string="" colspan="4"/>
                 <newline/>
-                <label string=""/>
-                <button special="cancel" string="_Ok" icon="gtk-ok"/>
+                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
              </form>
             </field>
         </record>
 
-       <record id="view_base_module_upgrade" model="ir.ui.view">
-            <field name="name">Module Upgrade Install</field>
-            <field name="model">base.module.upgrade</field>
-            <field name="type">form</field>
-            <field name="priority" eval="20"/>
-            <field name="arch" type="xml">
-            <form string="System update message">
-                <separator string="System update completed" colspan="4"/>
-                <label align="0.0" string="Update Processed. Please note that if you were installing a module with dependencies on uninstalled modules, those module have been installed too." colspan="4"/>
-                <label align="0.0" string="You'll find hereunder the list of modifications done in your database." colspan="4"/>
-                <label align="0.0" string="We suggest you to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
-                <separator string="" colspan="4"/>
-                <newline/>
-                <label string=""/>
-                <button special="cancel" string="_Ok" icon="gtk-ok"/>
-             </form>
-            </field>
-        </record>
-
-        <!-- Check if its really used somewhere or not -->
         <record id="action_view_base_module_upgrade_install" model="ir.actions.act_window">
             <field name="name">Module Upgrade Install</field>
             <field name="type">ir.actions.act_window</field>

From 62cb6ff7cc4b10d17c7dca79ba593aaaa4aafbc0 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 23 Mar 2011 17:42:04 +0530
Subject: [PATCH 11/18] [REVERT]: Applied reverse changes for revno:3358

bzr revid: rpa@tinyerp.com-20110323121204-58g0hzqg5gz7f9yg
---
 openerp/addons/base/module/module.py          | 61 ++++++-------------
 openerp/addons/base/module/module_view.xml    |  2 +-
 .../base/module/wizard/base_module_upgrade.py | 31 ++++++++++
 .../wizard/base_module_upgrade_view.xml       | 14 ++++-
 4 files changed, 62 insertions(+), 46 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 26558900a44..2e276433e63 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -200,7 +200,6 @@ class module(osv.osv):
 
     def _name_uniq_msg(self, cr, uid, ids, context=None):
         return _('The name of the module must be unique !')
-
     def _certificate_uniq_msg(self, cr, uid, ids, context=None):
         return _('The certificate ID of the module must be unique !')
 
@@ -286,42 +285,8 @@ class module(osv.osv):
             demo = demo or mdemo
         return demo
 
-    def upgrade(self, cr, uid, ids, context=None):
-        mod_obj = self.pool.get('ir.module.module')
-        ids = mod_obj.search(cr, uid, [('state', 'in', ['to upgrade', 'to remove', 'to install'])])
-        unmet_packages = []
-        mod_dep_obj = self.pool.get('ir.module.module.dependency')
-        for mod in mod_obj.browse(cr, uid, ids, context=context):
-            depends_mod_ids = mod_dep_obj.search(cr, uid, [('module_id', '=', mod.id)], context=context)
-            for dep_mod in mod_dep_obj.browse(cr, uid, depends_mod_ids):
-                if dep_mod.state in ('unknown','uninstalled'):
-                    unmet_packages.append(dep_mod.name)
-        if len(unmet_packages):
-            raise osv.except_osv(_('Unmet dependency !'), _('Following modules are not installed or unknown: %s') % ('\n\n' + '\n'.join(unmet_packages)))
-        mod_obj.download(cr, uid, ids, context=context)
-        cr.commit()
-        _db, pool = pooler.restart_pool(cr.dbname, update_module=True)
-        
-        data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_upgrade_install')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        return {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'base.module.upgrade',
-                'views': [(id2, 'form')],
-                'view_id': False,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy':True,
-            }
-
     def button_install(self, cr, uid, ids, context=None):
-        self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
-        res = self.upgrade(cr, uid, ids, context=context)
-        return res
-
+        return self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
 
     def button_install_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'uninstalled', 'demo':False})
@@ -340,41 +305,49 @@ class module(osv.osv):
             res = cr.fetchall()
             if res:
                 raise orm.except_orm(_('Error'), _('Some installed modules depend on the module you plan to Uninstall :\n %s') % '\n'.join(map(lambda x: '\t%s: %s' % (x[0], x[1]), res)))
-
         self.write(cr, uid, ids, {'state': 'to remove'})
-        self.upgrade(cr, uid, ids, context=context)
         return True
 
     def button_uninstall_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'installed'})
         return True
 
-
     def button_upgrade(self, cr, uid, ids, context=None):
         depobj = self.pool.get('ir.module.module.dependency')
         todo = self.browse(cr, uid, ids, context=context)
         self.update_list(cr, uid)
+
         i = 0
         while i<len(todo):
             mod = todo[i]
             i += 1
+            if mod.state not in ('installed','to upgrade'):
+                raise orm.except_orm(_('Error'),
+                        _("Can not upgrade module '%s'. It is not installed.") % (mod.name,))
+            self.check_external_dependencies(mod.name, 'to upgrade')
+            iids = depobj.search(cr, uid, [('name', '=', mod.name)], context=context)
+            for dep in depobj.browse(cr, uid, iids, context=context):
+                if dep.module_id.state=='installed' and dep.module_id not in todo:
+                    todo.append(dep.module_id)
+
         ids = map(lambda x: x.id, todo)
         self.write(cr, uid, ids, {'state':'to upgrade'}, context=context)
+
         to_install = []
         for mod in todo:
             for dep in mod.dependencies_id:
                 if dep.state == 'unknown':
                     raise orm.except_orm(_('Error'), _('You try to upgrade a module that depends on the module: %s.\nBut this module is not available in your system.') % (dep.name,))
-                if dep.state == 'installed':
+                if dep.state == 'uninstalled':
                     ids2 = self.search(cr, uid, [('name','=',dep.name)])
                     to_install.extend(ids2)
-        res = self.upgrade(cr, uid, ids, context=context)
-        return res
+
+        self.button_install(cr, uid, to_install, context=context)
+        return True
 
     def button_upgrade_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'installed'})
         return True
-
     def button_update_translations(self, cr, uid, ids, context=None):
         self.update_translations(cr, uid, ids)
         return True
@@ -410,7 +383,7 @@ class module(osv.osv):
                 updated_values = {}
                 for key in values:
                     old = getattr(mod, key)
-                    updated = isinstance(values[key], basestring) and tools.ustr(values[key]) or values[key]
+                    updated = isinstance(values[key], basestring) and tools.ustr(values[key]) or values[key] 
                     if not old == updated:
                         updated_values[key] = values[key]
                 if terp.get('installable', True) and mod.state == 'uninstallable':
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 3c77d9cce06..3fc48969953 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -112,7 +112,7 @@
                             <newline/>
                             <field name="state" readonly="1" select="1"/>
                             <group col="6" colspan="2">
-                                <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object"/>
+                                <button name="button_install" states="uninstalled" string="Schedule for Installation" icon="terp-gtk-jump-to-ltr" type="object"/>
                                 <button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
                                 <button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"/>
                                 <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index e1ba1644387..ca82cfb20d2 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import pooler
 from osv import osv, fields
 from tools.translate import _
 
@@ -80,6 +81,36 @@ class base_module_upgrade(osv.osv_memory):
         res = mod_obj.read(cr, uid, ids, ['name','state'], context)
         return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+x['state'], res))}
 
+    def upgrade_module(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.module.module')
+        ids = mod_obj.search(cr, uid, [('state', 'in', ['to upgrade', 'to remove', 'to install'])])
+        unmet_packages = []
+        mod_dep_obj = self.pool.get('ir.module.module.dependency')
+        for mod in mod_obj.browse(cr, uid, ids):
+            depends_mod_ids = mod_dep_obj.search(cr, uid, [('module_id', '=', mod.id)])
+            for dep_mod in mod_dep_obj.browse(cr, uid, depends_mod_ids):
+                if dep_mod.state in ('unknown','uninstalled'):
+                    unmet_packages.append(dep_mod.name)
+        if len(unmet_packages):
+            raise osv.except_osv(_('Unmet dependency !'), _('Following modules are not installed or unknown: %s') % ('\n\n' + '\n'.join(unmet_packages)))
+        mod_obj.download(cr, uid, ids, context=context)
+        cr.commit()
+        _db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+
+        data_obj = pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_upgrade_install')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+
+        return {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'base.module.upgrade',
+                'views': [(id2, 'form')],
+                'view_id': False,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+            }
 
     def config(self, cr, uid, ids, context=None):
         return self.pool.get('res.config').next(cr, uid, [], context=context)
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index 146fafed12f..b8bb282d6ed 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -30,6 +30,18 @@
             <field name="target">new</field>
         </record>
 
+        <menuitem
+        name="Apply Scheduled Upgrades"
+        action="action_view_base_module_upgrade"
+        id="menu_view_base_module_upgrade"
+       parent="menu_management"
+       sequence="3"/>
+
+       <act_window id="action_view_base_module_upgrade_window"
+            key2="client_action_multi" name="Apply Scheduled Upgrades"
+            res_model="base.module.upgrade" src_model="ir.module.module"
+            view_mode="form" target="new" view_type="form" />
+
        <record id="view_base_module_upgrade_install" model="ir.ui.view">
             <field name="name">Module Upgrade Install</field>
             <field name="model">base.module.upgrade</field>
@@ -59,4 +71,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file

From df95b01bd5f263403143f1acbb9134327da46593 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 24 Mar 2011 15:13:05 +0530
Subject: [PATCH 12/18] [IMP] BASE: Now we can Inatall and Uninstall with only
 one Btn

bzr revid: aag@tinyerp.co.in-20110324094305-tls5c7bpn70a8cmd
---
 openerp/addons/base/module/module.py          | 22 +++++++++++++++++--
 openerp/addons/base/module/module_view.xml    |  2 +-
 .../wizard/base_module_upgrade_view.xml       |  5 -----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 2e276433e63..a5962c30c65 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -286,7 +286,17 @@ class module(osv.osv):
         return demo
 
     def button_install(self, cr, uid, ids, context=None):
-        return self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
+        self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
+        return {
+            'name': _('Install'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'base.module.upgrade',
+            'target': 'new',
+            'type': 'ir.actions.act_window',
+            'nodestroy':True,
+        }
+        
 
     def button_install_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'uninstalled', 'demo':False})
@@ -306,7 +316,15 @@ class module(osv.osv):
             if res:
                 raise orm.except_orm(_('Error'), _('Some installed modules depend on the module you plan to Uninstall :\n %s') % '\n'.join(map(lambda x: '\t%s: %s' % (x[0], x[1]), res)))
         self.write(cr, uid, ids, {'state': 'to remove'})
-        return True
+        return {
+            'name': _('Uninstall'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'base.module.upgrade',
+            'target': 'new',
+            'type': 'ir.actions.act_window',
+            'nodestroy':True,
+        }
 
     def button_uninstall_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'installed'})
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 16527641656..5e9bb539de1 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -112,7 +112,7 @@
                             <newline/>
                             <field name="state" readonly="1" select="1"/>
                             <group col="6" colspan="2">
-                                <button name="button_install" states="uninstalled" string="Schedule for Installation" icon="terp-gtk-jump-to-ltr" type="object"/>
+                                <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object"/>
                                 <button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
                                 <button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"/>
                                 <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index b8bb282d6ed..465b7526372 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -37,11 +37,6 @@
        parent="menu_management"
        sequence="3"/>
 
-       <act_window id="action_view_base_module_upgrade_window"
-            key2="client_action_multi" name="Apply Scheduled Upgrades"
-            res_model="base.module.upgrade" src_model="ir.module.module"
-            view_mode="form" target="new" view_type="form" />
-
        <record id="view_base_module_upgrade_install" model="ir.ui.view">
             <field name="name">Module Upgrade Install</field>
             <field name="model">base.module.upgrade</field>

From 5937bf5f1b0cdb0d0ece1da638cc225298f38081 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 28 Mar 2011 17:50:12 +0530
Subject: [PATCH 13/18] [IMP]server: Modification of Rework on 28 mar

bzr revid: aag@tinyerp.co.in-20110328122012-1eil91tbkm1av7db
---
 openerp/addons/base/module/module.py                  | 11 ++++++++++-
 openerp/addons/base/module/module_view.xml            |  2 +-
 .../base/module/wizard/base_module_upgrade_view.xml   |  5 +++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index a5962c30c65..aeb614dafaf 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -361,7 +361,16 @@ class module(osv.osv):
                     to_install.extend(ids2)
 
         self.button_install(cr, uid, to_install, context=context)
-        return True
+        return {
+            'name': _('Upgrade'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'base.module.upgrade',
+            'target': 'new',
+            'type': 'ir.actions.act_window',
+            'nodestroy':True,
+        }
+#        return True
 
     def button_upgrade_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'installed'})
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 5e9bb539de1..0391434a5fd 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -169,7 +169,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain"/>
             <field name="search_view_id" ref="view_module_filter"/>
-            <field name="help">You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Schedule for Installation" from the form view, then click on "Apply Scheduled Upgrades" to migrate your system.</field>
+            <field name="help">You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Install" from the form view to migrate your system.</field>
         </record>
         <menuitem action="open_module_tree" id="menu_module_tree" parent="base.menu_management"/>
 
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index 465b7526372..08638ac7fd0 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -36,6 +36,11 @@
         id="menu_view_base_module_upgrade"
        parent="menu_management"
        sequence="3"/>
+       
+       <act_window id="action_view_base_module_upgrade_window"
+            key2="client_action_multi" name="Apply Scheduled Upgrades"
+            res_model="base.module.upgrade" src_model="ir.module.module"
+            view_mode="form" target="new" view_type="form" />
 
        <record id="view_base_module_upgrade_install" model="ir.ui.view">
             <field name="name">Module Upgrade Install</field>

From a7e6873ec0cb72eecd3833ff0d51129a18d8ecbf Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 29 Mar 2011 13:22:57 +0530
Subject: [PATCH 14/18] [IMP]: TASK of REWORK- install Appl can install MOD

bzr revid: aag@tinyerp.co.in-20110329075257-s53u2vodvn2c3jid
---
 openerp/addons/base/module/module.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index aeb614dafaf..2d497ad7853 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -286,7 +286,9 @@ class module(osv.osv):
         return demo
 
     def button_install(self, cr, uid, ids, context=None):
+        upgrade_obj = self.pool.get('base.module.upgrade')
         self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
+        upgrade_obj.upgrade_module(cr, uid, ids, context=context)
         return {
             'name': _('Install'),
             'view_type': 'form',

From acfe39b3622b5526fe04f70d85d07438b77868ec Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 29 Mar 2011 14:46:47 +0530
Subject: [PATCH 15/18] [IMP]: TASK of REWORK- Remove Upgrade call

bzr revid: aag@tinyerp.co.in-20110329091647-lzs4ixakt6si816q
---
 openerp/addons/base/module/module.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 2d497ad7853..aeb614dafaf 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -286,9 +286,7 @@ class module(osv.osv):
         return demo
 
     def button_install(self, cr, uid, ids, context=None):
-        upgrade_obj = self.pool.get('base.module.upgrade')
         self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
-        upgrade_obj.upgrade_module(cr, uid, ids, context=context)
         return {
             'name': _('Install'),
             'view_type': 'form',

From 6298ed3d170cc0f296af6b46d9a4e0dc2cbc4d65 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 31 Mar 2011 13:08:07 +0530
Subject: [PATCH 16/18] [IMP]base:Optimize Help

bzr revid: aag@tinyerp.co.in-20110331073807-vmp2n00bo4czap3a
---
 openerp/addons/base/module/module_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 4e1f983411a..1683d2053b8 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -169,7 +169,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain"/>
             <field name="search_view_id" ref="view_module_filter"/>
-            <field name="help">You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Install" from the form view to migrate your system.</field>
+            <field name="help">You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Install" from the form view and then click on "Start Upgrade".</field>
         </record>
         <menuitem action="open_module_tree" id="menu_module_tree" parent="base.menu_management"/>
 

From 0274e67b66facae8b0d416c42285579e344cce60 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 31 Mar 2011 10:48:53 +0200
Subject: [PATCH 17/18] [IMP] base_update.xml: set restart=never and state=skip
 on the 'configure your interface' wizard

bzr revid: qdp-launchpad@openerp.com-20110331084853-d7hbgao5e242o23t
---
 openerp/addons/base/base_update.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 7432018fd94..9fdfff9c181 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -354,8 +354,9 @@
         </record>
         <record id="config_wizard_simple_view" model="ir.actions.todo">
             <field name="action_id" ref="action_config_simple_view_form"/>
-            <field name="restart">always</field>
+            <field name="restart">never</field>
             <field name="sequence">1</field>
+            <field name="state">skip</field>
         </record>
     </data>
 </openerp>

From ce2be4804520aac9f6df635d302a455f9d922fed Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 31 Mar 2011 15:07:52 +0530
Subject: [PATCH 18/18] [IMP]: base: "choose your view type" should not come
 for every re-launching of the configuration wizard

bzr revid: rpa@tinyerp.com-20110331093752-gn87diunh30m1diu
---
 openerp/addons/base/base_update.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 9fdfff9c181..914e3a9a488 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -354,7 +354,7 @@
         </record>
         <record id="config_wizard_simple_view" model="ir.actions.todo">
             <field name="action_id" ref="action_config_simple_view_form"/>
-            <field name="restart">never</field>
+            <field name="restart">on_trigger</field>
             <field name="sequence">1</field>
             <field name="state">skip</field>
         </record>