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 1/4] [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 2/4] [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 3/4] [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 4/4] [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',