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),