From 39c5e97588bf02d331b9fb426f41b36c29a30c6c Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Wed, 26 Feb 2014 12:23:42 +0100 Subject: [PATCH] [FIX] uom compare bzr revid: jco@openerp.com-20140226112342-n702mbth1wfv4e7s --- addons/purchase/test/ui/duplicate_order.yml | 2 +- addons/stock/stock.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/purchase/test/ui/duplicate_order.yml b/addons/purchase/test/ui/duplicate_order.yml index d49cec22d73..c53e4900e5f 100644 --- a/addons/purchase/test/ui/duplicate_order.yml +++ b/addons/purchase/test/ui/duplicate_order.yml @@ -4,4 +4,4 @@ I duplicate order. - !python {model: purchase.order}: | - self.copy(cr, uid, ref('purchase_order_1'), context) + self.copy(cr, uid, ref('purchase_order_1'), context) \ No newline at end of file diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 84abe210a25..9b8a79df76b 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1598,12 +1598,12 @@ class stock_move(osv.osv): for move in self.browse(cr, uid, ids, context=context): #Check UoM in meantime if vals.get('product_uom') or vals.get('product_id'): - product_uom = move.product_uom + product_uom = move.product_id.uom_id move_uom = move.product_uom if vals.get('product_uom'): move_uom = self.pool.get('product.uom').browse(cr, uid, vals['product_uom'], context=context) if vals.get('product_id'): - product_uom = self.pool.get('product.product').browse(cr, uid, vals['product_id'], context=context) + product_uom = self.pool.get('product.product').browse(cr, uid, vals['product_id'], context=context).uom_id if move_uom.category_id.id != product_uom.category_id.id: raise osv.except_osv(_('Operation Forbidden'), _('Category of Product UoM must be the same as the category of the UoM of the move'))