Raphael Collet (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-server/trunk-usability-user-prefs-rco into 
lp:~openerp-dev/openobject-server/trunk-usability-users.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-usability-user-prefs-rco/+merge/70172

New user preferences view.

-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-usability-user-prefs-rco/+merge/70172
Your team OpenERP R&D Team is requested to review the proposed merge of 
lp:~openerp-dev/openobject-server/trunk-usability-user-prefs-rco into 
lp:~openerp-dev/openobject-server/trunk-usability-users.
=== modified file 'openerp/addons/base/base_update.xml'
--- openerp/addons/base/base_update.xml	2011-07-06 12:55:41 +0000
+++ openerp/addons/base/base_update.xml	2011-08-02 14:39:06 +0000
@@ -77,25 +77,21 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Users">
-                    <notebook colspan="4">
-                        <page string="Current Activity">
-                            <field name="company_id" widget="selection" readonly="0"
-                                    groups="base.group_multi_company"
-                                    on_change="on_change_company_id(company_id)" />
-                            <field name="view" readonly="0"/>
-                            <label string="" colspan="2"/>
-                            <separator string="Default Filters" colspan="4"/>
-                            <newline/>
-                        </page>
-                         <page string="Preferences">
-                            <field name="context_lang" completion="1" readonly="0"/>
-                            <field name="context_tz" completion="1" readonly="0"/>
-                            <field name="menu_tips" colspan="2" readonly="0"/>
-                            <separator string="Email &amp; Signature" colspan="4"/>
-                            <group colspan="4"><field name="user_email" widget="email" readonly="0"/></group>
-                            <field colspan="4" name="signature" readonly="0" nolabel="1"/>
-                          </page>
-                    </notebook>
+                    <field name="name"/>
+                    <field name="company_id" widget="selection" readonly="0" groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
+                    <newline/>
+                    <group colspan="2" col="2">
+                        <separator string="Preferences" colspan="2"/>
+                        <field name="context_lang" completion="1" readonly="0"/>
+                        <field name="context_tz" completion="1" readonly="0"/>
+                        <field name="menu_tips" colspan="2" readonly="0"/>
+                    </group>
+                    <group name="default_filters" colspan="2" col="2">
+                        <separator string="Default Filters" colspan="2"/>
+                    </group>
+                    <separator string="Email &amp; Signature" colspan="2"/>
+                    <field colspan="4" name="user_email" widget="email" readonly="0"/>
+                    <field colspan="4" name="signature" readonly="0" nolabel="1"/>
                 </form>
             </field>
         </record>

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to