<field name="type">form</field>
<field name="arch" type="xml">
<form string="Groups">
+ <field name="category_id" select="1"/>
<field name="name" select="1"/>
<notebook colspan="4">
<page string="Users">
<field colspan="4" name="users" nolabel="1"/>
</page>
+ <page string="Inherited">
+ <label colspan="4" string="Users added to this group are automatically added in the following groups."/>
+ <field colspan="4" name="implied_ids" nolabel="1"/>
+ </page>
<page string="Menus">
<field colspan="4" name="menu_access" nolabel="1"/>
</page>
-->
<record id="view_users_form_simple_modif" model="ir.ui.view">
- <field name="name">res.users.form.modif</field>
+ <field name="name">res.users.preferences.form</field>
<field name="model">res.users</field>
<field name="type">form</field>
<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 & 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" readonly="1"/>
+ <newline/>
+ <group colspan="2" col="2">
+ <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"/>
+ </group>
+ <group name="default_filters" colspan="2" col="2">
+ <separator string="Default Filters" colspan="2"/>
+ <field name="company_id" widget="selection" readonly="0"
+ groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
+ </group>
+ <separator string="Email Preferences" colspan="4"/>
+ <field colspan="4" name="user_email" widget="email" readonly="0"/>
+ <field colspan="4" name="signature" readonly="0"/>
</form>
</field>
</record>
<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>
</form>
</field>
</record>
+
+ <record id="user_groups_view" model="ir.ui.view">
+ <field name="name">res.users.groups</field>
+ <field name="model">res.users</field>
+ <field name="inherit_id" ref="view_users_form"/>
+ <field name="arch" type="xml">
+ <!-- dummy, will be modified by groups -->
+ <field name="groups_id" position="after"/>
+ </field>
+ </record>
+
<record id="view_users_tree" model="ir.ui.view">
<field name="name">res.users.tree</field>
<field name="model">res.users</field>
<search string="Users">
<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>
-
- <!--
+
+ <!--
======================
- Logo wiz
+ Company
======================
-->
-
- <record id="view_res_company_logo" model="ir.ui.view">
- <field name="name">res.company.logo.form</field>
- <field name="model">res.company.logo</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Upload Logo">
- <separator string="Upload your company logo in JPG or PNG with a format similar to 450*150 pixels" colspan="4"/>
- <field colspan="4" height="150" name="logo" widget="image"/>
- <separator colspan="4"/>
- <group colspan="4" col="6">
- <label string="" colspan="2"/>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button icon="gtk-ok" string="Upload" name="execute" type="object"/>
- </group>
- </form>
- </field>
- </record>
- <record id="action_res_company_logo" model="ir.actions.act_window">
- <field name="name">Set Logo</field>
- <field name="res_model">res.company.logo</field>
+ <report id="preview_report" model="res.company" name="preview.report" multi="True"
+ rml="base/report/preview_report.rml" string="Preview Report"/>
+
+ <record id="bank_account_update" model="ir.actions.act_window">
+ <field name="name">Company Bank Accounts</field>
+ <field name="res_model">res.partner.bank</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
- <field name="view_id" ref="view_res_company_logo"/>
- <field name="target">new</field>
+ <field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
+ <field name="help">Configure your company's bank account and select those that must appear on the report footer. You can reorder bank accounts from the list view. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
</record>
-
- <!--
- ======================
- Company
- ======================
- -->
+
+
<record id="view_company_form" model="ir.ui.view">
<field name="name">res.company.form</field>
<field name="model">res.company</field>
<field name="arch" type="xml">
<form string="Company">
<group colspan="4" col="6">
- <field colspan="4" name="name" select="1"/>
- <field name="partner_id" readonly="1" select="1" required="0"/>
- <field name="parent_id" select="1" groups="base.group_multi_company"/>
+ <group colspan="4" col="4">
+ <field name="name"/>
+ <field name="partner_id" readonly="1" required="0" groups="base.group_extended"/>
+ <field name="parent_id" groups="base.group_multi_company"/>
+ </group>
+ <group colspan="2" col="2">
+ <field name="logo" nolabel="1" widget="image"/>
+ </group>
</group>
<notebook colspan="4">
<page string="General Information">
- <field name="rml_header1" colspan="4"/>
- <field name="rml_footer1" colspan="4"/>
- <field name="rml_footer2" colspan="4"/>
- <field name="currency_id"/>
- <button name="createReport" string="Preview Reports" type="object" icon="gtk-print"/>
- <button name="%(action_res_company_logo)d"
- string="Upload your logo" type="action" icon="gtk-ok"/>
+ <separator string="Address Information" colspan="4"/>
+ <field name="street" colspan="4"/>
+ <field name="street2" invisible="1"/>
+ <field name="zip"/>
+ <field name="city"/>
+ <field name="country_id"/>
+ <field name="state_id"/>
+ <field name="phone" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+ <field name="email" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+ <field name="fax" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+ <field name="website" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+ <field name="vat" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+ <field name="company_registry" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+ <separator string="Header/Footer of Reports" colspan="4"/>
+ <group colspan="4" col="3">
+ <field name="rml_header1" colspan="3"/>
+ <newline/>
+ <field name="rml_footer1" colspan="3" groups="base.group_extended"/>
+ <newline/>
+ <field name="rml_footer2" colspan="2"/>
+ <button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
+ <newline/>
+ <label string="" colspan="2"/>
+ <button name="%(preview_report)d" string="Preview Header" type="action" icon="gtk-print"/>
+ </group>
</page>
<page string="Header/Footer" groups="base.group_extended">
+ <group colspan="2" col="4">
+ <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
+ </group>
<field colspan="4" name="rml_header" nolabel="1"/>
</page>
<page string="Internal Header/Footer" groups="base.group_extended">
<field colspan="2" name="rml_header3" nolabel="1"/>
</page>
<page string="Configuration">
+ <separator string="Accounting" colspan="4"/>
+ <field name="currency_id" colspan="2"/>
+ <newline/>
</page>
</notebook>
</form>
</tree>
</field>
</record>
-
- <record id="view_users_configuration_form" model="ir.ui.view">
- <field name="name">res.config.users.confirm.form</field>
- <field name="model">res.config.users</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">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">
- <field name="name"/>
- <field name="email"/>
- <field name="login"/>
- <field name="password" password="True"/>
- <field name="context_lang"/>
- <field name="context_tz"/>
-
- <separator string="Group" colspan="4"/>
- <label align="0.0" colspan="4" string="Groups are used to define access rights on objects and the visibility of screens and menus"/>
- <field colspan="4" nolabel="1" name="groups_id"/>
- </group>
-
- <xpath expr='//button[@name="action_next"]'
- position='attributes'>
- <attribute name="name">action_add</attribute>
- <attribute name='string'>Add User</attribute>
- <attribute name='icon'>gtk-add</attribute>
- </xpath>
-
- <xpath expr='//button[@name="action_skip"]'
- position='attributes'>
- <!-- if this one is performed first, it transforms
- the action_skip into action_next, and the
- transformation of action_next to action_add,
- since it uses first-match, transforms the same
- button. And we end up with [add] [next] instead
- of [next] [add]
-
- Would probably be simpler to just replace both
- by nothing and create a pair of brand new
- buttons... but we'd have to handle the groups
- around the buttons... oh well...
- -->
- <attribute name="name">action_next</attribute>
- <attribute name='string'>Done</attribute>
- <attribute name='icon'>gtk-go-forward</attribute>
- </xpath>
- </data>
- </field>
- </record>
-
- <record id="action_config_user_form" model="ir.actions.act_window">
- <field name="name">Create Users</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">res.config.users</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="view_id" ref="view_users_configuration_form"/>
- <field name="target">new</field>
- </record>
-
- <!-- Config Wiz Give access to others users-->
-
- <record id="action_config_access_other_user" model="ir.actions.act_window">
- <field name="name">Give access to others users</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">res.users</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="view_id" ref="view_users_form"/>
- </record>
- <!-- register configuration wizard -->
-
- <record id="config_wizard_action_config_user_form" model="ir.actions.todo">
- <field name="action_id" ref="action_config_access_other_user"/>
- <field name="restart">never</field>
- <field name="target">current</field>
- <field name="sequence">1000</field>
- <field name="state">skip</field>
- </record>
-
- <record id="view_confirm_simple_view_form" model="ir.ui.view">
- <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">Configure Your Interface</attribute>
- </form>
- <xpath expr="//label[@string='description']"
- position="attributes">
- <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'>Configure Your Interface</attribute>
- </xpath>
- <xpath expr='//separator[@string="vsep"]' position='attributes'>
- <attribute name='string'></attribute>
- <attribute name='rowspan'>12</attribute>
- </xpath>
- <group string="res_config_contents" position="replace">
- <group colspan="4">
- <field colspan="4" name="view" nolabel="1"/>
- </group>
- </group>
- <xpath expr='//button[@name="action_skip"]' position='replace'/>
- </data>
- </field>
- </record>
-
- <record id="action_config_simple_view_form" model="ir.actions.act_window">
- <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>
- <field name="view_id" ref="view_confirm_simple_view_form"/>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <record id="config_wizard_step_user" model="ir.actions.todo">
- <field name="action_id" ref="action_config_user_form"/>
- <field name="sequence">10</field>
- <field name="restart">never</field>
- <field name="state">done</field>
- </record>
- <record id="config_wizard_simple_view" model="ir.actions.todo">
- <field name="action_id" ref="action_config_simple_view_form"/>
- <field name="restart">on_trigger</field>
+ <record id="category_administration_config" model="ir.actions.todo.category">
+ <field name="name">Administration</field>
<field name="sequence">1</field>
- <field name="state">skip</field>
- </record>
-
-<!-- Define default users preferences-->
-
- <record id="view_user_preferences_config_form" model="ir.ui.view">
- <field name="name">Define default users preferences</field>
- <field name="model">user.preferences.config</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">Define default users preferences</attribute>
- </form>
- <xpath expr='//separator[@string="title"]' position='attributes'>
- <attribute name='string'>Define default users preferences</attribute>
- </xpath>
- <xpath expr="//label[@string='description']"
- position="attributes">
- <attribute name="string">Specify default values. These data are just default values, each user is free to change his own preferences.</attribute>
- </xpath>
- <xpath expr='//separator[@string="vsep"]' position='attributes'>
- <attribute name='string'></attribute>
- <attribute name='rowspan'>12</attribute>
- </xpath>
- <group string="res_config_contents" position="replace">
- <group colspan="4">
- <field colspan="4" name="context_tz" />
- <field colspan="4" name="context_lang" />
- <field colspan="4" name="view" />
- <field colspan="4" name="menu_tips" />
- </group>
- </group>
- </data>
- </field>
- </record>
-
- <record id="action_user_preferences_config_form" model="ir.actions.act_window">
- <field name="name">Define default users preferences</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">user.preferences.config</field>
- <field name="view_type">form</field>
- <field name="view_id" ref="view_user_preferences_config_form"/>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
-
- <!-- Register configuration wizard -->
-
- <record id="config_action_user_preferences_config_form" model="ir.actions.todo">
- <field name="action_id" ref="action_user_preferences_config_form"/>
- <field name="restart">on_trigger</field>
</record>
-
</data>
</openerp>
projects / odoo / odoo.git / blobdiff