From 7d521074d6d2ed4f4c648271caa3808ea23b1f37 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 28 Jun 2012 18:09:36 +0530
Subject: [PATCH] [IMP]base: View IMp

bzr revid: dbr@tinyerp.com-20120628123936-rwdkmdds22yke8vh
---
 openerp/addons/base/module/module.py                |  2 +-
 .../base/module/wizard/base_module_update_view.xml  | 13 ++++++++++---
 .../base/module/wizard/base_module_upgrade.py       |  6 ++----
 .../base/module/wizard/base_module_upgrade_view.xml |  3 +--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index d75f330afa2..260453628fb 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -453,7 +453,7 @@ class module(osv.osv):
                     to_install.extend(ids2)
 
         self.button_install(cr, uid, to_install, context=context)
-        return dict(ACTION_DICT, name=_('Upgrade'))
+        return dict(ACTION_DICT, name=_('Apply Shcedule Upgrade'))
 
     def button_upgrade_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'installed'})
diff --git a/openerp/addons/base/module/wizard/base_module_update_view.xml b/openerp/addons/base/module/wizard/base_module_update_view.xml
index d3d8ff73d87..f8b046f2434 100644
--- a/openerp/addons/base/module/wizard/base_module_update_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_update_view.xml
@@ -9,10 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Update Module List" version="7.0">
                     <field name="state" invisible="1"/>
-                    <header>
+                    <header states="init">
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="update_module" states="init" string="Update" type="object" icon="gtk-ok"/>
-                        <button name="action_module_open" states="done" string="Open Modules" type="object" icon="gtk-go-forward"/>
+                        <button name="update_module" string="Update" type="object" icon="gtk-ok"/>
                     </header>
                     <group>
                         <group states="done" colspan="4">
@@ -20,6 +19,14 @@
                             <field name="add" colspan="4"/>
                         </group>
                     </group>
+                    <group>
+                        <group states="done">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Close" icon="gtk-ok"/>
+                            <button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index 78fc8a5d398..a0397aa050d 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -46,14 +46,12 @@ class base_module_upgrade(osv.osv_memory):
 
         ids = self.get_module_list(cr, uid, context=context)
         if not ids:
-            res['arch'] = '''<form string="Apply Scheduled Upgrades" version="7.0">
+            res['arch'] = '''<form string="Apply Shcedule Upgrade" version="7.0">
                                 <header>
                                     <button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
                                     <button special="cancel" string="Close" icon="gtk-cancel"/>
                                 </header>
-                                <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="Apply Shcedule Upgrade" colspan="4"/>
                              </form>'''
 
         return res
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 69ed12df9c1..387a3d4bf66 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -12,14 +12,13 @@
                         <button name="upgrade_module" string="Update" type="object" icon="gtk-go-forward"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                     </header>
-                    <separator string="Modules to Update"/>
                     <field name="module_info"/>
                 </form>
             </field>
         </record>
 
         <record id="action_view_base_module_upgrade" model="ir.actions.act_window">
-            <field name="name">Apply Shcedule Upgrade</field>
+            <field name="name">Module Upgrade</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">base.module.upgrade</field>
             <field name="view_type">form</field>