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] [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>