diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index ec149cbac15..7fa4ce2fb7f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -546,7 +546,7 @@ class purchase_order(osv.osv):
                 'account_id': pay_acc_id,
                 'type': 'in_invoice',
                 'partner_id': order.partner_id.id,
-                'currency_id': order.pricelist_id.currency_id.id,
+                'currency_id': order.currency_id.id,
                 'journal_id': len(journal_ids) and journal_ids[0] or False,
                 'invoice_line': [(6, 0, inv_lines)],
                 'origin': order.name,
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index f97d82a8456..a46162edaf1 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -64,6 +64,7 @@ class purchase_line_invoice(osv.osv_memory):
 
 
             def make_invoice_by_partner(partner, orders, lines_ids):
+                
                 """
                     create a new invoice for one supplier
                     @param partner : The object partner
@@ -83,7 +84,7 @@ class purchase_line_invoice(osv.osv_memory):
                     'account_id': a,
                     'partner_id': partner.id,
                     'invoice_line': [(6,0,lines_ids)],
-                    'currency_id' : orders[0].pricelist_id.currency_id.id,
+                    'currency_id' : orders[0].currency_id.id,
                     'comment': multiple_order_invoice_notes(orders),
                     'payment_term': orders[0].payment_term_id.id,
                     'fiscal_position': partner.property_account_position.id
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 062ca599eb0..d519db7e02a 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -385,7 +385,7 @@ class sale_order(osv.osv):
             'partner_id': order.partner_invoice_id.id,
             'journal_id': journal_ids[0],
             'invoice_line': [(6, 0, lines)],
-            'currency_id': order.pricelist_id.currency_id.id,
+            'currency_id': order.currency_id.id,
             'comment': order.note,
             'payment_term': order.payment_term and order.payment_term.id or False,
             'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,