From defc239d9537cef4099dcf0a6af0474a3d5358e8 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 26 Jun 2012 16:58:01 +0530
Subject: [PATCH 1/5] [IMP] remove the title "Change my Preferences" And
 rearrenge fields in preferences

bzr revid: fka@tinyerp.com-20120626112801-zw3n8auufwky5a3x
---
 openerp/addons/base/res/res_users_view.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 82093dadd4b..44e7e77c476 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -202,15 +202,15 @@
                         <h1>
                             <field name="name" readonly="1" class="oe_edit_only"/>
                             (<field name="login" readonly="1" class="oe_edit_only"/>)
-                        </h1>
+                        </h1> 
+                    </div>
+                    <group col="4" string="Preferences">
+                        <field name="context_lang" readonly="0"/>
                         <label for="company_id" class="oe_edit_only"/>
                         <h2>
                             <field name="company_id" widget="selection" readonly="0"
                                 groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                         </h2>
-                    </div>
-                    <group col="4" string="Preferences">
-                        <field name="context_lang" readonly="0"/>
                         <field name="context_tz" readonly="0"/>
                     </group>
                     <group string="Email Preferences">
@@ -222,7 +222,6 @@
             </field>
         </record>
         <record id="action_res_users_my" model="ir.actions.act_window">
-            <field name="name">Change My Preferences</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.users</field>
             <field name="view_type">form</field>

From a4995d990278432308668325cf6d250257bc1167 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 27 Jun 2012 17:23:20 +0530
Subject: [PATCH 2/5] [IMP] Add name in window

bzr revid: kjo@tinyerp.com-20120627115320-ip48sm1g564g6vir
---
 openerp/addons/base/res/res_users_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 44e7e77c476..edc680a1f22 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -222,6 +222,7 @@
             </field>
         </record>
         <record id="action_res_users_my" model="ir.actions.act_window">
+            <field name="name">Change My Preferences</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.users</field>
             <field name="view_type">form</field>

From a7df6d69e06bd9af556529b4d506197ecf14a860 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 27 Jun 2012 17:45:39 +0530
Subject: [PATCH 3/5] [IMP] remove the header tag in company field

bzr revid: kjo@tinyerp.com-20120627121539-h46t0kev48tg4fql
---
 openerp/addons/base/res/res_users_view.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index edc680a1f22..fcb7a5b1a56 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -206,11 +206,8 @@
                     </div>
                     <group col="4" string="Preferences">
                         <field name="context_lang" readonly="0"/>
-                        <label for="company_id" class="oe_edit_only"/>
-                        <h2>
-                            <field name="company_id" widget="selection" readonly="0"
-                                groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
-                        </h2>
+                        <field name="company_id" readonly="0"
+                            groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                         <field name="context_tz" readonly="0"/>
                     </group>
                     <group string="Email Preferences">

From 482b1ce9c6915a860e98d245a00f595c8bf3d340 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 27 Jun 2012 18:46:27 +0530
Subject: [PATCH 4/5] [IMP] set class oe_inline to name

bzr revid: kjo@tinyerp.com-20120627131627-1qki2cpf7unxu2ht
---
 openerp/addons/base/res/res_users_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index fcb7a5b1a56..38d7526d6aa 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -198,12 +198,10 @@
                     <div class="oe_right oe_avatar">
                         <field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
                     </div>
-                    <div class="oe_title">
-                        <h1>
-                            <field name="name" readonly="1" class="oe_edit_only"/>
-                            (<field name="login" readonly="1" class="oe_edit_only"/>)
-                        </h1> 
-                    </div>
+                    <h1>
+                            <field name="name" readonly="1" class="oe_inline oe_edit_only"/>
+                            (<field name="login" readonly="1" class="oe_inline oe_edit_only"/>)
+                    </h1>
                     <group col="4" string="Preferences">
                         <field name="context_lang" readonly="0"/>
                         <field name="company_id" readonly="0"

From 4851d7479b32c428750e76b814a7821be688515e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 4 Jul 2012 14:48:06 +0530
Subject: [PATCH 5/5] [IMP]res_user: remove group string

bzr revid: kjo@tinyerp.com-20120704091806-0ie4yp41hvkcn23b
---
 openerp/addons/base/res/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 38d7526d6aa..7997e476b02 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -202,7 +202,7 @@
                             <field name="name" readonly="1" class="oe_inline oe_edit_only"/>
                             (<field name="login" readonly="1" class="oe_inline oe_edit_only"/>)
                     </h1>
-                    <group col="4" string="Preferences">
+                    <group col="4">
                         <field name="context_lang" readonly="0"/>
                         <field name="company_id" readonly="0"
                             groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>