From f200f2902cf5361dfa067f4a5ae3b2045a3bd258 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 27 Jun 2012 11:54:17 +0530
Subject: [PATCH] [IMP]improve update and upgrade schedule update

bzr revid: sgo@tinyerp.com-20120627062417-kqqv3owmkkf4neh3
---
 .../module/wizard/base_module_update_view.xml | 42 +++++--------------
 .../wizard/base_module_upgrade_view.xml       |  4 +-
 2 files changed, 11 insertions(+), 35 deletions(-)

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 3b1852804e2..21081f4aa1d 100644
--- a/openerp/addons/base/module/wizard/base_module_update_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_update_view.xml
@@ -7,38 +7,16 @@
             <field name="model">base.module.update</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Update Module List">
-                    <group col="8">
-                        <group colspan="3">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="This wizard will scan all module repositories on the server side to detect newly added modules as well as any change to existing modules."/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="Please be patient, as this operation may take a few seconds..."/>
-                            <field name="state" invisible="1"/>
-                        </group>
-                        <separator orientation="vertical" rowspan="15"/>
-                        <group colspan="4">
-                            <separator string="Module Update Result" colspan="4"/>
-                            <group states="init" colspan="4">
-                                <label string="Click on Update below to start the process..." colspan="4"/>
-                            </group>
-                            <group states="done" colspan="4">
-                                <field name="update" colspan="4"/>
-                                <field name="add" colspan="4"/>
-                            </group>
-                        </group>
-                        <group colspan="8" col="8" states="init">
-                            <separator string="" colspan="8"/>
-                            <label colspan="6" width="220"/>
-                            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                            <button name="update_module" string="Update" type="object" icon="gtk-ok"/>
-                        </group>
-                        <group colspan="8" col="8" 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"/>
+                <form string="Update Module List" version="7.0">
+                    <field name="state" invisible="1"/>
+                    <header>
+                        <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"/>
+                    </header>
+                    <group>
+                        <group states="done" colspan="4">
+                            <field name="update" colspan="4"/>
+                            <field name="add" colspan="4"/>
                         </group>
                     </group>
                 </form>
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 3f5da77b96d..8c6bf0bdaac 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -12,8 +12,6 @@
                         <button name="upgrade_module" string="Update" type="object" icon="gtk-go-forward"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                     </header>
-                    <label string="Your system will be updated."/>
-                    <label string="Note that this operation might take a few minutes."/>
                     <separator string="Modules to Update"/>
                     <field name="module_info"/>
                 </form>
@@ -21,7 +19,7 @@
         </record>
 
         <record id="action_view_base_module_upgrade" model="ir.actions.act_window">
-            <field name="name">Module Upgrade</field>
+            <field name="name">Apply Scheduled Upgrade</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">base.module.upgrade</field>
             <field name="view_type">form</field>