[IMP]

base_module_update_view.xml : Add cancel button
base_module_upgrade_view.xml : Remove tips and set popup into "Apply Shcedule Upgrade"
res_company_view.xml : set Preview Header/Footer,Set Bank Accounts buttons at proper place
res_users_view.xml : set company_ids as m2m_tags

bzr revid: dbr@tinyerp.com-20120628071837-kz215y56f5klbswn

4 files changed, 10 insertions, 11 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 21081f4aa1d..d3d8ff73d87 100644
--- a/openerp/addons/base/module/wizard/base_module_update_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_update_view.xml
@@ -10,6 +10,7 @@
                 <form string="Update Module List" version="7.0">
                     <field name="state" invisible="1"/>
                     <header>
+                        <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"/>
                     </header>
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 8c6bf0bdaac..69ed12df9c1 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -19,7 +19,7 @@
         </record>
 
         <record id="action_view_base_module_upgrade" model="ir.actions.act_window">
-            <field name="name">Apply Scheduled Upgrade</field>
+            <field name="name">Apply Shcedule Upgrade</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">base.module.upgrade</field>
             <field name="view_type">form</field>
@@ -41,13 +41,11 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Apply Scheduled Upgrades" version="7.0">
+                <form string="Apply Shcedule Upgrade" version="7.0">
                     <header>
                         <button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                     </header>
-                    <label string="The selected modules have been updated / installed !"/>
-                    <label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 5740042b160..dd3e29ba9c3 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -24,12 +24,12 @@
                     <div class="oe_right oe_avatar">
                         <field name="logo" nolabel="1" widget="image"/>
                     </div>
-                    <div class="oe_right oe_button_box">
-                        <button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print"/>
-                    </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
+                        <h1>
+                            <field name="name" class="oe_inline"/>
+                            <button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print" class="oe_inline"/>
+                        </h1>
                         <group col="4">
                             <field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
                             <field name="parent_id"  groups="base.group_multi_company"/>
@@ -66,8 +66,8 @@
                                 <field name="rml_footer1" groups="base.group_no_one"/>
                                 <label for="rml_footer2"/>
                                 <div>
-                                    <field name="rml_footer2"/>
-                                    <button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
+                                    <field name="rml_footer2" class="oe_inline"/>
+                                    <button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward" class="oe_inline"/>
                                 </div>
                             </group>
                         </page>
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 82093dadd4b..38c1cc748df 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -124,7 +124,7 @@
                                 </group>
                             </page>
                             <page string="Allowed Companies" groups="base.group_multi_company">
-                                <field name="company_ids"/>
+                                <field name="company_ids" widget="many2many_tags"/>
                             </page>
                         </notebook>
                     </sheet>