diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2f1c4990871ad5f9c95854a39d46bfcf378f9874..46fea66f473f008441bd9444de09571978a4aeb3 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -391,14 +391,14 @@
<tree string="Components" editable="bottom">
<field name="sequence" widget="handle"/>
<field name="product_id" on_change="onchange_product_id(product_id, product_qty)"/>
- <field name="type"/>
+ <field name="type" groups="mrp.group_route_line_type"/>
<field name="product_qty"/>
- <field name="product_rounding"/>
- <field name="product_efficiency"/>
+ <field name="product_rounding" groups="mrp.group_rounding_efficiency"/>
+ <field name="product_efficiency" groups="mrp.group_rounding_efficiency"/>
<field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
<field name="date_start"/>
<field name="date_stop"/>
- <field name="routing_id"/>
+ <field name="routing_id" groups="mrp.group_mrp_routings,mrp.group_route_line_type"/>
<field name="attribute_value_ids" widget="many2many_tags"/>
</tree>
</field>
@@ -491,7 +491,7 @@
</field>
</record>
- <record id="mrp_bom_component_tree_view" model="ir.ui.view">
+ <record id="mrp_bom_component_tree_view" model="ir.ui.view">
<field name="name">mrp.bom.component.tree</field>
<field name="model">mrp.bom.line</field>
<field name="arch" type="xml">
@@ -534,24 +534,6 @@
</field>
</record>
- <record id="mrp_bom_form_action2" model="ir.actions.act_window">
- <field name="name">Bill of Material Components</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">mrp.bom.line</field>
- <field name="view_type">tree</field>
- <field name="view_mode">tree</field>
- <field name="view_id" eval="False"/> <!-- Force empty -->
- <field name="help" type="html">
- <p class="oe_view_nocontent_create">
- Click to add a component to a bill of material.
- </p><p>
- Bills of materials components are components and by-products
- used to create master bills of materials. Use this menu to
- search in which BoM a specific component is used.
- </p>
- </field>
- </record>
-
<record id="product_template_search_view_procurment" model="ir.ui.view">
<field name="name">product.template.search.bom</field>
<field name="model">product.template</field>
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index 3914082088647f73a38a2f069664441d6b3b7b08..49ca914f0a9aeb81d1df08f51e49e2f51b08a058 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -52,6 +52,12 @@ class mrp_config_settings(osv.osv_memory):
'group_mrp_properties': fields.boolean("Allow several bill of materials per products using properties",
implied_group='product.group_mrp_properties',
help="""The selection of the right Bill of Material to use will depend on the properties specified on the sales order and the Bill of Material."""),
+ 'group_route_line_type': fields.boolean("Manage multi level Bill of Materials",
+ implied_group='mrp.group_route_line_type',
+ help="""Allow to manage multi level bill of material"""),
+ 'group_rounding_efficiency': fields.boolean("Manage rounding and efficiency of BoM components",
+ implied_group='mrp.group_rounding_efficiency',
+ help="""Allow to manage product rounding on quantity and product efficiency during production process"""),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index bd717e754d921709b3beabd5df769689a3518aa1..13264b77f20423cf78abd5351f56d65761747ef8 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -60,6 +60,19 @@
</div>
</div>
</group>
+ <group>
+ <label for="id" string="Bill of Materials"/>
+ <div>
+ <div>
+ <field name="group_route_line_type" class="oe_inline"/>
+ <label for="group_route_line_type"/>
+ </div>
+ <div>
+ <field name="group_rounding_efficiency" class="oe_inline"/>
+ <label for="group_rounding_efficiency" />
+ </div>
+ </div>
+ </group>
</form>
</field>
</record>
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 1320ea269064aac560f9247e307e026225ae9bd9..f0d21c0e20ddbb023624e10851db48a1aa45521b 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -19,6 +19,16 @@
<field name="category_id" ref="base.module_category_hidden"/>
</record>
+ <record id="group_route_line_type" model="res.groups">
+ <field name="name">Manage multi level BOM</field>
+ <field name="category_id" ref="base.module_category_hidden"/>
+ </record>
+
+ <record id="group_rounding_efficiency" model="res.groups">
+ <field name="name">Manage rounding and efficiency of BoM components</field>
+ <field name="category_id" ref="base.module_category_hidden"/>
+ </record>
+
</data>
<data noupdate="1">
<!-- Multi -->