diff --git a/ohrms_core/__manifest__.py b/ohrms_core/__manifest__.py index 30928e7a0..d96844c73 100644 --- a/ohrms_core/__manifest__.py +++ b/ohrms_core/__manifest__.py @@ -22,7 +22,7 @@ ################################################################################### { 'name': 'Open HRMS Core', - 'version': '10.0.2.0.0', + 'version': '10.0.3.0.0', 'summary': """Open HRMS Suit: It brings all Open HRMS modules""", 'description': 'Main module of Open HRMS. It brings all others into a single module', 'category': 'Generic Modules/Human Resources', diff --git a/ohrms_core/doc/RELEASE_NOTES.md b/ohrms_core/doc/RELEASE_NOTES.md index bd459b2b9..90a407f12 100644 --- a/ohrms_core/doc/RELEASE_NOTES.md +++ b/ohrms_core/doc/RELEASE_NOTES.md @@ -1,5 +1,10 @@ ## Module +#### 09.04.2018 +#### Version 10.0.3.0.0 +##### ADD +- Added additional fields in settings. + #### 31.03.2018 #### Version 10.0.2.0.0 ##### CHG diff --git a/ohrms_core/models/hr_general_settings.py b/ohrms_core/models/hr_general_settings.py index c37bad5e9..c56e5966d 100644 --- a/ohrms_core/models/hr_general_settings.py +++ b/ohrms_core/models/hr_general_settings.py @@ -59,4 +59,93 @@ class OHRMSConfiguration(models.TransientModel): string='Manage biometric device (Model: ZKteco uFace 202) integration with HR attendance (Face + Thumb)', help='Helps you to manage Biometric Device Integration.\n' '- This installs the module Biometric Device Integration.') + test_module_hr_custody = fields.Boolean(default=False, invisible=True) + test_oh_employee_check_list = fields.Boolean(default=False, invisible=True) + test_module_hr_employee_shift = fields.Boolean(default=False, invisible=True) + test_module_hr_insurance = fields.Boolean(default=False, invisible=True) + test_module_oh_hr_lawsuit_management = fields.Boolean(default=False, invisible=True) + test_module_hr_resignation = fields.Boolean(default=False, invisible=True) + test_module_hr_vacation_mngmt = fields.Boolean(default=False, invisible=True) + test_module_oh_hr_zk_attendance = fields.Boolean(default=False, invisible=True) + + @api.onchange('module_hr_custody') + def onchange_module_hr_custody(self): + for each in self: + if each.module_hr_custody: + if not self.env['ir.module.module'].search([('name', '=', 'hr_custody')]): + each.test_module_hr_custody = True + each.module_hr_custody = False + else: + each.test_module_hr_custody = False + + @api.onchange('module_oh_employee_check_list') + def onchange_module_oh_employee_check_list(self): + for each in self: + if each.module_oh_employee_check_list: + if not self.env['ir.module.module'].search([('name', '=', 'oh_employee_check_list')]): + each.test_oh_employee_check_list = True + each.module_oh_employee_check_list = False + else: + each.test_oh_employee_check_list = False + + @api.onchange('module_hr_employee_shift') + def onchange_module_hr_employee_shift(self): + for each in self: + if each.module_hr_employee_shift: + if not self.env['ir.module.module'].search([('name', '=', 'hr_employee_shift')]): + each.test_module_hr_employee_shift = True + each.module_hr_employee_shift = False + else: + each.test_module_hr_employee_shift = False + + @api.onchange('module_hr_insurance') + def onchange_module_hr_insurance(self): + for each in self: + if each.module_hr_insurance: + if not self.env['ir.module.module'].search([('name', '=', 'hr_insurance')]): + each.test_module_hr_insurance = True + each.module_hr_insurance = False + else: + each.test_module_hr_insurance = False + + @api.onchange('module_oh_hr_lawsuit_management') + def onchange_module_oh_hr_lawsuit_management(self): + for each in self: + if each.module_oh_hr_lawsuit_management: + if not self.env['ir.module.module'].search([('name', '=', 'oh_hr_lawsuit_management')]): + each.test_module_oh_hr_lawsuit_management = True + each.module_oh_hr_lawsuit_management = False + else: + each.test_module_oh_hr_lawsuit_management = False + + @api.onchange('module_hr_resignation') + def onchange_module_hr_resignation(self): + for each in self: + if each.module_hr_resignation: + if not self.env['ir.module.module'].search([('name', '=', 'hr_resignation')]): + each.test_module_hr_resignation = True + each.module_hr_resignation = False + else: + each.test_module_hr_resignation = False + + @api.onchange('module_hr_vacation_mngmt') + def onchange_module_hr_vacation_mngmt(self): + for each in self: + if each.module_hr_vacation_mngmt: + if not self.env['ir.module.module'].search([('name', '=', 'hr_vacation_mngmt')]): + each.test_module_hr_vacation_mngmt = True + each.module_hr_vacation_mngmt = False + else: + each.test_module_hr_vacation_mngmt = False + + @api.onchange('module_oh_hr_zk_attendance') + def onchange_module_oh_hr_zk_attendance(self): + for each in self: + if each.module_oh_hr_zk_attendance: + if not self.env['ir.module.module'].search([('name', '=', 'oh_hr_zk_attendance')]): + each.test_module_oh_hr_zk_attendance = True + each.module_oh_hr_zk_attendance = False + else: + each.test_module_oh_hr_zk_attendance = False + diff --git a/ohrms_core/static/description/index.html b/ohrms_core/static/description/index.html index c68bc493b..6b3861c39 100644 --- a/ohrms_core/static/description/index.html +++ b/ohrms_core/static/description/index.html @@ -12,7 +12,6 @@ - @@ -274,7 +273,7 @@
- +
diff --git a/ohrms_core/static/description/personal_info.png b/ohrms_core/static/description/personal_info.png new file mode 100644 index 000000000..3c9901c4b Binary files /dev/null and b/ohrms_core/static/description/personal_info.png differ diff --git a/ohrms_core/views/hr_config_view.xml b/ohrms_core/views/hr_config_view.xml index 6c514d296..48fc47e13 100644 --- a/ohrms_core/views/hr_config_view.xml +++ b/ohrms_core/views/hr_config_view.xml @@ -6,6 +6,14 @@
+
@@ -15,41 +23,89 @@