Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/hr/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{
'name': 'Employees',
'version': '1.1',
'version': '1.2',

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the version change here ?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't we supposed to increase the version to trigger the upgrade migration script.

Upgrade scripts are automatically executed by Odoo when upgrading a module if its version number has been bumped.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the version number not changed, you need to check the module version and use it on the upgrade script not the vice,
you supposed to use 1,1 version and update the upgrade script

'category': 'Human Resources/Employees',
'sequence': 95,
'summary': 'Centralize employee information',
Expand Down
13 changes: 3 additions & 10 deletions addons/hr/models/hr_employee.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,13 @@ def _lang_get(self):
}
"""

permit_no = fields.Char('Work Permit No', groups="hr.group_hr_user", tracking=True)
permit_no = fields.Char('Work Permit No', related="version_id.permit_no", readonly=False, groups="hr.group_hr_user", tracking=True)
visa_no = fields.Char('Visa No', groups="hr.group_hr_user", tracking=True)
visa_expire = fields.Date('Visa Expiration Date', groups="hr.group_hr_user", tracking=True)
work_permit_expiration_date = fields.Date('Work Permit Expiration Date', groups="hr.group_hr_user", tracking=True)
work_permit_expiration_date = fields.Date('Work Permit Expiration Date', related="version_id.work_permit_expiration_date", readonly=False, groups="hr.group_hr_user", tracking=True)
has_work_permit = fields.Binary(string="Work Permit", groups="hr.group_hr_user")
work_permit_scheduled_activity = fields.Boolean(default=False, groups="hr.group_hr_user")
work_permit_name = fields.Char('work_permit_name', compute='_compute_work_permit_name', groups="hr.group_hr_user")
work_permit_name = fields.Char('work_permit_name', related="version_id.work_permit_name", groups="hr.group_hr_user")
certificate = fields.Selection(selection='_get_certificate_selection', string='Certificate Level', groups="hr.group_hr_user", tracking=True)
study_field = fields.Char("Field of Study", groups="hr.group_hr_user", tracking=True)
emergency_contact = fields.Char(groups="hr.group_hr_user", tracking=True)
Expand Down Expand Up @@ -1196,13 +1196,6 @@ def _compute_birthday_public_display_string(self):
else:
employee.birthday_public_display_string = "hidden"

@api.depends('name', 'permit_no')
def _compute_work_permit_name(self):
for employee in self:
name = employee.name.replace(' ', '_') + '_' if employee.name else ''
permit_no = '_' + employee.permit_no if employee.permit_no else ''
employee.work_permit_name = "%swork_permit%s" % (name, permit_no)

def _get_partner_count_depends(self):
return ['user_id']

Expand Down
10 changes: 10 additions & 0 deletions addons/hr/models/hr_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ def _get_hr_responsible_domain(self):
tracking=1)
passport_id = fields.Char('Passport No', groups="hr.group_hr_user", tracking=1)
passport_expiration_date = fields.Date('Passport Expiration Date', groups="hr.group_hr_user", tracking=1)
permit_no = fields.Char('Work Permit No', groups="hr.group_hr_user", tracking=1)
work_permit_expiration_date = fields.Date('Work Permit Expiration Date', groups="hr.group_hr_user", tracking=1)
work_permit_name = fields.Char('work_permit_name', compute='_compute_work_permit_name', groups="hr.group_hr_user")
sex = fields.Selection([
('male', 'Male'),
('female', 'Female'),
Expand Down Expand Up @@ -211,6 +214,13 @@ def _get_hr_responsible_domain(self):
'The wage must be a positive value.',
)

@api.depends('employee_id.name', 'permit_no')
def _compute_work_permit_name(self):
for version in self:
name = version.employee_id.name.replace(' ', '_') + '_' if version.employee_id.name else ''
permit_no = '_' + version.permit_no if version.permit_no else ''
version.work_permit_name = "%swork_permit%s" % (name, permit_no)

@api.depends('employee_id.company_id')
def _compute_company_id(self):
for version in self:
Expand Down