Merge lp:~matjaz-6/openerpsl/openerpsl_02_17 into lp:openerpsl/7.0

[Matjaz Kalic]

[FIX] product_obj (_compute_qty_obj rounding problem)

=== modified file 'mrp_procurement_qty/product.py'
--- mrp_procurement_qty/product.py	2014-04-14 08:29:52 +0000
+++ mrp_procurement_qty/product.py	2014-04-24 11:02:52 +0000
@@ -83,18 +83,40 @@
 	
 product_product()
 
+def true_rounding(f, r):
+	if not r:
+		return f
+	
+	_index = r
+	_count = 0
+	
+	while _index % 1 > 0:
+		_index = _index * 10
+		_count += 1 
+
+	_result = round(f / r) * r
+	_result = round(_result, _count)
+	
+	return _result
+
 class product_uom(osv.osv):
 	_inherit = 'product.uom'
 	
-	def _compute_qty(self, cr, uid, from_uom_id, qty, to_uom_id=False):
-		res = super(product_uom, self)._compute_qty(cr, uid, from_uom_id=from_uom_id, qty=qty, to_uom_id=to_uom_id)
-		res_rounded = round(res, 2)
-		
-		#temp={}
-		#temp[0] = res
-		#temp[1] = res_rounded
-		
-		return res_rounded
+#	def _compute_qty(self, cr, uid, from_uom_id, qty, to_uom_id=False):
+#		res = super(product_uom, self)._compute_qty(cr, uid, from_uom_id=from_uom_id, qty=qty, to_uom_id=to_uom_id)
+#		res_rounded = round(res, 2)
+#		
+#		temp={}
+#		temp[0] = res
+#		temp[1] = res_rounded
+#		
+#		return res_rounded
+	def _compute_qty_obj(self, cr, uid, from_unit, qty, to_unit, context=None):
+		res = super(product_uom, self)._compute_qty_obj(cr, uid, from_unit=from_unit, qty=qty, to_unit=to_unit, context=context)
+		
+		if to_unit:
+			res = true_rounding(res * to_unit.factor, to_unit.rounding)
+		return res
 
 product_uom()