From 7e24105aa8199cb2e340134b33e4aba275ddd2f0 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Fri, 6 Feb 2009 10:38:12 +0530
Subject: [PATCH] [fix]
bzr revid: hmo@tinyerp.com-20090206050812-y97bk9asy5ww7a88
---
addons/mrp/mrp.py | 3 ++-
addons/sale/sale.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index fd16f22497db..a1a01d087bd0 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -854,7 +854,8 @@ class mrp_procurement(osv.osv):
#
def _quantity_compute_get(self, cr, uid, proc, context={}):
if proc.product_id.type=='product':
- return proc.move_id.product_uos_qty
+ if proc.move_id.product_uos:
+ return proc.move_id.product_uos_qty
return False
def _uom_compute_get(self, cr, uid, proc, context={}):
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 210126fe15fe..735c6bb93250 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -583,7 +583,8 @@ class sale_order(osv.osv):
'product_id': line.product_id.id,
'product_qty': line.product_uom_qty,
'product_uom': line.product_uom.id,
- 'product_uos_qty': line.product_uos_qty,
+ 'product_uos_qty': (line.product_uos and line.product_uos_qty)\
+ or line.product_uom_qty,
'product_uos': (line.product_uos and line.product_uos.id)\
or line.product_uom.id,
'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
--
GitLab