diff options
Diffstat (limited to 'bin/addons/base/base_update.xml')
| -rw-r--r-- | bin/addons/base/base_update.xml | 97 |
1 files changed, 61 insertions, 36 deletions
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml index e1f6519de20..2448306ad79 100644 --- a/bin/addons/base/base_update.xml +++ b/bin/addons/base/base_update.xml @@ -79,19 +79,22 @@ <notebook colspan="4"> <page string="Current Activity"> <field name="company_id" widget="selection" readonly="0" - context="{'user_id': self, 'user_preference': 1}"/> + context="{'user_id': self, 'user_preference': 1}" 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/> - <separator colspan="4" string="Preferences"/> </page> <page string="Preferences"> - <field name="password" password="True" readonly="0" colspan="4"/> + <field name="password" password="True" readonly="0" /> + <field name="context_lang" completion="1" readonly="0"/> <label string="" colspan="1"/> <label colspan="3" string="You must logout and login again after changing your password."/> - <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 & Signature" colspan="4"/> - <group colspan="4"><field name="user_email" widget="email"/></group> + <group colspan="4"><field name="user_email" widget="email" readonly="0"/></group> <field colspan="4" name="signature" readonly="0" nolabel="1"/> </page> </notebook> @@ -112,27 +115,40 @@ <newline/> <notebook colspan="4"> <page string="User"> - <field name="address_id" select="1"/> - <field name="user_email" widget="email"/> - <field name="company_id" required="1" context="{'user_id': self, 'user_preference': 1}"/> - <field name="action_id" required="True"/> - <field domain="[('usage','=','menu')]" name="menu_id" required="True"/> - <field name="context_lang"/> - <field name="context_tz"/> - <field name="view" readonly="0" /> + <group colspan="1" col="2"> + <separator string="Contact" colspan="2"/> + <field name="company_id" required="1" + context="{'user_id': self, 'user_preference': 1}" + 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> + </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="Access Rights (groups)" colspan="2"/> + <separator string="Groups" colspan="2"/> <field colspan="2" nolabel="1" name="groups_id"/> </group> </page> - <page string="Roles"> - <field colspan="4" nolabel="1" name="roles_id"/> - </page> - <page string="Companies"> + <page string="Companies" groups="base.group_multi_company"> <field colspan="4" nolabel="1" name="company_ids" select="1"/> </page> </notebook> @@ -147,8 +163,8 @@ <tree string="Users"> <field name="name"/> <field name="login"/> - <field name="address_id" string="Address" /> - <field name="company_id"/> + <field name="context_lang"/> + <field name="date"/> </tree> </field> </record> @@ -159,10 +175,10 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Users"> - <field name="name" select="1"/> - <field name="login" select="1"/> - <field name="address_id" select="1" string="Address"/> - <field name="company_ids" select="1" string="Company"/> + <field name="name"/> + <field name="login"/> + <field name="address_id" string="Address"/> + <field name="company_ids" string="Company" groups="base.group_multi_company"/> </search> </field> </record> @@ -179,7 +195,7 @@ <form string="Company"> <group colspan="4" col="6"> <field colspan="4" name="name" select="1"/> - <field name="partner_id" select="1"/> + <field name="partner_id" readonly="1" select="1" required="0"/> <field name="parent_id" select="1" groups="base.group_multi_company"/> </group> <notebook colspan="4"> @@ -195,7 +211,10 @@ <field colspan="4" name="rml_header" nolabel="1"/> </page> <page string="Internal Header/Footer" groups="base.group_extended"> - <field colspan="4" name="rml_header2" nolabel="1"/> + <separator string="Portrait" colspan="2"/> + <separator string="Landscape" colspan="2"/> + <field colspan="2" name="rml_header2" nolabel="1"/> + <field colspan="2" name="rml_header3" nolabel="1"/> </page> <page string="Configuration"> </page> @@ -226,9 +245,17 @@ <form position="attributes"> <attribute name="string">Create User</attribute> </form> - + <xpath expr='//separator[@string="title"]' position='attributes'> + <attribute name='string'>New User</attribute> + </xpath> + <xpath expr="//label[@string='description']" + position="attributes"> + <attribute name="string">Create additional users and assign them groups that will allow them to have access to selected functionalities within the system. Click on 'Done' if you do not wish to add more users at this stage, you can always do this later.</attribute> + </xpath> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + </xpath> <group string="res_config_contents" position="replace"> - <separator string="New User" colspan="4"/> <field name="name"/> <field name="email"/> <field name="login"/> @@ -281,21 +308,21 @@ </record> <record id="view_confirm_simple_view_form" model="ir.ui.view"> - <field name="name">res.users.confirm.simple_view</field> + <field name="name">Configure Your Interface</field> <field name="model">res.config.view</field> <field name="type">form</field> <field name="inherit_id" ref="res_config_view_base"/> <field name="arch" type="xml"> <data> <form position="attributes"> - <attribute name="string">Choose Your Interface</attribute> + <attribute name="string">Configure Your Interface</attribute> </form> <xpath expr="//label[@string='description']" position="attributes"> - <attribute name="string">Choose between the simplified interface and the extended one. We suggest simplified interface. It has less options and fields but is easier to start with OpenERP. You will be able to switch to the extended interface later.</attribute> + <attribute name="string">If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences.</attribute> </xpath> <xpath expr='//separator[@string="title"]' position='attributes'> - <attribute name='string'>Choose Your Interface</attribute> + <attribute name='string'>Configure Your Interface</attribute> </xpath> <xpath expr='//separator[@string="vsep"]' position='attributes'> <attribute name='string'></attribute> @@ -307,15 +334,12 @@ </group> </group> <xpath expr='//button[@name="action_skip"]' position='replace'/> - <xpath expr='//button[@name="action_next"]' position='attributes'> - <attribute name='string'>Set</attribute> - </xpath> </data> </field> </record> <record id="action_config_simple_view_form" model="ir.actions.act_window"> - <field name="name">Select Your Interface</field> + <field name="name">Configure Your Interface</field> <field name="type">ir.actions.act_window</field> <field name="res_model">res.config.view</field> <field name="view_type">form</field> @@ -332,6 +356,7 @@ </record> <record id="config_wizard_simple_view" model="ir.actions.todo"> <field name="action_id" ref="action_config_simple_view_form"/> + <field name="restart">always</field> <field name="sequence">1</field> </record> </data> |