Merge lp:~laetitia-gangloff/openobject-addons/7.0_fix_1200676 into lp:openobject-addons/7.0

[Laetitia Gangloff (Acsone)]

fix bug 1200676 by using subproductfactor in the comparison

[Stéphane Bidoul (Acsone) (sbi)]

Code looks good to me, but you should re-do this MP against bug #1048807 so it gets more visibility. Indeed, since #1200676 is a duplicate it will be mostly ignored.

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-12-20 11:47:30 +0000
+++ mrp/mrp.py	2013-07-15 14:32:07 +0000
@@ -760,9 +760,9 @@
                 subproduct_factor = self._get_subproduct_factor(cr, uid, production.id, produce_product.id, context=context)
                 rest_qty = (subproduct_factor * production.product_qty) - produced_qty
 
-                if rest_qty < production_qty:
+                if rest_qty < (subproduct_factor * production_qty):
                     prod_name = produce_product.product_id.name_get()[0][1]
-                    raise osv.except_osv(_('Warning!'), _('You are going to produce total %s quantities of "%s".\nBut you can only produce up to total %s quantities.') % (production_qty, prod_name, rest_qty))
+                    raise osv.except_osv(_('Warning!'), _('You are going to produce total %s quantities of "%s".\nBut you can only produce up to total %s quantities.') % ((subproduct_factor * production_qty), prod_name, rest_qty))
                 if rest_qty > 0 :
                     stock_mov_obj.action_consume(cr, uid, [produce_product.id], (subproduct_factor * production_qty), context=context)