Merge lp:~openerp-dev/openobject-addons/7.0-mrpzeromove-dle into lp:openobject-addons/7.0

[Denis Ledoux (OpenERP)]

Unmerged revisions

9784. By Denis Ledoux (OpenERP) on 2014-01-22

[FIX] mrp: avoid float rounding error using float_compare, and cancel moves if move with a quantity of 0

Sometimes, a move line with a quantity of 0 was created due to a float compared to 0 without using float_compare.

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2013-11-19 16:25:22 +0000
+++ mrp/mrp.py	2014-01-22 12:47:11 +0000
@@ -758,15 +758,11 @@
             for scheduled in production.product_lines:
 
                 # total qty of consumed product we need after this consumption
-                total_consume = ((production_qty + produced_qty) * scheduled.product_qty / production.product_qty)
+                total_consume = ((production_qty - produced_qty) * scheduled.product_qty / production.product_qty)
 
                 # qty available for consume and produce
                 qty_avail = scheduled.product_qty - consumed_data.get(scheduled.product_id.id, 0.0)
 
-                if qty_avail <= 0.0:
-                    # there will be nothing to consume for this raw material
-                    continue
-
                 raw_product = [move for move in production.move_lines if move.product_id.id==scheduled.product_id.id]
                 if raw_product:
                     # qtys we have to consume
@@ -775,9 +771,6 @@
                         # if qtys we have to consume is more than qtys available to consume
                         prod_name = scheduled.product_id.name_get()[0][1]
                         raise osv.except_osv(_('Warning!'), _('You are going to consume total %s quantities of "%s".\nBut you can only consume up to total %s quantities.') % (qty, prod_name, qty_avail))
-                    if qty <= 0.0:
-                        # we already have more qtys consumed than we need
-                        continue
 
                     raw_product[0].action_consume(qty, raw_product[0].location_id.id, context=context)
 

=== modified file 'mrp/stock.py'
--- mrp/stock.py	2013-09-11 12:30:44 +0000
+++ mrp/stock.py	2014-01-22 12:47:11 +0000
@@ -112,9 +112,12 @@
         production_obj = self.pool.get('mrp.production')
         wf_service = netsvc.LocalService("workflow")
         for move in self.browse(cr, uid, ids):
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            if move.product_qty == 0:
+                self.pool['stock.move'].action_cancel(cr, uid, [move.id], context=context)
+                continue
             move.action_confirm(context)
             new_moves = super(StockMove, self).action_consume(cr, uid, [move.id], product_qty, location_id, context=context)
-            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
             for prod in production_obj.browse(cr, uid, production_ids, context=context):
                 if prod.state == 'confirmed':
                     production_obj.force_production(cr, uid, [prod.id])

=== modified file 'stock/stock.py'
--- stock/stock.py	2013-11-28 14:50:59 +0000
+++ stock/stock.py	2014-01-22 12:47:11 +0000
@@ -2641,7 +2641,7 @@
                 quantity = move.product_qty
 
             uos_qty = quantity / move_qty * move.product_uos_qty
-            if quantity_rest > 0:
+            if float_compare(quantity_rest, 0, precision_rounding=move.product_id.uom_id.rounding):
                 default_val = {
                     'product_qty': quantity,
                     'product_uos_qty': uos_qty,