From c91d44aef506c36b6f9a8ffcfd1443718a6134ed Mon Sep 17 00:00:00 2001 From: Kinjal Mehta Date: Wed, 6 Dec 2017 12:51:08 +0530 Subject: [PATCH] [IMP] hr_attendance,hr_contract,hr_expense_check,hr_payroll,hr_recruitment: changed duplicate field label in the same model --- addons/hr_attendance/models/hr_employee.py | 2 +- addons/hr_contract/models/hr_contract.py | 2 +- addons/hr_expense_check/models/payment.py | 1 + addons/hr_payroll/models/hr_employee.py | 2 +- addons/hr_recruitment/models/hr_job.py | 6 +++--- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/hr_attendance/models/hr_employee.py b/addons/hr_attendance/models/hr_employee.py index 7eab0eedf64..3f7eee536cf 100644 --- a/addons/hr_attendance/models/hr_employee.py +++ b/addons/hr_attendance/models/hr_employee.py @@ -25,7 +25,7 @@ class HrEmployee(models.Model): attendance_ids = fields.One2many('hr.attendance', 'employee_id', help='list of attendances for the employee') last_attendance_id = fields.Many2one('hr.attendance', compute='_compute_last_attendance_id', store=True) - attendance_state = fields.Selection(string="Attendance", compute='_compute_attendance_state', selection=[('checked_out', "Checked out"), ('checked_in', "Checked in")]) + attendance_state = fields.Selection(string="Attendance Status", compute='_compute_attendance_state', selection=[('checked_out', "Checked out"), ('checked_in', "Checked in")]) manual_attendance = fields.Boolean(string='Manual Attendance', compute='_compute_manual_attendance', inverse='_inverse_manual_attendance', help='The employee will have access to the "My Attendances" menu to check in and out from his session') diff --git a/addons/hr_contract/models/hr_contract.py b/addons/hr_contract/models/hr_contract.py index c58b5d2a917..cef3f5437d3 100644 --- a/addons/hr_contract/models/hr_contract.py +++ b/addons/hr_contract/models/hr_contract.py @@ -21,7 +21,7 @@ class Employee(models.Model): string='Home-Work Dist.', help="In kilometers", groups="hr.group_hr_user") contract_ids = fields.One2many('hr.contract', 'employee_id', string='Contracts') contract_id = fields.Many2one('hr.contract', compute='_compute_contract_id', string='Current Contract', help='Latest contract of the employee') - contracts_count = fields.Integer(compute='_compute_contracts_count', string='Contracts') + contracts_count = fields.Integer(compute='_compute_contracts_count', string='# of Contracts') def _compute_contract_id(self): """ get the lastest contract """ diff --git a/addons/hr_expense_check/models/payment.py b/addons/hr_expense_check/models/payment.py index d2609d63181..857ac4a030d 100644 --- a/addons/hr_expense_check/models/payment.py +++ b/addons/hr_expense_check/models/payment.py @@ -14,6 +14,7 @@ class HrExpenseRegisterPaymentWizard(models.TransientModel): "you can manage the numbering in the journal configuration page.") payment_method_code_2 = fields.Char(related='payment_method_id.code', help="Technical field used to adapt the interface to the payment type selected.", + string="Payment Method Code 2", readonly=True) @api.onchange('journal_id') diff --git a/addons/hr_payroll/models/hr_employee.py b/addons/hr_payroll/models/hr_employee.py index 6d1283e7346..36ddad88bce 100644 --- a/addons/hr_payroll/models/hr_employee.py +++ b/addons/hr_payroll/models/hr_employee.py @@ -9,7 +9,7 @@ class HrEmployee(models.Model): _description = 'Employee' slip_ids = fields.One2many('hr.payslip', 'employee_id', string='Payslips', readonly=True) - payslip_count = fields.Integer(compute='_compute_payslip_count', string='Payslips', groups="hr_payroll.group_hr_payroll_user") + payslip_count = fields.Integer(compute='_compute_payslip_count', string='# of Payslips', groups="hr_payroll.group_hr_payroll_user") @api.multi def _compute_payslip_count(self): diff --git a/addons/hr_recruitment/models/hr_job.py b/addons/hr_recruitment/models/hr_job.py index a5c69d18226..6dc18d47be4 100644 --- a/addons/hr_recruitment/models/hr_job.py +++ b/addons/hr_recruitment/models/hr_job.py @@ -15,15 +15,15 @@ class Job(models.Model): 'res.partner', "Job Location", default=_default_address_id, help="Address where employees are working") application_ids = fields.One2many('hr.applicant', 'job_id', "Applications") - application_count = fields.Integer(compute='_compute_application_count', string="Applications") + application_count = fields.Integer(compute='_compute_application_count', string="# of Applications") manager_id = fields.Many2one( 'hr.employee', related='department_id.manager_id', string="Department Manager", readonly=True, store=True) user_id = fields.Many2one('res.users', "Recruitment Responsible", track_visibility='onchange') hr_responsible_id = fields.Many2one('res.users', "HR Responsible", track_visibility='onchange', help="Person responsible of validating the employee's contracts.") - document_ids = fields.One2many('ir.attachment', compute='_compute_document_ids', string="Applications") - documents_count = fields.Integer(compute='_compute_document_ids', string="Documents") + document_ids = fields.One2many('ir.attachment', compute='_compute_document_ids', string="Documents") + documents_count = fields.Integer(compute='_compute_document_ids', string="# of Documents") alias_id = fields.Many2one( 'mail.alias', "Alias", ondelete="restrict", required=True, help="Email alias for this job position. New emails will automatically create new applicants for this job position.")