Merge lp:~openerp-dev/openobject-addons/5.0-opw-7285-pso into lp:openobject-addons/5.0

[Priyesh (OpenERP)]

Hello,

Improved balance computation of bank statement for multi-currency (case:7285)

To reproduce:
1. Currency of Bank Journal = ARS, Company currency = EUR
2. Create a Bank statement (so it's currency = ARS)
3. Create a start balance = 0 ans end balance = 100
4. Create entry lines: First line with 20, and second line with 80 (so these amounts are in ARS)
5. Confirm the bank Statement
6. The Balance will be correct (100), and on Real entries tab, you'll lines with amounts converted in EUR
7. Now change the ARS rate (date = today)
8. Go back to the Confirmed Bank Statement and reload it, you'll face the problem that the Balance changed...so the balance is now not correct anymore

Thanks,
Priyesh

[Raphael Collet (OpenERP) (rco-openerp)]

I have reworked a bit the code.
This also fixes a missing test on line.account_id when adding line.amount_currency.
Quentin should review this one...

[qdp (OpenERP) (qdp)]

Seems correct, but i didn't run it or tried with a real instance. I guess it's good to be merged if you did so.

as discussed, it should be a good idea to also include:
- a check that raises an error if the statement's journal and its default accounts don't share the same configuration for secondary currency.
- a domain in the account.move.line m2m of bank statements when going by "periodical processing \ bank reconciliation \ .." in order to make sure that people encode there only accounting entries with a correct secondary currency set.

Thanks,
Quentin

review: Approve

[Raphael Collet (OpenERP) (rco-openerp)]

Use case tested with success.

review: Approve

=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py	2010-11-04 15:09:45 +0000
+++ account/account_bank_statement.py	2011-09-20 08:23:52 +0000
@@ -55,23 +55,21 @@
         statements = self.browse(cursor, user, ids, context=context)
         for statement in statements:
             res[statement.id] = statement.balance_start
-            currency_id = statement.currency.id
+            stmt_currency_id = statement.currency.id
+            stmt_account_ids = (statement.journal_id.default_debit_account_id.id,
+                                statement.journal_id.default_credit_account_id.id)
+            # add debits and credits of move lines related to the statement's journal
             for line in statement.move_line_ids:
-                if line.debit > 0:
-                    if line.account_id.id == \
-                            statement.journal_id.default_debit_account_id.id:
-                        res[statement.id] += res_currency_obj.compute(cursor,
-                                user, company_currency_id, currency_id,
-                                line.debit, context=context)
-                else:
-                    if line.account_id.id == \
-                            statement.journal_id.default_credit_account_id.id:
-                        res[statement.id] -= res_currency_obj.compute(cursor,
-                                user, company_currency_id, currency_id,
-                                line.credit, context=context)
+                if line.account_id.id in stmt_account_ids:
+                    if stmt_currency_id == company_currency_id:
+                        res[statement.id] += line.debit - line.credit
+                    else:
+                        res[statement.id] += line.amount_currency
+            # add amounts of statement lines with no corresponding move lines
             if statement.state == 'draft':
                 for line in statement.line_ids:
                     res[statement.id] += line.amount
+        
         for r in res:
             res[r] = round(res[r], 2)
         return res