[MERGE] forward port of branch 7.0 up to 922a52d

[odoo/odoo.git] / addons / purchase / stock.py

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index c211f39..bae6d1c 100644 (file)
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -30,7 +30,6 @@ class stock_move(osv.osv):
             readonly=True),
     }
 
-stock_move()
 
 #
 # Inherit of picking to add the link to the PO
@@ -72,7 +71,7 @@ class stock_picking(osv.osv):
 
     def get_currency_id(self, cursor, user, picking):
         if picking.purchase_id:
-            return picking.purchase_id.pricelist_id.currency_id.id
+            return picking.purchase_id.currency_id.id
         else:
             return super(stock_picking, self).get_currency_id(cursor, user, picking)