diff --git a/addons/hr_expense/__terp__.py b/addons/hr_expense/__terp__.py index f21f330df10..fc50f607b2a 100644 --- a/addons/hr_expense/__terp__.py +++ b/addons/hr_expense/__terp__.py @@ -9,7 +9,7 @@ "init_xml" : [], "demo_xml" : [], #"demo_xml" : ["hr_expense_demo.xml", "hr.expense.expense.csv"], - "update_xml" : ["hr_expense_workflow.xml", "hr_expense_view.xml", "hr_expense_report.xml"], + "update_xml" : ["hr_expense_sequence.xml", "hr_expense_workflow.xml", "hr_expense_view.xml", "hr_expense_report.xml",], "active": False, "installable": True } diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index bcf569da019..e5c8ac47099 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -135,7 +135,7 @@ class hr_expense_expense(osv.osv): acc = exp.employee_id.address_id.partner_id.property_account_payable[0] inv = { 'name': exp.name, - 'reference': "EMP%dEXP%d" % (exp.employee_id.id, exp.id), + 'reference': self.pool.get('ir.sequence').get(cr, uid, 'hr.expense.invoice'), 'account_id': acc, 'type': 'in_invoice', 'partner_id': exp.employee_id.address_id.partner_id.id, @@ -144,8 +144,9 @@ class hr_expense_expense(osv.osv): 'origin': exp.name, 'invoice_line': lines, 'price_type': 'tax_included', - 'journal_id': exp.journal_id and exp.journal_id.id or False, } + if exp.journal_id: + inv['journal_id']=exp.journal_id.id inv_id = self.pool.get('account.invoice').create(cr, uid, inv, {'type':'in_invoice'}) self.write(cr, uid, [exp.id], {'invoice_id': inv_id, 'state': 'invoiced'}) res = inv_id diff --git a/addons/hr_expense/hr_expense_sequence.xml b/addons/hr_expense/hr_expense_sequence.xml new file mode 100644 index 00000000000..ad402853eab --- /dev/null +++ b/addons/hr_expense/hr_expense_sequence.xml @@ -0,0 +1,15 @@ + + + + + Expense invoice + hr.expense.invoice + + + Expense invoice + hr.expense.invoice + EXP/ + 3 + + + diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml index cbffb7cfb67..fc00b362e81 100644 --- a/addons/hr_expense/hr_expense_workflow.xml +++ b/addons/hr_expense/hr_expense_workflow.xml @@ -8,6 +8,10 @@ Human Resources - Expenses + + Human Resources - Expenses invoice + + @@ -100,7 +104,7 @@ invoice - +