[MERGE] OPW 577140: stock: use float_compare() to check if initial and provided quantity equals - based on UoM rounding
bzr revid: xal@openerp.com-20120827064849-67mo7ln8uyx1z2pl
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
import time
|
||||
from osv import fields, osv
|
||||
from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
|
||||
from tools.float_utils import float_compare
|
||||
import decimal_precision as dp
|
||||
from tools.translate import _
|
||||
|
||||
@@ -144,7 +145,7 @@ class stock_partial_picking(osv.osv_memory):
|
||||
qty_in_line_uom = uom_obj._compute_qty(cr, uid, line_uom.id, wizard_line.quantity, line_uom.id)
|
||||
|
||||
if line_uom.factor and line_uom.factor <> 0:
|
||||
if qty_in_line_uom <> wizard_line.quantity:
|
||||
if float_compare(qty_in_line_uom, wizard_line.quantity, precision_rounding=line_uom.rounding) != 0:
|
||||
raise osv.except_osv(_('Warning'), _('The uom rounding does not allow you to ship "%s %s", only roundings of "%s %s" is accepted by the uom.') % (wizard_line.quantity, line_uom.name, line_uom.rounding, line_uom.name))
|
||||
if move_id:
|
||||
#Check rounding Quantity.ex.
|
||||
@@ -155,7 +156,7 @@ class stock_partial_picking(osv.osv_memory):
|
||||
#Compute the quantity for respective wizard_line in the initial uom
|
||||
qty_in_initial_uom = uom_obj._compute_qty(cr, uid, line_uom.id, wizard_line.quantity, initial_uom.id)
|
||||
without_rounding_qty = (wizard_line.quantity / line_uom.factor) * initial_uom.factor
|
||||
if qty_in_initial_uom <> without_rounding_qty:
|
||||
if float_compare(qty_in_initial_uom, without_rounding_qty, precision_rounding=initial_uom.rounding) != 0:
|
||||
raise osv.except_osv(_('Warning'), _('The rounding of the initial uom does not allow you to ship "%s %s", as it would let a quantity of "%s %s" to ship and only roundings of "%s %s" is accepted by the uom.') % (wizard_line.quantity, line_uom.name, wizard_line.move_id.product_qty - without_rounding_qty, initial_uom.name, initial_uom.rounding, initial_uom.name))
|
||||
else:
|
||||
seq_obj_name = 'stock.picking.' + picking_type
|
||||
|
||||
Reference in New Issue
Block a user