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

[IMP] hr_expense : Improved the code. 

bzr revid: mdi@tinyerp.com-20120713114717-1gg9xygu4ut3nl64
This commit is contained in:
Divyesh Makwana (Open ERP) 2012-07-13 17:17:17 +05:30
parent 9fe6cdd4ee
commit 0fee0b9527
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/hr_expense/hr_expense.py
View File

@ -146,7 +146,7 @@ class hr_expense_expense(osv.osv):
res = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
res_id = res and res[1] or False
return {
'name': _('Purchase Receipt'),
'name': _('Expense Receipt'),
'view_type': 'form',
'view_mode': 'form',
'res_model': 'account.voucher',
@ -169,23 +169,23 @@ class hr_expense_expense(osv.osv):
company_id = exp.company_id.id
lines = []
total = 0.0
for l in exp.line_ids:
if l.product_id:
acc = l.product_id.product_tmpl_id.property_account_expense
for line in exp.line_ids:
if line.product_id:
acc = line.product_id.product_tmpl_id.property_account_expense
if not acc:
acc = l.product_id.categ_id.property_account_expense_categ
acc = line.product_id.categ_id.property_account_expense_categ
else:
acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
if not acc:
raise osv.except_osv(_('Error !'), _('Please configure Default Expense account for Product purchase, `property_account_expense_categ`'))
lines.append((0, False, {
'name': l.name,
'name': line.name,
'account_id': acc.id,
'amount': l.total_amount,
'amount': line.total_amount,
'type': 'dr'
}))
total += l.total_amount
total += line.total_amount
if not exp.employee_id.address_home_id:
raise osv.except_osv(_('Error !'), _('The employee must have a Home address.'))
acc = exp.employee_id.address_home_id.property_account_payable.id
@ -207,9 +207,9 @@ class hr_expense_expense(osv.osv):
journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
if journal_id:
voucher['journal_id'] = journal_id
journal = account_journal.browse(cr, uid, journal_id)
journal = account_journal.browse(cr, uid, journal_id, context=context)
voucher_id = voucher_obj.create(cr, uid, voucher, context)
self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'receipted'})
self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'receipted'}, context=context)
res = voucher_id
return res

12
addons/hr_expense/test/expense_process.yml
View File

@ -17,20 +17,20 @@
!assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Approved state}:
- state == 'accepted'
-
I make Voucher for the expense.
I make Receipt for the expense.
-
!python {model: hr.expense.expense}: |
self.receipt(cr, uid, [ref('sep_expenses')])
-
I check voucher details.
I check receipt details.
-
!python {model: hr.expense.expense}: |
sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
assert sep_expenses.state == 'receipted', "Expense should be in 'Receipted' state."
assert sep_expenses.voucher_id.name == sep_expenses.name,"Voucher name is not correspond with expense name."
assert sep_expenses.voucher_id.type == 'purchase', "Voucher type is not purchase voucher."
assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Voucher total amount is not correspond with expense total."
assert len(sep_expenses.voucher_id.line_dr_ids) == len(sep_expenses.line_ids),"Lines of Voucher and expense line are not correspond."
assert sep_expenses.voucher_id.name == sep_expenses.name,"Receipt name is not correspond with expense name."
assert sep_expenses.voucher_id.type == 'purchase', "Receipt type is not purchase receipt."
assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Receipt total amount is not correspond with expense total."
assert len(sep_expenses.voucher_id.line_dr_ids) == len(sep_expenses.line_ids),"Lines of Receipt and expense line are not correspond."
-
I pay the expenses.