diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py index 52f155a8e9e..42ee7f7bda6 100644 --- a/addons/hr_expense/report/hr_expense_report.py +++ b/addons/hr_expense/report/hr_expense_report.py @@ -39,11 +39,11 @@ class hr_expense_report(osv.osv): 'product_id':fields.many2one('product.product', 'Product', readonly=True), 'journal_id': fields.many2one('account.journal', 'Force Journal', readonly=True), 'product_qty':fields.float('Qty', readonly=True), - 'invoiced':fields.integer('# of Invoiced Lines', readonly=True), + 'receipted':fields.integer('# of Receipted Lines', readonly=True), 'employee_id': fields.many2one('hr.employee', "Employee's Name", readonly=True), 'date_confirm': fields.date('Confirmation Date', readonly=True), 'date_valid': fields.date('Validation Date', readonly=True), - 'voucher_id': fields.many2one('account.voucher', 'Voucher', readonly=True), + 'voucher_id': fields.many2one('account.voucher', 'Receipt', readonly=True), 'department_id':fields.many2one('hr.department','Department', readonly=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), 'user_id':fields.many2one('res.users', 'Validation User', readonly=True), @@ -60,7 +60,7 @@ class hr_expense_report(osv.osv): ('draft', 'Draft'), ('confirm', 'Waiting confirmation'), ('accepted', 'Accepted'), - ('invoiced', 'Invoiced'), + ('receipted', 'Receipted'), ('paid', 'Reimbursed'), ('cancelled', 'Cancelled')], 'Status', readonly=True), @@ -79,7 +79,7 @@ class hr_expense_report(osv.osv): to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm, to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid, s.voucher_id, - count(s.voucher_id) as invoiced, + count(s.voucher_id) as receipted, s.user_valid as user_id, s.department_id, to_char(date_trunc('day',s.create_date), 'YYYY') as year, diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index bfd73f8ed7d..1800f75ee3b 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -7,7 +7,7 @@ hr.expense.report tree - + @@ -23,7 +23,7 @@ - + @@ -56,8 +56,8 @@ help = "Confirm Expenses"/> - +