merge

bzr revid: fp@tinyerp.com-20110917125924-ggm0l84ek3um1pfs
2011-09-17 14:59:24 +02:00
parent 9f2cbb0bbc ff90f21812
commit bb649b920a
1 changed files with 4 additions and 1 deletions
@@ -91,7 +91,10 @@ class stock_picking(osv.osv):

    def _get_price_unit_invoice(self, cursor, user, move_line, type):
        if move_line.purchase_line_id:
-            return move_line.purchase_line_id.price_unit
+            if move_line.purchase_line_id.order_id.invoice_method == 'picking':
+                return move_line.price_unit
+            else:
+                return move_line.purchase_line_id.price_unit
        return super(stock_picking, self)._get_price_unit_invoice(cursor, user, move_line, type)

    def _get_discount_invoice(self, cursor, user, move_line):