Merge lp:~openerp-dev/openobject-addons/7.0-opw-586594-acl into lp:openobject-addons/7.0

[Anaël Closson (openerp)]

When creating a sale order with lines having phantom BoM, the first BoM for the corresponding product was always found.

It now takes care of properties to select the right BoM.

Steps to reproduce :

1. In Settings > Manufacturing, we have selected the tickbox: Allow several bill of materials per products using properties

2. In the Manufacturing module > Products > Bill of Materials there are 2 BOM’s called ‘HDD on Demand’. I have edited them both to be BOM Type: Sets / Phantoms

3. In Manufacturing > Properties, I created 2 new Properties: one called HDD1 x1 and the other called HDD2 x4

4. In the 1st ‘HDD on Demand’ I loaded Property HDD1 x1 and in the 2nd ‘HDD on Demand’ we loaded HDD2 x4

5. In each BOM ‘HDD on Demand’ I added an extra line for ease of identification

6. Then I go to the Sales module > Sales Orders to create a quotation using any Customer. When I come to add a product line, I Create Product ‘HDD on Demand’ and select a Property, look for hdd, the 1st one being: HDD1 x1. Save & Close. Confirm the Order. View the Delivery Order and I see the 2 lines on Property HDD x1

7. If I create another order and create Product ‘HDD on Demand’ and select Property, look for hdd and select the 2nd one being: HDD2 x4. Save and Close. Confirm the Order. View the Delivery Order, I see the 2 lines from HDD1 x2 displayed. In other words, the Property selection is not picking any subsequent Properties selected other than the 1st Property.

Unmerged revisions

8765. By Anaël Closson (openerp) on 2013-02-26

[FIX] mrp : Phantom BoM can be chosen according sale order line properties

Before this patch, BoM was incorrectly chosen : for 2 BoM bound to properties for a single product,
the first BoM found was used each time the product was added to a sale order; the property had no impact.
Now, the right BoM is used according the property used in the sale order line.

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-12-20 11:47:30 +0000
+++ mrp/mrp.py	2013-02-26 12:54:33 +0000
@@ -286,17 +286,19 @@
             res['value'].update({'product_uom': product.uom_id.id})
         return res
 
-    def _bom_find(self, cr, uid, product_id, product_uom, properties=None):
-        """ Finds BoM for particular product and product uom.
-        @param product_id: Selected product.
-        @param product_uom: Unit of measure of a product.
+    def _bom_find(self, cr, uid, domain=None, properties=None):
+        """ Finds the best BoM for particular domain according to the properties.
+        @param domain: Bom domain.
         @param properties: List of related properties.
         @return: False or BoM id.
         """
-        if properties is None:
-            properties = []
-        cr.execute('select id from mrp_bom where product_id=%s and bom_id is null order by sequence', (product_id,))
-        ids = map(lambda x: x[0], cr.fetchall())
+        if not domain:
+            domain = []
+        if not properties:
+            properties = []        
+        domain += [('bom_id','=',False)]
+        ids = self.search(cr, uid, domain)
+
         max_prop = 0
         result = False
         for bom in self.pool.get('mrp.bom').browse(cr, uid, ids):
@@ -328,7 +330,7 @@
         result2 = []
         phantom = False
         if bom.type == 'phantom' and not bom.bom_lines:
-            newbom = self._bom_find(cr, uid, bom.product_id.id, bom.product_uom.id, properties)
+            newbom = self._bom_find(cr, uid, [('product_id','=',bom.product_id.id)], properties)
 
             if newbom:
                 res = self._bom_explode(cr, uid, self.browse(cr, uid, [newbom])[0], factor*bom.product_qty, properties, addthis=True, level=level+10)
@@ -545,7 +547,7 @@
             }}
         bom_obj = self.pool.get('mrp.bom')
         product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-        bom_id = bom_obj._bom_find(cr, uid, product.id, product.uom_id and product.uom_id.id, [])
+        bom_id = bom_obj._bom_find(cr, uid, [('product_id', '=', product.id)])
         routing_id = False
         if bom_id:
             bom_point = bom_obj.browse(cr, uid, bom_id, context=context)
@@ -600,7 +602,7 @@
             bom_point = production.bom_id
             bom_id = production.bom_id.id
             if not bom_point:
-                bom_id = bom_obj._bom_find(cr, uid, production.product_id.id, production.product_uom.id, properties)
+                bom_id = bom_obj._bom_find(cr, uid, [('product_id','=',production.product_id.id)], properties)
                 if bom_id:
                     bom_point = bom_obj.browse(cr, uid, bom_id)
                     routing_id = bom_point.routing_id.id or False

=== modified file 'mrp/procurement.py'
--- mrp/procurement.py	2012-12-18 22:50:15 +0000
+++ mrp/procurement.py	2013-02-26 12:54:33 +0000
@@ -45,7 +45,7 @@
         for procurement in self.browse(cr, uid, ids, context=context):
             product = procurement.product_id
             properties = [x.id for x in procurement.property_ids]
-            bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
+            bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, [('product_id', '=', procurement.product_id.id)], properties)
             if not bom_id:
                 cr.execute('update procurement_order set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
                 for (id, name) in self.name_get(cr, uid, procurement.id):

=== modified file 'mrp/report/price.py'
--- mrp/report/price.py	2012-12-06 14:56:32 +0000
+++ mrp/report/price.py	2013-02-26 12:54:33 +0000
@@ -142,7 +142,7 @@
 
         for product in product_pool.browse(cr, uid, ids, context=context):
             product_uom_name = to_xml(product.uom_id.name)
-            bom_id = bom_pool._bom_find(cr, uid, product.id, product.uom_id.id)
+            bom_id = bom_pool._bom_find(cr, uid, [('product_id', '=', product.id)])
             title = "<title>%s</title>" %(_("Cost Structure"))
             title += "<title>%s</title>" % (to_xml(product.name))
             xml += "<lines style='header'>" + title + prod_header + "</lines>"

=== modified file 'mrp/stock.py'
--- mrp/stock.py	2012-12-06 14:56:32 +0000
+++ mrp/stock.py	2013-02-26 12:54:33 +0000
@@ -48,13 +48,14 @@
         wf_service = netsvc.LocalService("workflow")
         processed_ids = [move.id]
         if move.product_id.supply_method == 'produce' and move.product_id.procure_method == 'make_to_order':
-            bis = bom_obj.search(cr, uid, [
-                ('product_id','=',move.product_id.id),
-                ('bom_id','=',False),
-                ('type','=','phantom')])
+            property_ids = []
+            if move.sale_line_id:
+                property_ids = [i.id for i in move.sale_line_id.property_ids]
+            bis = bom_obj._bom_find(cr, uid, [('product_id','=',move.product_id.id), ('type','=','phantom')], property_ids)
+
             if bis:
                 factor = move.product_qty
-                bom_point = bom_obj.browse(cr, uid, bis[0], context=context)
+                bom_point = bom_obj.browse(cr, uid, bis, context=context)
                 res = bom_obj._bom_explode(cr, uid, bom_point, factor, [])
                 state = 'confirmed'
                 if move.state == 'assigned':

=== modified file 'mrp/wizard/change_production_qty.py'
--- mrp/wizard/change_production_qty.py	2012-12-17 15:23:03 +0000
+++ mrp/wizard/change_production_qty.py	2013-02-26 12:54:33 +0000
@@ -78,7 +78,7 @@
                 bom_point = prod.bom_id
                 bom_id = prod.bom_id.id
                 if not bom_point:
-                    bom_id = bom_obj._bom_find(cr, uid, prod.product_id.id, prod.product_uom.id)
+                    bom_id = bom_obj._bom_find(cr, uid, [('product_id', '=', prod.product_id.id)])
                     if not bom_id:
                         raise osv.except_osv(_('Error!'), _("Cannot find bill of material for this product."))
                     prod_obj.write(cr, uid, [prod.id], {'bom_id': bom_id})