[FIX] Account : code improved for move line creation
authorJay (Open ERP) <jvo@tinyerp.com>
Tue, 27 Apr 2010 13:08:18 +0000 (18:38 +0530)
committerJay (Open ERP) <jvo@tinyerp.com>
Tue, 27 Apr 2010 13:08:18 +0000 (18:38 +0530)
lp bug: https://launchpad.net/bugs/570132 fixed

bzr revid: jvo@tinyerp.com-20100427130818-vqf719f629oncybj

addons/account/account_move_line.py

index 4f11432..8ff213f 100644 (file)
@@ -863,14 +863,14 @@ class account_move_line(osv.osv):
         if not ok:
             raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal !'))
 
-        if 'analytic_account_id' in vals and vals['analytic_account_id']:
+        if vals.get('analytic_account_id',False):
             if journal.analytic_journal_id:
                 vals['analytic_lines'] = [(0,0, {
                         'name': vals['name'],
                         'date': vals.get('date', time.strftime('%Y-%m-%d')),
                         'account_id': vals['analytic_account_id'],
-                        'unit_amount':'quantity' in vals and vals['quantity'] or 1.0,
-                        'amount': vals['debit'] or vals['credit'],
+                        'unit_amount': vals.get('quantity',1.0),
+                        'amount': vals.get('debit',0.0) or vals.get('credit',0.0),
                         'general_account_id': vals['account_id'],
                         'journal_id': journal.analytic_journal_id.id,
                         'ref': vals.get('ref', False),