merge

[odoo/odoo.git] / bin / addons / base / ir / ir.xml

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index c6c96a9..9f6ccb0 100644 (file)
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -115,6 +115,8 @@
                         <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>
@@ -426,6 +428,11 @@
         <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>
@@ -433,7 +440,7 @@
             <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>
@@ -441,7 +448,7 @@
             <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">
@@ -1029,6 +1036,7 @@
                 <tree string="Scheduled Actions">
                     <field name="nextcall"/>
                     <field name="name"/>
+                    <field name="active"/>
                     <field name="interval_number"/>
                     <field name="interval_type"/>
                     <field name="numbercall"/>
@@ -1125,8 +1133,8 @@
             <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"/>
@@ -1188,12 +1196,12 @@
 
         <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">