Merge lp:~openerp-dev/openobject-addons/6.0-opw-5186-ach into lp:openobject-addons/6.0

[Anup(SerpentCS)]

Hello,

   When the Paid Amount is less than the Open Balance The writeoff calculated is wrong. This fixes the issue. Please check it and share your views.

Thanks.

[lp:~openerp-dev/openobject-addons/6.0-opw-5186-ach]

4527. By Launchpad Translations on behalf of openerp on 2011-04-15

Launchpad automatic translations update.

4528. By Jay Vora (Serpent Consulting Services) on 2011-04-15

[MERGE] Merged Tejas' branch for the fix of case 5235

4529. By Jay Vora (Serpent Consulting Services) on 2011-04-15

[Merge] Merged Tejas' branch for the fix of lp:753133

4530. By Launchpad Translations on behalf of openerp on 2011-04-16

Launchpad automatic translations update.

4531. By Launchpad Translations on behalf of openerp on 2011-04-17

Launchpad automatic translations update.

4532. By Jay Vora (Serpent Consulting Services) on 2011-04-18

[Merge] Merged the branch for the fix of lp:722538

4533. By Launchpad Translations on behalf of openerp on 2011-04-18

Launchpad automatic translations update.

4534. By Jay Vora (Serpent Consulting Services) on 2011-04-19

[Merge] Merged Anup's branch for the fix of bug lp:725908

4535. By Jay Vora (Serpent Consulting Services) on 2011-04-19

[Merge] Merged main branch

4536. By Launchpad Translations on behalf of openerp on 2011-04-20

Launchpad automatic translations update.

4537. By Jay Vora (Serpent Consulting Services) on 2011-04-20

[MERGE] Merged Chs' branch for the fix of Account : Web client sends values of M2M fields in tuple so converting to list.(Ref : 4346,5340)

[Jay Vora (Serpent Consulting Services) (jayvora)]

Anup,

We need to discuss with Quentin whether this was the intended behavior or not.

Thanks for the fix.

review: Approve

[lp:~openerp-dev/openobject-addons/6.0-opw-5186-ach]

4538. By Jay Vora (Serpent Consulting Services) on 2011-04-21

[MERGE] Merged Anup's branch for the fix of invoice created for analyric lines(case 5267). This also covers the fix for the bug lp:728092. Pricelist calculation corrected

4539. By Jay Vora (Serpent Consulting Services) on 2011-04-21

[REF] HR_timesheet_invoice : Removed unnecesary code(Courtesy : Anup)

4540. By Jay Vora (Serpent Consulting Services) on 2011-04-21

[MERGE] Merged From Parent branch

4541. By Jay Vora (Serpent Consulting Services) on 2011-04-21

[MERGE] Merged Tejas' branch

4542. By Jay Vora (Serpent Consulting Services) on 2011-04-21

[FIX] Stock : Fixed the problem suggested by Buildbot

4543. By Launchpad Translations on behalf of openerp on 2011-04-22

Launchpad automatic translations update.

4544. By Launchpad Translations on behalf of openerp on 2011-04-23

Launchpad automatic translations update.

4545. By Launchpad Translations on behalf of openerp on 2011-04-24

Launchpad automatic translations update.

4546. By Launchpad Translations on behalf of openerp on 2011-04-25

Launchpad automatic translations update.

4547. By Jay Vora (Serpent Consulting Services) on 2011-04-29

[FIX] Lunch : Corrected YAML test, thanks to buildbot

4548. By Jay Vora (Serpent Consulting Services) on 2011-04-29

[FIX] Users_ldap : Corrected YAML Warnings,Thanks to Buildbot

4549. By Jay Vora (Serpent Consulting Services) on 2011-04-29

[Merge] Merged Main branch

4550. By Olivier Dony (Odoo) on 2011-04-30

[MERGE] report_webkit: fixes (mainly UTF8 issues), courtesy of Nicolas Bessi, C2C

4551. By Launchpad Translations on behalf of openerp on 2011-04-30

Launchpad automatic translations update.

4552. By Launchpad Translations on behalf of openerp on 2011-05-01

Launchpad automatic translations update.

4553. By Launchpad Translations on behalf of openerp on 2011-05-02

Launchpad automatic translations update.

4554. By xrg on 2011-05-02

[MERGE] base_crypt: missing import and better check for active users

4555. By Jay Vora (Serpent Consulting Services) on 2011-05-02

[MERGE] Merged Dhruti's branch for the fix on decimal accuracy

4556. By Jay Vora (Serpent Consulting Services) on 2011-05-02

[MERGE] Merged Marco's branch for the fix of lp:718609

4557. By Launchpad Translations on behalf of openerp on 2011-05-03

Launchpad automatic translations update.

4558. By Anup(SerpentCS) on 2011-05-05

[FIX] account_voucher : Writeoff Amount Calculation Corrected

Unmerged revisions

4558. By Anup(SerpentCS) on 2011-05-05

[FIX] account_voucher : Writeoff Amount Calculation Corrected

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2011-01-17 11:20:56 +0000
+++ account_voucher/account_voucher.py	2011-05-05 09:12:55 +0000
@@ -145,9 +145,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):
@@ -163,10 +163,10 @@
         debit = credit = 0.0
         for voucher in self.browse(cr, uid, ids, context=context):
             for l in voucher.line_dr_ids:
-                debit += l.amount
+                debit += l.amount_unreconciled
             for l in voucher.line_cr_ids:
-                credit += l.amount
-            res[voucher.id] =  abs(voucher.amount - abs(credit - debit))
+                credit += l.amount_unreconciled
+            res[voucher.id] = abs(voucher.amount - abs(credit - debit)) 
         return res
 
     _name = 'account.voucher'