From 416375ba2bc260ea7c9b290e3a440238036f1aee Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 4 Apr 2012 15:47:31 +0200
Subject: [PATCH] [IMP] product,mrp: move group_mrp_properties into module
 product, to add use on sale order lines

bzr revid: rco@openerp.com-20120404134731-3syvingajqrxgysg
---
 addons/mrp/mrp_view.xml                      | 12 ++++++------
 addons/mrp/res_config.py                     |  2 +-
 addons/mrp/security/mrp_security.xml         |  5 -----
 addons/product/security/product_security.xml |  5 +++++
 addons/sale/sale_view.xml                    |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e88bdaf2b6e..961d42cee2b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -105,17 +105,17 @@
         <menuitem name="Master Bill of Materials"
             id="menu_mrp_property"
             parent="menu_mrp_configuration"
-            groups="mrp.group_mrp_routings,mrp.group_mrp_properties"
+            groups="mrp.group_mrp_routings,product.group_mrp_properties"
             sequence="20" />
         <menuitem
             action="mrp_property_action"
             id="menu_mrp_property_action"
-            groups="mrp.group_mrp_properties"
+            groups="product.group_mrp_properties"
             parent="menu_mrp_property"/>
         <menuitem
             action="mrp_property_group_action"
             parent="menu_mrp_property"
-            groups="mrp.group_mrp_properties"
+            groups="product.group_mrp_properties"
             id="menu_mrp_property_group_action"/>
 
         <!--
@@ -377,7 +377,7 @@
                                     <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False)]}">
                                         <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
                                     </page>
-                                    <page string="Properties" groups="mrp.group_mrp_properties">
+                                    <page string="Properties" groups="product.group_mrp_properties">
                                         <field name="position"/>
                                         <field name="active"/>
                                         <field name="sequence"/>
@@ -397,7 +397,7 @@
                         <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False)]}">
                             <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
                         </page>
-                        <page string="Properties" groups="mrp.group_mrp_properties">
+                        <page string="Properties" groups="product.group_mrp_properties">
                             <field name="position"/>
                             <field name="active"/>
                             <field name="sequence"/>
@@ -963,7 +963,7 @@
                     <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
                 </xpath>
                 <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
-                    <group colspan="4"  groups="mrp.group_mrp_properties">
+                    <group colspan="4"  groups="product.group_mrp_properties">
                     <separator colspan="4" string="Properties" />
                     <field colspan="4" name="property_ids" nolabel="1"/>
                      </group>
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index e1efed77157..eb06de642ed 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -60,7 +60,7 @@ class mrp_config_settings(osv.osv_memory):
                 within your work centers in order to produce a product. They are attached to bills of materials
                 that will define the required raw materials."""),
         'group_mrp_properties': fields.boolean("Manage Properties",
-            implied_group='mrp.group_mrp_properties',
+            implied_group='product.group_mrp_properties',
             help="""Allows to define specific property that can be assigned to your bill of materials."""),
     }
 
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 7806de99d4a..f1f26aae1f2 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -18,11 +18,6 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="group_mrp_properties" model="res.groups">
-        <field name="name">Manage Properties of Product</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
     <!-- restrict access to menu -->
     <record model='ir.ui.menu' id="mrp_Sched_all">
         <field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 324aecf962e..d0f1cd81d5e 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -39,6 +39,11 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="group_mrp_properties" model="res.groups">
+        <field name="name">Manage Properties of Product</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record model="ir.rule" id="product_pricelist_comp_rule">
         <field name="name">product pricelist company rule</field>
         <field name="model_id" ref="model_product_pricelist"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index eb63b8e20aa..f3a810f9692 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -160,7 +160,7 @@
                                             </group>
                                         </group>
                                         </page>
-                                        <page groups="base.group_extended" string="Extra Info">
+                                        <page string="Extra Info" groups="product.group_mrp_properties">
                                             <field name="type"/>
                                             <field name="delay"/>
                                             <field name="th_weight"/>