<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="code" select="1"/>
+ <field name="company_id"/>
<field name="active" select="2"/>
</group>
<notebook>
<field name="padding"/>
<field name="number_increment"/>
<field name="number_next"/>
+ <field name="weight" />
<separator colspan="4" string="Legend (for prefix, suffix)"/>
<group col="8" colspan="4">
<group>
- <label colspan="4" string="Year with century: %%(year)s"/>
- <label colspan="4" string="Year without century: %%(y)s"/>
+ <label colspan="4" string="Current Year with Century: %%(year)s"/>
+ <label colspan="4" string="Current Year without Century: %%(y)s"/>
<label colspan="4" string="Month: %%(month)s"/>
<label colspan="4" string="Day: %%(day)s"/>
</group>
<tree string="Sequences">
<field name="name"/>
<field name="code"/>
+ <field name="company_id"/>
+ <field name="number_next"/>
+ <field name="number_increment"/>
+ <field name="prefix"/>
+ <field name="padding"/>
<field name="active"/>
</tree>
</field>
<field name="src_model" select="2"/>
<field name="usage"/>
<field name="view_type"/>
- <field colspan="4" name="view_ids">
- <form string="Views">
- <field colspan="4" name="sequence"/>
- <field name="view_mode"/>
- <field domain="[('type', '=', view_mode)]" name="view_id"/>
- </form>
- <tree string="Views">
- <field name="sequence"/>
+ <notebook colspan="4">
+ <page string="General Settings">
+ <field colspan="4" name="view_ids">
+ <form string="Views">
+ <field colspan="4" name="sequence"/>
+ <field name="view_mode"/>
+ <field domain="[('type', '=', view_mode)]" name="view_id"/>
+ </form>
+ <tree string="Views">
+ <field name="sequence"/>
+ <field name="view_mode"/>
+ <field name="view_id"/>
+ </tree>
+ </field>
+ <field colspan="4" name="default_user_ids"/>
+ <field colspan="4" name="menus"/>
+ <field colspan="4" name="domain"/>
+ <field colspan="4" name="context"/>
+ <field name="limit"/>
+ <field name="auto_refresh"/>
+ <newline/>
<field name="view_mode"/>
+ <field name="filter"/>
<field name="view_id"/>
- </tree>
- </field>
- <field colspan="4" name="domain"/>
- <field colspan="4" name="context"/>
- <field name="limit"/>
- <field name="auto_refresh"/>
- <newline/>
- <field name="view_mode"/>
- <field name="view_id"/>
+ <field name="search_view_id"/>
+ </page>
+ <page string="Security">
+ <separator colspan="4" string="Select Groups" />
+ <field name="groups_id" nolabel="1" colspan="4" />
+ </page>
+ </notebook>
</form>
</field>
</record>
<menuitem action="ir_action_wizard" id="menu_ir_action_wizard" parent="base.next_id_6"/>
<!-- Companies -->
+ <menuitem id="menu_res_company_global"
+ parent="base.menu_administration"
+ name="Companies"
+ sequence="5"/>
+
<record id="action_res_company_tree" model="ir.actions.act_window">
<field name="name">Company's Structure</field>
<field name="type">ir.actions.act_window</field>
<field name="domain">[('parent_id','=',False)]</field>
<field name="view_type">tree</field>
</record>
- <menuitem action="action_res_company_tree" id="menu_action_res_company_tree" parent="base.menu_users" sequence="16"/>
+ <menuitem action="action_res_company_tree" id="menu_action_res_company_tree" parent="base.menu_res_company_global" sequence="16"/>
<record id="action_res_company_form" model="ir.actions.act_window">
<field name="name">Companies</field>
<field name="res_model">res.company</field>
<field name="view_type">form</field>
</record>
- <menuitem action="action_res_company_form" id="menu_action_res_company_form" parent="menu_action_res_company_tree"/>
+ <menuitem action="action_res_company_form" id="menu_action_res_company_form" parent="base.menu_res_company_global"/>
<!-- User Roles -->
<record id="action_res_users" model="ir.actions.act_window">
<field name="res_model">res.users</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_users_tree"/>
+ <field name="search_view_id" ref="view_users_search"/>
</record>
<record id="action_res_users_view1" model="ir.actions.act_window.view">
<field eval="10" name="sequence"/>
<field name="model" select="1"/>
<field name="field_parent"/>
<field name="priority"/>
- <field name="inherit_id"/>
+ <field name="inherit_id" select="1"/>
<field colspan="4" name="arch"/>
</form>
</field>
<field name="name"/>
<field name="type"/>
<field name="model"/>
+ <field name="inherit_id"/>
+ <field name="priority"/>
+ <field name="field_parent"/>
</tree>
</field>
</record>
<field name="res_model">ir.translation</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_translation_tree"/>
- <field name="domain">[('value', '=', False)]</field>
+ <field name="domain">['|',('value', '=', False),('value','=','')]</field>
</record>
<menuitem action="action_translation_untrans" id="menu_action_translation_untrans" parent="menu_action_translation"/>
<field name="type">tree</field>
<field eval="8" name="priority"/>
<field name="arch" type="xml">
- <tree string="Menu">
+ <tree string="Menu" editable="top">
+ <field name="sequence"/>
<field icon="icon" name="complete_name"/>
</tree>
</field>
</field>
</record>
<record id="grant_menu_access" model="ir.actions.act_window">
- <field name="name">Grant Access To Menus</field>
+ <field name="name">Manage Menus</field>
<field name="res_model">ir.ui.menu</field>
<field name="view_type">form</field>
<field name="view_id" ref="edit_menu"/>
<tree string="Scheduled Actions">
<field name="nextcall"/>
<field name="name"/>
+ <field name="active"/>
<field name="interval_number"/>
<field name="interval_type"/>
<field name="numbercall"/>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Scheduled Actions">
+ <field name="name" select="1"/>
+ <field name="active" select="1" />
+ <field name="user_id" select="1" />
+ <field name="priority" select="1" />
<notebook colspan="4">
<page string="Information">
- <field name="name" select="1"/>
- <field name="active" select="1"/>
- <field name="user_id" select="1"/>
- <field name="priority" select="1"/>
- <newline/>
<field name="interval_number"/>
<field name="interval_type"/>
<newline/>
<page string="Technical Data" groups="base.group_extended">
<separator string="Action to Trigger" colspan="4"/>
<field name="model" groups="base.group_extended"/>
- <field name="function" readonly="base.group_extended"/>
- <field colspan="4" name="args" readonly="base.group_extended"/>
+ <field name="function"/>
+ <field colspan="4" name="args"/>
</page>
</notebook>
</form>
<field name="model">ir.model.access</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Access Controls">
+ <tree string="Access Controls" editable="bottom">
<field name="name"/>
<field name="model_id"/>
<field name="group_id"/>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Record rules">
- <field name="model_id"/>
- <field name="global"/>
+ <field name="model_id" select="1"/>
+ <field name="global" select="1"/>
<field colspan="4" name="name"/>
<group col="6" colspan="4" expand="1">
<field colspan="6" name="rules" nolabel="1"/>
<record id="property_rule_group" model="ir.rule.group">
<field name="name">Property multi-company</field>
- <field model="ir.model" name="model_id" search="[('model', '=', 'ir.property')]"/>
- <field eval="True" name="global"/>
- </record>
- <record id="property_rule_group2" model="ir.rule.group">
- <field name="name">Property multi-company 2</field>
- <field model="ir.model" name="model_id" search="[('model', '=', 'ir.property')]"/>
+ <field model="ir.model" name="model_id" ref="model_ir_property"/>
<field eval="True" name="global"/>
</record>
<record id="property_rule" model="ir.rule">
- <field model="ir.model.fields" name="field_id" search="[('model', '=', 'ir.property'), ('name', '=', 'company_id')]"/>
- <field name="operator">child_of</field>
- <field name="operand">user.company_id.id</field>
+ <field name="domain_force">['|',('company_id','child_of',user.company_id.id),('company_id','=',False)]</field>
<field name="rule_group" ref="property_rule_group"/>
</record>
- <record id="property_rule_bis" model="ir.rule">
- <field model="ir.model.fields" name="field_id" search="[('model', '=', 'ir.property'), ('name', '=', 'company_id')]"/>
- <field name="operator">=</field>
- <field name="operand">False</field>
- <field name="rule_group" ref="property_rule_group2"/>
- </record>
<!--server action view-->
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Server Action">
- <group col="6" colspan="4">
- <field name="name" select="1"/>
- <field name="model_id" select="1"/>
- <field name="state" select="1"/>
- <field name="sequence" select="2"/>
- <field name="condition"/>
- </group>
+ <group col="6" colspan="4">
+ <field name="name" select="1"/>
+ <field name="model_id" select="1"/>
+ <field name="state" select="1"/>
+ <field name="sequence" select="2"/>
+ </group>
<notebook colspan="4">
<page string="Python Code" attrs="{'invisible':[('state','!=','code')]}">
<separator colspan="4" string="Python Code"/>
<field name="trigger_name" select="2" attrs="{'required':[('state','=','trigger')]}"/>
</page>
<page string="Action to Launch" attrs="{'invisible':[('state','!=','client_action')]}">
- <separator colspan="4" string="Client Action Configuration"/>
+ <separator colspan="4" string="Client Action Configuration"/>
<field name="action_id" select="2" attrs="{'required':[('state','=','client_action')]}"/>
</page>
<page string="Email Configuration" attrs="{'invisible':[('state','!=','email')]}">
</page>
<page string="Create / Write" attrs="{'invisible':[('state','!=','object_create'),('state','!=','object_write')]}">
<separator colspan="4" string="Fields Mapping"/>
- <field name="srcmodel_id" select="2" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'),('state','!=','trigger'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
+ <field name="srcmodel_id" select="2" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'),('state','!=','trigger'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
<field name="fields_lines" nolabel="1" select="2" colspan="4">
<tree string="Field Mappings" editable="top">
<field name="col1" domain="[('model_id','=',parent.srcmodel_id or parent.model_id)]"/>
<page string="Multi Actions" attrs="{'invisible':[('state','!=','other')]}">
<separator colspan="4" string="Other Actions Configuration"/>
<field name="child_ids" nolabel="1" colspan="4"/>
- <label colspan="4" string="Only one client action will be execute, last
- clinent action will be consider in case of multiples clients actions" align="0.0"/>
+ <label colspan="4" string="Only one client action will be executed, last client action will be considered in case of multiple client actions." align="0.0"/>
</page>
</notebook>
<field name="type" readonly="1"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree editable="bottom" string="Config Wizard Steps">
- <field name="name" select="1"/>
- <field name="action_id" select="1"/>
<field name="sequence"/>
+ <field name="action_id" select="1"/>
<field name="state"/>
- <field name="active" select="1"/>
+ <field name="active" select="2"/>
</tree>
</field>
</record>
<field name="type">form</field>
<field name="arch" type="xml">
<form editable="bottom" string="Config Wizard Steps">
- <field name="name" select="1"/>
- <field name="active" select="1"/>
- <field name="action_id" select="1"/>
<field name="sequence"/>
+ <field name="action_id" select="1"/>
<field name="state"/>
- <field colspan="4" name="note"/>
+ <field name="active" select="2"/>
</form>
</field>
</record>
<field name="res_model">ir.actions.todo</field>
<field name="view_id" ref="ir_actions_todo_tree"/>
<field name="view_type">form</field>
- <field name="domain">[('type','=','configure')]</field>
</record>
<menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/>
<menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form" parent="next_id_11"/>
- <record id="view_config_wizard_form" model="ir.ui.view">
- <field name="name">Main Configuration Wizard</field>
- <field name="model">ir.actions.configuration.wizard</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Next Configuration Step">
- <image name="gtk-dialog-info"/>
- <group>
- <separator string="Next Configuration Step" colspan="4"/>
- <field name="name" nolabel="1" colspan="4" width="500"/>
- <field name="progress" widget="progressbar"/>
- <separator colspan="4" string=""/>
- <label string="" colspan="2"/>
- <group colspan="2" col="2">
- <button icon="gtk-cancel" name="button_skip" string="Skip Step" type="object"/>
- <button icon="gtk-go-forward" name="button_continue" string="Continue" type="object"/>
- </group>
- </group>
- </form>
- </field>
+ <record id="action_start_configurator" model="ir.actions.server">
+ <field name="name">Start Configuration</field>
+ <field name="model_id" ref="model_res_config"/>
+ <field name="state">code</field>
+ <field name="code">action = self.next(cr, uid, [])</field>
</record>
-
- <record id="action_config_wizard_form" model="ir.actions.act_window">
- <field name="name">Configuration Wizard</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">ir.actions.configuration.wizard</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
- <menuitem action="action_config_wizard_form" id="menu_config_module" parent="base.next_id_11"/>
-
+ <menuitem action="action_start_configurator" name="Start Configuration"
+ id="menu_configurator_module" parent="next_id_11"
+ type="server"/>
</data>
</openerp>
projects / odoo / odoo.git / blobdiff