Merge lp:~openerp-dev/openobject-addons/7.0-improve-mrp-domain-psa into lp:openobject-addons/7.0

[Paramjit Singh Sahota(OpenERP)]

Hello,

>> MRP Issue: producing a BoM with a component of Service type is not possible.

>>Video of the issue:
>https://docs.google.com/file/d/0B7c_6dPUa6bca0FEV0JOYjRpdGs/edit

Thankz YoU.
 -PSA.

[lp:~openerp-dev/openobject-addons/7.0-improve-mrp-domain-psa]

8913. By Paramjit Singh Sahota(OpenERP) on 2013-04-11

[MERGE] Merged lp:openobject-addons/7.0

Unmerged revisions

8913. By Paramjit Singh Sahota(OpenERP) on 2013-04-11

[MERGE] Merged lp:openobject-addons/7.0

8912. By Paramjit Singh Sahota(OpenERP) on 2013-03-22

[IMP] MRP Issue: producing a BoM with a component of Service type is not possible and added a warning message to prompt to user.

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-12-20 11:47:30 +0000
+++ mrp/mrp.py	2013-04-11 06:03:28 +0000
@@ -375,6 +375,11 @@
         default.update(name=_("%s (copy)") % (bom_data['name']), bom_id=False)
         return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context)
 
+    def write(self, cr, uid, ids, vals, context=None):
+        for bom in self.browse(cr, uid, ids, context=context):
+            if bom.product_id.type == 'service':
+                raise osv.except_osv(_('Warning!'), _('You cannot have service type products as a component of BoM.'))
+        return super(mrp_bom, self).write(cr, uid, ids, vals, context=context)
 
 def rounding(f, r):
     import math

=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2013-03-19 12:52:16 +0000
+++ mrp/mrp_view.xml	2013-04-11 06:03:28 +0000
@@ -380,7 +380,7 @@
                         <page string="Components">
                             <field name="bom_lines" widget="one2many_list">
                                 <tree string="Components" editable="bottom">
-                                    <field name="product_id" context="{'default_supply_method':'produce'}" on_change="onchange_product_id(product_id, name)"/>
+                                    <field name="product_id" context="{'default_supply_method':'produce'}" on_change="onchange_product_id(product_id, name)" domain="[('type', '!=', 'service')]"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
                                     <field name="name" invisible="1"/>
@@ -635,7 +635,7 @@
                     </div>
                     <group>
                         <group>
-                            <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','!=',False),('bom_ids.bom_id','=',False)]" class="oe_inline" context='{"default_supply_method":"produce", "default_type": "product"}'/>
+                            <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','!=',False),('bom_ids.bom_id','=',False),('type','!=','service')]" class="oe_inline" context='{"default_supply_method":"produce", "default_type": "product"}'/>
                             <label for="product_qty"/>
                             <div>
                                 <field name="product_qty" class="oe_inline"/>