[MERGE] lp881356

lp bug: https://launchpad.net/bugs/881356 fixed

bzr revid: qdp-launchpad@openerp.com-20120215171625-i3zf4nhhjuz82bob

diff --cc addons/sale/sale.py
Simple merge

diff --cc addons/stock/stock.py
index d538dfb,8826079..4c8134c
--- 1/addons/stock/stock.py
--- 2/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -442,9 -455,11 +447,9 @@@ class stock_location(osv.osv)
              total = 0.0
              results2 = 0.0
              for r in results:
-                 amount = self.pool.get('product.uom')._compute_qty(cr, uid, r['product_uom'], r['product_qty'], context.get('uom', False))
+                 amount = uom_obj._compute_qty(cr, uid, r['product_uom'], r['product_qty'], context.get('uom', False))
                  results2 += amount
                  total += amount
 -
              if total <= 0.0:
                  continue