diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index fd16f22497dbfa772fccde15b7f41cb4b042e8eb..a1a01d087bd0525e7ac87ad8a3596fda2cbe7d5d 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 210126fe15fede1720cdb2453307960d29513e29..735c6bb9325077029241a40003c59a084e9bfab8 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,