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 80ad828..9f6ccb0 100644 (file)
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -428,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>
@@ -435,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>
@@ -443,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">