Merge lp:~vauxoo/openobject-addons/6.1-bug-1051367-moylop260_vauxoo into lp:openobject-addons/6.1

[Moisés López - http://www.vauxoo.com]

Fix bom explode qty

[lp:~vauxoo/openobject-addons/6.1-bug-1051367-moylop260_vauxoo]

6993. By Moisés López - http://www.vauxoo.com on 2012-09-17

[FIX] [mrp_subproduct] Fix name variable

6994. By Moisés López - http://www.vauxoo.com on 2012-09-17

[FIX] [mrp] Fix mrp subproducts validation zero & fix calc

[Nhomar - Vauxoo (nhomar)]

Moy.

To avoid misunderstood, can we prepare a use-case for this MP or link the videos related to the bug please.

Just for information to openerp team.

all explanation is really here:

bug #1047680

If we can prepare some test yaml it can be great Moy,
Regards.

review: Needs Information

Unmerged revisions

6994. By Moisés López - http://www.vauxoo.com on 2012-09-17

[FIX] [mrp] Fix mrp subproducts validation zero & fix calc

6993. By Moisés López - http://www.vauxoo.com on 2012-09-17

[FIX] [mrp_subproduct] Fix name variable

6992. By Moisés López - http://www.vauxoo.com on 2012-09-17

[REF] [mrp & mrp_subproducts] BoM explode qty refactory

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-07-23 08:44:52 +0000
+++ mrp/mrp.py	2012-09-17 17:14:20 +0000
@@ -292,8 +292,8 @@
                 result = bom.id
                 max_prop = prop
         return result
-
-    def _bom_explode(self, cr, uid, bom, factor, properties=[], addthis=False, level=0, routing_id=False):
+    
+    def _bom_explode(self, cr, uid, bom, factor, properties=[], addthis=False, level=0, routing_id=False, result_subproducts=False):
         """ Finds Products and Work Centers for related BoM for manufacturing order.
         @param bom: BoM of particular product.
         @param factor: Factor of product UoM.
@@ -303,6 +303,18 @@
         @return: result: List of dictionaries containing product details.
                  result2: List of dictionaries containing Work Center details.
         """
+        if result_subproducts is False:
+            result_subproducts = []
+        if self._columns.has_key('sub_products'):#if module mrp_subproduct is installed
+            for sub_product in bom.sub_products:
+                qty1 = sub_product.product_qty
+                if sub_product.subproduct_type == 'variable':
+                    qty1 = factor*qty1/bom.product_uom.factor_inv
+                result_subproducts.append({
+                    'product_id': sub_product.product_id.id,
+                    'product_qty': qty1,
+                    'product_uom': sub_product.product_uom.id,
+                })
         routing_obj = self.pool.get('mrp.routing')
         factor = factor / (bom.product_efficiency or 1.0)
         factor = rounding(factor, bom.product_rounding)
@@ -313,9 +325,9 @@
         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)
-            
             if newbom:
-                res = self._bom_explode(cr, uid, self.browse(cr, uid, [newbom])[0], factor*bom.product_qty, properties, addthis=True, level=level+10)
+                newbom_pool = self.browse(cr, uid, newbom)
+                res = self._bom_explode(cr, uid, self.browse(cr, uid, [newbom])[0], factor*bom.product_qty/(newbom_pool.product_qty*newbom_pool.product_uom.factor_inv), properties, addthis=True, level=level+10, result_subproducts=result_subproducts)
                 result = result + res[0]
                 result2 = result2 + res[1]
                 phantom = True
@@ -347,7 +359,7 @@
                         'hour': float(wc_use.hour_nbr*mult + ((wc.time_start or 0.0)+(wc.time_stop or 0.0)+cycle*(wc.time_cycle or 0.0)) * (wc.time_efficiency or 1.0)),
                     })
             for bom2 in bom.bom_lines:
-                res = self._bom_explode(cr, uid, bom2, factor, properties, addthis=True, level=level+10)
+                res = self._bom_explode(cr, uid, bom2, factor, properties, addthis=True, level=level+10, result_subproducts=result_subproducts)
                 result = result + res[0]
                 result2 = result2 + res[1]
         return result, result2
 
=== modified file 'mrp_subproduct/mrp_subproduct.py'
--- mrp_subproduct/mrp_subproduct.py	2012-02-14 15:57:46 +0000
+++ mrp_subproduct/mrp_subproduct.py	2012-09-17 17:14:20 +0000
@@ -73,27 +73,24 @@
         """ Confirms production order and calculates quantity based on subproduct_type.
         @return: Newly generated picking Id.
         """
+        bom_obj = self.pool.get('mrp.bom')
+        uom_obj = self.pool.get('product.uom')
         picking_id = super(mrp_production,self).action_confirm(cr, uid, ids)
         for production in self.browse(cr, uid, ids):
             source = production.product_id.product_tmpl_id.property_stock_production.id
-            if not production.bom_id:
+            bom_id = production.bom_id
+            if not bom_id:
                 continue
-            for sub_product in production.bom_id.sub_products:
-                qty1 = sub_product.product_qty
-                qty2 = production.product_uos and production.product_uos_qty or False
-                if sub_product.subproduct_type == 'variable':
-                    if production.product_qty:
-                        qty1 *= production.product_qty / (production.bom_id.product_qty or 1.0)
-                    if production.product_uos_qty:
-                        qty2 *= production.product_uos_qty / (production.bom_id.product_uos_qty or 1.0)
+            factor = uom_obj._compute_qty(cr, uid, production.product_uom.id, production.product_qty, bom_id.product_uom.id)
+            result_subproducts =[]
+            res = bom_obj._bom_explode(cr, uid, bom_id, factor / bom_id.product_qty, properties=False, routing_id=False, result_subproducts=result_subproducts)
+            for sub_product in result_subproducts:
                 data = {
                     'name': 'PROD:'+production.name,
                     'date': production.date_planned,
-                    'product_id': sub_product.product_id.id,
-                    'product_qty': qty1,
-                    'product_uom': sub_product.product_uom.id,
-                    'product_uos_qty': qty2,
-                    'product_uos': production.product_uos and production.product_uos.id or False,
+                    'product_id': sub_product['product_id'],
+                    'product_qty': sub_product['product_qty'],
+                    'product_uom': sub_product['product_uom'],
                     'location_id': source,
                     'location_dest_id': production.location_dest_id.id,
                     'move_dest_id': production.move_prod_id.id,