diff --git a/employee_check_list/models/employee_master_inherit.py b/employee_check_list/models/employee_master_inherit.py index de085b1e6..86c3f3f23 100644 --- a/employee_check_list/models/employee_master_inherit.py +++ b/employee_check_list/models/employee_master_inherit.py @@ -44,14 +44,16 @@ class EmployeeMasterInherit(models.Model): entry_checklist = fields.Many2many('employee.checklist', 'entry_obj', 'check_hr_rel', 'hr_check_rel', string='Entry Process', - domain=[('document_type', '=', 'entry')]) + domain=[('document_type', '=', 'entry')], + groups='hr.group_hr_user') exit_checklist = fields.Many2many('employee.checklist', 'exit_obj', 'exit_hr_rel', 'hr_exit_rel', string='Exit Process', - domain=[('document_type', '=', 'exit')]) - entry_progress = fields.Float(compute=entry_progress, string='Entry Progress', store=True, default=0.0) - exit_progress = fields.Float(compute=exit_progress, string='Exit Progress', store=True, default=0.0) - maximum_rate = fields.Integer(default=100) - check_list_enable = fields.Boolean(invisible=True, copy=False) + domain=[('document_type', '=', 'exit')], + groups='hr.group_hr_user') + entry_progress = fields.Float(compute=entry_progress, string='Entry Progress', store=True, default=0.0, groups='hr.group_hr_user') + exit_progress = fields.Float(compute=exit_progress, string='Exit Progress', store=True, default=0.0, groups='hr.group_hr_user') + maximum_rate = fields.Integer(default=100, groups='hr.group_hr_user') + check_list_enable = fields.Boolean(invisible=True, copy=False, groups='hr.group_hr_user') class EmployeeDocumentInherit(models.Model): diff --git a/employee_documents_expiry/models/employee_documents.py b/employee_documents_expiry/models/employee_documents.py index 93b87b672..4fb243500 100644 --- a/employee_documents_expiry/models/employee_documents.py +++ b/employee_documents_expiry/models/employee_documents.py @@ -51,7 +51,7 @@ class HrEmployeeDocument(models.Model): def check_expr_date(self): for each in self: exp_date = each.expiry_date - if exp_date < date.today(): + if exp_date and exp_date < date.today(): raise Warning('Your Document Is Already Expired.') name = fields.Char(string='Document Number', required=True, copy=False) @@ -90,10 +90,10 @@ class HrEmployee(models.Model): Click to Create for New Documents

'''), 'limit': 80, - 'context': "{'default_employee_ref': '%s'}" % self.id + 'context': {'default_employee_ref': self.id} } - document_count = fields.Integer(compute='_document_count', string='# Documents') + document_count = fields.Integer(compute='_document_count', string='# Documents', groups='hr.group_hr_user') class HrEmployeeAttachment(models.Model):