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 23522f9..9f6ccb0 100644 (file)
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -105,6 +105,7 @@
                     <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>
@@ -114,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>
@@ -148,6 +151,7 @@
                     <field name="name"/>
                     <field name="code"/>
                     <field name="active"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
@@ -332,29 +336,37 @@
                     <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>
@@ -416,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>
@@ -423,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>
@@ -431,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">
@@ -536,7 +553,7 @@
                     <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>
@@ -550,6 +567,9 @@
                     <field name="name"/>
                     <field name="type"/>
                     <field name="model"/>
+                    <field name="inherit_id"/>                    
+                    <field name="priority"/>
+                    <field name="field_parent"/>
                 </tree>
             </field>
         </record>
@@ -1016,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"/>
@@ -1112,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"/>
@@ -1175,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">