Merge lp:~openerp-dev/openobject-addons/6.1-opw-579172-han into lp:openobject-addons/6.1

[Hardik Ansodariya (OpenERP)]

Hello,

Fixed the issue of journal entry.

When open an existing journal entries and try to update a DEBIT amount. When click on the save icons, an error occur. However, the modification has been saved(From web-client).

With reference of maintenance case: 579172

Kindly review it.

Thanks

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Already Fixed on Trunk (means that it was already fixed and merged in Trunk). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6984. By Hardik Ansodariya (OpenERP) on 2012-09-14

[FIXED] account.py: Fixed the issue of onchange when edit a journal item from journal entries(Maintanace Case: 579172)

=== modified file 'account/account.py'
--- account/account.py	2012-08-28 07:48:35 +0000
+++ account/account.py	2012-09-14 13:18:31 +0000
@@ -1369,7 +1369,7 @@
         balance = 0.0
         for line in line_ids:
             if line[2]:
-                balance += (line[2]['debit'] or 0.00)- (line[2]['credit'] or 0.00)
+                balance += (line[2].get('debit', 0.00)- line[2].get('credit', 0.00))
         return {'value': {'balance': balance}}
 
     def write(self, cr, uid, ids, vals, context=None):