diff options
| author | Yannick Tivisse <yti@odoo.com> | 2019-09-19 10:54:17 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-09-23 07:56:12 +0000 |
| commit | cb55db51b7dfe1dc126393a8a0297f045936a84c (patch) | |
| tree | 502bb984b13a2685534f457e5d226869bec306bb /addons | |
| parent | 39ebe4094e8ac4df0bdf1e39da034eebde4d33b1 (diff) | |
[FIX] hr,hr_presence: Correctly retrieve config parameters values
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/hr/models/hr_employee_base.py | 4 | ||||
| -rw-r--r-- | addons/hr_presence/models/hr_employee.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/addons/hr/models/hr_employee_base.py b/addons/hr/models/hr_employee_base.py index b1b5acf3f3d..aa8627a6c51 100644 --- a/addons/hr/models/hr_employee_base.py +++ b/addons/hr/models/hr_employee_base.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. +from ast import literal_eval + from odoo import api, fields, models from pytz import timezone, UTC from odoo.tools import format_time @@ -45,7 +47,7 @@ class HrEmployeeBase(models.AbstractModel): presence criterions. e.g. hr_attendance, hr_holidays """ # Check on login - check_login = self.env['ir.config_parameter'].sudo().get_param('hr.hr_presence_control_login') + check_login = literal_eval(self.env['ir.config_parameter'].sudo().get_param('hr.hr_presence_control_login', 'False')) for employee in self: state = 'to_define' if check_login: diff --git a/addons/hr_presence/models/hr_employee.py b/addons/hr_presence/models/hr_employee.py index 635341c06d2..03111b39e21 100644 --- a/addons/hr_presence/models/hr_employee.py +++ b/addons/hr_presence/models/hr_employee.py @@ -3,6 +3,7 @@ import logging +from ast import literal_eval from odoo import fields, models, _, api from odoo.exceptions import UserError from odoo.fields import Datetime @@ -51,7 +52,7 @@ class Employee(models.AbstractModel): # Check on IP - if self.env['ir.config_parameter'].sudo().get_param('hr_presence.hr_presence_control_ip'): + if literal_eval(self.env['ir.config_parameter'].sudo().get_param('hr.hr_presence_control_ip', 'False')): ip_list = company.hr_presence_control_ip_list ip_list = ip_list.split(',') if ip_list else [] ip_employees = self.env['hr.employee'] @@ -67,7 +68,7 @@ class Employee(models.AbstractModel): employees = employees - ip_employees # Check on sent emails - if self.env['ir.config_parameter'].sudo().get_param('hr_presence.hr_presence_control_email'): + if literal_eval(self.env['ir.config_parameter'].sudo().get_param('hr.hr_presence_control_email', 'False')): email_employees = self.env['hr.employee'] threshold = company.hr_presence_control_email_amount for employee in employees: |