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

[MERGE]Merge with parent branch 

bzr revid: mma@tinyerp.com-20120816053002-1e25xdayfldq7hqr
This commit is contained in:
Mayur Maheshwari (OpenERP) 2012-08-16 11:00:02 +05:30
parent fdac923424 049e8a12f0
commit 6accc69e56
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_expense/hr_expense.py
View File

@ -77,7 +77,7 @@ class hr_expense_expense(osv.osv):
'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')),
'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
'voucher_id': fields.many2one('account.voucher', "Employee's Receipt"),
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
'department_id':fields.many2one('hr.department','Department'),
'company_id': fields.many2one('res.company', 'Company', required=True),