diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 81391e796b9..4d0a73cb4d3 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -150,7 +150,7 @@
             <field name="arch" type="xml">
                 <form string="Supplier invoice">
                     <group col="8" colspan="4">
-                        <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
+                        <field domain="[('type', '=', 'purchase')]" name="journal_id" on_change="onchange_journal_id(journal_id, company_id)"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
@@ -260,7 +260,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice">
                     <group colspan="4" col="8">
-                    <field name="journal_id" groups="base.group_user"/>
+                    <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, company_id)"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
                     <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 44a57c2e11d..0c0941c715a 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -452,6 +452,24 @@ class account_invoice(osv.osv):
                         _('Can not select currency that is not related to current company.\nPlease select accordingly !.'))
         return {}
 
+    def onchange_journal_id(self, cr, uid, ids, journal_id, company_id):
+        result = {}
+        if journal_id and company_id:
+            company = self.pool.get('res.company').browse(cr, uid, company_id)
+            journal_id = self.pool.get('account.journal').browse(cr, uid, journal_id)
+            if journal_id.currency:
+                result = {'value': {
+                    'currency_id': journal_id.currency.id
+                    }
+                }
+            else:
+                result = {'value': {
+                    'currency_id': company.currency_id.id
+                    }
+                }
+                
+        return result
+
     def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
         if not payment_term_id:
             return {}