[IMP] hr_attendance,hr_contract,hr_expense_check,hr_payroll,hr_recruitment: changed duplicate field label in the same model
This commit is contained in:
@@ -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')
|
||||
|
||||
|
||||
@@ -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 """
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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.")
|
||||
|
||||
Reference in New Issue
Block a user