Merge lp:~openerp-dev/openobject-addons/trunk-bug-1136373-priyanka into lp:openobject-addons

[Priyanka Jani(OpenERP Trainee)]

Hello,

Issue:Wrong currency on bank statement in multi company setup

This issue is fixes.

Thanks,
priyanka

[Amit Parik (amit-parik)]

Its not proper.

You have to use like this.
currency = statement.journal_id.currency or statement.journal_id.company_id.currency_id

this is the better.

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-1136373-priyanka]

8600. By Priyanka Jani(OpenERP Trainee) on 2013-03-08

[IMP]:add currency of journal_id

8601. By Priyanka Jani(OpenERP Trainee) on 2013-03-13

[MERGE] with trunk

Unmerged revisions

8601. By Priyanka Jani(OpenERP Trainee) on 2013-03-13

[MERGE] with trunk

8600. By Priyanka Jani(OpenERP Trainee) on 2013-03-08

[IMP]:add currency of journal_id

8599. By Priyanka Jani(OpenERP Trainee) on 2013-03-08

[FIX]:addons:Wrong currency on bank statement in multi company setup

=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py	2012-12-20 11:54:56 +0000
+++ account/account_bank_statement.py	2013-03-08 09:08:21 +0000
@@ -73,9 +73,7 @@
         default_currency = res_users_obj.browse(cursor, user,
                 user, context=context).company_id.currency_id
         for statement in self.browse(cursor, user, ids, context=context):
-            currency = statement.journal_id.currency
-            if not currency:
-                currency = default_currency
+            currency = statement.journal_id.currency or statement.journal_id.company_id.currency_id
             res[statement.id] = currency.id
         currency_names = {}
         for currency_id, currency_name in res_currency_obj.name_get(cursor,