[MERGE] res_users rename companies tab into allowed companies

lp bug: https://launchpad.net/bugs/714471 fixed

bzr revid: al@openerp.com-20110919211048-riv3mdkowtnrn96a

diff --cc openerp/addons/base/base_update.xml
index b87c0ef,f3adbf4..4900c9b
--- 1/openerp/addons/base/base_update.xml
--- 2/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@@ -108,46 -106,47 +108,46 @@@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Users">
 -                    <field name="name" select="1"/>
 -                    <field name="active"/>
 -                    <field name="login" select="1"/>
 -                    <field name="new_password" password="True"/>
 -                    <newline/>
 +                    <group colspan="4" col="6">
 +                        <field name="name" select="1"/>
 +                        <field name="login" select="1"/>
 +                        <field name="id" invisible="1"/>
 +                        <field name="new_password" password="True" attrs="{'required': [('id','=',False)]}"/>
 +                        <field name="active"/>
 +                    </group>
                      <notebook colspan="4">
                          <page string="User">
 -                            <group colspan="1" col="2">
 -                                <separator string="Contact" colspan="2"/>
 -                                <field name="company_id" required="1"
 -                                    context="{'user_preference': 0}"
 -                                    groups="base.group_multi_company"
 -                                    />
 -                                <field name="address_id"/>
 -                                <field name="user_email" widget="email"/>
 -                            </group>
 -                            <group colspan="1" col="2" groups="base.group_extended">
 -                                <separator string="Action" colspan="2"/>
 -                                <field name="action_id"/>
 -                                <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
 -                            </group>
 -                            <group colspan="1" col="2">
 -                                <separator string="Preferences" colspan="2"/>
 -                                <field name="context_lang"/>
 -                                <field name="context_tz"/>
 -                                <group colspan="2" col="4">
 -                                     <field name="view" readonly="0"/>
 -                                     <field name="menu_tips" colspan="2"/>
 +                          <group colspan="4" col="6">
 +                            <!-- Second nested group to avoid misalignment with email prefs groups
 +                                 in simplified view -->
 +                            <group colspan="6" col="6">
 +                                <group col="2" colspan="2">
 +                                    <separator string="Preferences" colspan="2"/>
 +                                    <field name="context_lang"/>
 +                                    <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_extended">
 +                                    <separator string="Action" colspan="2"/>
 +                                    <field name="action_id"/>
 +                                    <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
                                  </group>
                              </group>
 -                            <newline/>
 -                            <group colspan="2" col="2">
 -                                <separator string="Signature" colspan="2"/>
 -                                <field colspan="2" name="signature" nolabel="1"/>
 -                            </group>
 -                            <group colspan="2" col="2" expand="1">
 -                                <separator string="Groups" colspan="2"/>
 -                                <field colspan="2" nolabel="1" name="groups_id"/>
 +                            <group colspan="6" col="2">
 +                                <separator string="Email Preferences" colspan="2"/>
 +                                <field name="user_email" widget="email"/>
 +                                <field name="signature"/>
                              </group>
 +                          </group>
 +                        </page>
 +                        <page string="Access Rights">
 +                            <field nolabel="1" name="groups_id"/>
                          </page>
-                         <page string="Companies" groups="base.group_multi_company">
+                         <page string="Allowed Companies" groups="base.group_multi_company">
                              <field colspan="4" nolabel="1" name="company_ids" select="1"/>
                          </page>
                      </notebook>