[MERGE] Merge with trunk

bzr revid: fme@openerp.com-20120430074644-b3fh4hmoef0t205p

diff --cc openerp/addons/base/base_update.xml
index 46217aa,fc3efe6..f6479e1
--- 1/openerp/addons/base/base_update.xml
--- 2/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@@ -70,16 -70,12 +70,15 @@@
              <field name="type">form</field>
              <field eval="18" name="priority"/>
              <field name="arch" type="xml">
 -                <form string="Users">
 -                    <field name="name" readonly="1"/>
 +                <form string="Users" layout="auto">
 +                    <div class="oe_form_title" colspan="4">
 +                        <field name="name" readonly="1" nolabel="1"/>
 +                        (<field name="login" readonly="1" nolabel="1"/>)
 +                    </div>
                      <newline/>
 -                    <group colspan="2" col="3">
 -                        <group col="2" colspan="2" name="preferences">
 +                    <group col="2" colspan="3">
 +                        <group col="2" colspan="2" name="preferences" class="oe_form_group_label_border">
                              <separator string="Preferences" colspan="2"/>
-                             <field name="view" readonly="0"/>
                              <field name="context_lang" readonly="0"/>
                              <field name="context_tz" readonly="0"/>
                              <field name="menu_tips" readonly="0" groups="base.group_no_one"/>
@@@ -126,24 -126,17 +125,24 @@@
                                          <field name="context_tz"/>
                                          <field name="menu_tips"/>
                                      </group>
 -                                    <group name="default_filters" colspan="2" col="2">
 -                                        <separator string="Default Filters" colspan="2"/>
 -                                        <field name="company_id" required="1" context="{'user_preference': 0}" groups="base.group_multi_company"/>
 -                                    </group>
 -                                    <group colspan="2" col="2" groups="base.group_no_one">
 -                                        <separator string="Action" colspan="2"/>
 -                                        <field name="action_id"/>
 -                                        <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
 +                                    <group col="1">
-                                         <group col="2" groups="base.group_extended" class="oe_form_group_label_border">
++                                        <group col="2" groups="base.group_no_one" class="oe_form_group_label_border">
 +                                            <separator string="Action" colspan="2"/>
 +                                            <field name="action_id"/>
 +                                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
 +                                        </group>
 +                                        <group name="default_filters" col="2" class="oe_form_group_label_border">
 +                                            <separator string="Default Filters" colspan="2"/>
 +                                            <field name="company_id" required="1" context="{'user_preference': 0}" groups="base.group_multi_company"/>
 +                                        </group>
                                      </group>
                                  </group>
 -                                <group colspan="7" col="2">
 +                                <group col="1" name="avatar" class="oe_form_group_label_border">
 +                                    <separator string="Avatar"/>
 +                                    <field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)"/>
 +                                </group>
 +
 +                                <group colspan="4" col="2" class="oe_form_group_label_border">
                                      <separator string="Email Preferences" colspan="2"/>
                                      <field name="user_email" widget="email"/>
                                      <field name="signature"/>