Merge lp:~sbi/openobject-addons/6.1-bug1047884 into lp:openobject-addons/6.1

[Stéphane Bidoul (Acsone)]

Unmerged revisions

6982. By Stéphane Bidoul (Acsone) on 2012-09-08

create invoice: changing journal changes company too

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-08-20 15:52:57 +0000
+++ account/account_invoice.py	2012-09-08 15:38:24 +0000
@@ -480,8 +480,10 @@
         if journal_id:
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
             currency_id = journal.currency and journal.currency.id or journal.company_id.currency_id.id
+            company_id = journal.company_id.id
             result = {'value': {
                     'currency_id': currency_id,
+                    'company_id': company_id,
                     }
                 }
         return result