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

Proposed by Stéphane Bidoul (Acsone)
Status: Needs review
Proposed branch: lp:~sbi/openobject-addons/6.1-bug1047884
Merge into: lp:openobject-addons/6.1
Diff against target: 14 lines (+2/-0)
1 file modified
account/account_invoice.py (+2/-0)
To merge this branch: bzr merge lp:~sbi/openobject-addons/6.1-bug1047884
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+123421@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

6982. By Stéphane Bidoul (Acsone)

create invoice: changing journal changes company too

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_invoice.py'
2--- account/account_invoice.py 2012-08-20 15:52:57 +0000
3+++ account/account_invoice.py 2012-09-08 15:38:24 +0000
4@@ -480,8 +480,10 @@
5 if journal_id:
6 journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
7 currency_id = journal.currency and journal.currency.id or journal.company_id.currency_id.id
8+ company_id = journal.company_id.id
9 result = {'value': {
10 'currency_id': currency_id,
11+ 'company_id': company_id,
12 }
13 }
14 return result