diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index bc68736b48e..84d0b6192eb 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -247,9 +247,12 @@ - - - + + + + + + diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index b913cc0b2f1..e361482b28e 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -211,7 +211,7 @@ class one2many_mod2(fields.one2many): class hr_payslip_run(osv.osv): _name = 'hr.payslip.run' - _description = 'Payslip Run' + _description = 'Payslip Batches' _columns = { 'name': fields.char('Name', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}), 'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True, states={'draft': [('readonly', False)]}), @@ -286,7 +286,7 @@ class hr_payslip(osv.osv): 'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}), 'details_by_salary_rule_category': fields.function(_get_lines_salary_rule_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Rule Category'), 'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another", readonly=True, states={'draft': [('readonly', False)]}), - 'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Run', readonly=True, states={'draft': [('readonly', False)]}), + 'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Batches', readonly=True, states={'draft': [('readonly', False)]}), } _defaults = { 'date_from': lambda *a: time.strftime('%Y-%m-01'), diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index aa97ad9503a..01fe270710d 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -392,7 +392,7 @@ - + @@ -684,9 +684,9 @@ hr.payslip.run search - - - + + + @@ -700,7 +700,7 @@ hr.payslip.run tree - + @@ -715,7 +715,7 @@ hr.payslip.run form -
+ @@ -738,7 +738,7 @@ - Payslips Run + Payslips Batches hr.payslip.run form