[IMP] hr_expense: added store={..} on total amount field of hr.expense
bzr revid: qdp-launchpad@openerp.com-20130418123145-62xp6tzxom3lbcqw
This commit is contained in:
@@ -52,6 +52,9 @@ class hr_expense_expense(osv.osv):
|
||||
res[expense.id] = total
|
||||
return res
|
||||
|
||||
def _get_expense_from_line(self, cr, uid, ids, context=None):
|
||||
return [line.expense_id.id for line in self.pool.get('hr.expense.line').browse(cr, uid, ids, context=context)]
|
||||
|
||||
def _get_currency(self, cr, uid, context=None):
|
||||
user = self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0]
|
||||
if user.company_id:
|
||||
@@ -84,7 +87,10 @@ class hr_expense_expense(osv.osv):
|
||||
'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
|
||||
'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
|
||||
'note': fields.text('Note'),
|
||||
'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account')),
|
||||
'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account'),
|
||||
store={
|
||||
'hr.expense.line': (_get_expense_from_line, ['unit_amount','unit_quantity'], 10)
|
||||
}),
|
||||
'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
|
||||
'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
|
||||
'company_id': fields.many2one('res.company', 'Company', required=True),
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
<field name="user_id" invisible="1"/>
|
||||
<field name="name"/>
|
||||
<field name="currency_id" groups="base.group_multi_currency"/>
|
||||
<field name="amount"/>
|
||||
<field name="amount" sum="Total Expenses"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
</field>
|
||||
|
||||
Reference in New Issue
Block a user