odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

*added a hook at the end of default_get on account_move_line manual entry by account_move form, in order to be able to inherit it in other modules (like 

acount_analytic_plans)
*minor bugfix: error occured when tax had no account_account specified

bzr revid: qdp@tinyerp.com-20081126134824-qf7msdiuze9hqv0r
This commit is contained in:
qdp 2008-11-26 14:48:24 +01:00
parent fe565b9f0a
commit 26a3a70ab1
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/account/account_move_line.py
View File

@ -76,6 +76,14 @@ class account_move_line(osv.osv):
new_id = self.pool.get('account.analytic.line').create(cr,uid,vals_lines)
return True
def _default_get_move_form_hook(self, cursor, user, data):
'''Called in the end of default_get method for manual entry in account_move form'''
if data.has_key('analytic_account_id'):
del(data['analytic_account_id'])
if data.has_key('account_tax_id'):
del(data['account_tax_id'])
return data
def _default_get(self, cr, uid, fields, context={}):
# Compute simple values
data = super(account_move_line, self).default_get(cr, uid, fields, context)
@ -104,8 +112,7 @@ class account_move_line(osv.osv):
s = -total_new
data['debit'] = s>0 and s or 0.0
data['credit'] = s<0 and -s or 0.0
del(data['analytic_account_id'])
del(data['account_tax_id'])
data = self._default_get_move_form_hook(cr, uid, data)
return data
# Ends: Manual entry from account.move form
@ -883,7 +890,7 @@ class account_move_line(osv.osv):
'account_tax_id': False,
'tax_code_id': tax[tax_code],
'tax_amount': tax[tax_sign] * abs(tax['amount']),
'account_id': tax[account_id],
'account_id': tax[account_id] or vals['account_id'],
'credit': tax['amount']<0 and -tax['amount'] or 0.0,
'debit': tax['amount']>0 and tax['amount'] or 0.0,
}