openerp-dev-web team mailing list archive

["Jay Vora \(OpenERP\)" <jvo@xxxxxxxxxxx>]

Jay Vora (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-opw-5582-jvo into lp:openobject-addons/6.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #772451 in OpenERP Addons: "[6.0.2 rev 4591/4592] TypeError: 'int' object is unsubscriptable"
  https://bugs.launchpad.net/openobject-addons/+bug/772451

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5582-jvo/+merge/60203
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5582-jvo/+merge/60203
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5582-jvo.

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2011-01-20 14:02:14 +0000
+++ account/account_move_line.py	2011-05-06 15:23:24 +0000
@@ -226,11 +226,14 @@
         # Starts: Manual entry from account.move form
         if context.get('lines',[]):
             total_new = 0.00
-            for i in context['lines']:
-                if i[2]:
-                    total_new += (i[2]['debit'] or 0.00)- (i[2]['credit'] or 0.00)
-                    for item in i[2]:
-                            data[item] = i[2][item]
+            for line_record in context['lines']:
+                if not isinstance(line_record, (tuple, list)):
+                    line_record_detail = self.read(cr, uid, line_record, ['analytic_account_id','debit','credit','name','reconcile_id','tax_code_id','tax_amount','account_id','ref','currency_id','date_maturity','amount_currency','partner_id', 'reconcile_partial_id'])
+                else:
+                    line_record_detail = line_record[2]
+                total_new += (line_record_detail['debit'] or 0.00)- (line_record_detail['credit'] or 0.00)
+                for item in line_record_detail.keys():
+                    data[item] = line_record_detail[item]
             if context['journal']:
                 journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
                 if journal_data.type == 'purchase':