Merge lp:~openerp-dev/openobject-addons/6.0-opw-18180-ado into lp:openobject-addons/6.0

[Amit Dodiya (OpenERP)]

Hello ,

"[FIX] Multi currency gives write-off amount while payment"

Thanks,
Amit

Unmerged revisions

4904. By Amit Dodiya (OpenERP) on 2011-11-01

[FIX] Multi currency gives write-off amount while payment

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2011-10-24 07:25:44 +0000
+++ account_voucher/account_voucher.py	2011-11-01 10:07:27 +0000
@@ -151,9 +151,9 @@
     def _compute_writeoff_amount(self, cr, uid, line_dr_ids, line_cr_ids, amount):
         debit = credit = 0.0
         for l in line_dr_ids:
-            debit += l['amount']
+            debit += l['amount_unreconciled']
         for l in line_cr_ids:
-            credit += l['amount']
+            credit += l['amount_unreconciled']
         return abs(amount - abs(credit - debit))
 
     def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount):
@@ -477,9 +477,15 @@
 
         company_currency = journal.company_id.currency_id.id
         if company_currency != currency_id and ttype == 'payment':
-            total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit, context=context_multi_currency)
+            if journal.currency.id == currency_id:
+                total_debit = total_debit
+            else:
+                total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit, context=context_multi_currency)
         elif company_currency != currency_id and ttype == 'receipt':
-            total_credit = currency_pool.compute(cr, uid, currency_id, company_currency, total_credit, context=context_multi_currency)
+            if journal.currency.id == currency_id:
+                total_credit = total_credit
+            else:
+                total_credit = currency_pool.compute(cr, uid, currency_id, company_currency, total_credit, context=context_multi_currency)
 
         for line in moves:
             if line.credit and line.reconcile_partial_id and ttype == 'receipt':
@@ -507,11 +513,17 @@
             }
 
             if line.credit:
-                amount = min(amount_unreconciled, currency_pool.compute(cr, uid, company_currency, currency_id, abs(total_debit), context=context_multi_currency))
+                if journal.currency:
+                    amount = total_debit
+                else:
+                    amount = min(amount_unreconciled, currency_pool.compute(cr, uid, company_currency, currency_id, abs(total_debit), context=context_multi_currency))
                 rs['amount'] = amount
                 total_debit -= amount
             else:
-                amount = min(amount_unreconciled, currency_pool.compute(cr, uid, company_currency, currency_id, abs(total_credit), context=context_multi_currency))
+                if journal.currency:
+                    amount = total_credit
+                else:
+                    amount = min(amount_unreconciled, currency_pool.compute(cr, uid, company_currency, currency_id, abs(total_credit), context=context_multi_currency))
                 rs['amount'] = amount
                 total_credit -= amount