<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" />
+ <field name="condition" colspan="4" />
<separator colspan="4" string="Legend (for prefix, suffix)"/>
<group col="8" colspan="4">
<group>
<field name="name"/>
<field name="code"/>
<field name="active"/>
+ <field name="company_id"/>
</tree>
</field>
</record>
<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"/>
- <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"/>
- <field name="search_view_id"/>
+ <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"/>
+ <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>
<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="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 model="ir.model" name="model_id" ref="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">