From d882830f01809affa5168788653bd6bc21e2c368 Mon Sep 17 00:00:00 2001 From: younes Date: Mon, 4 Aug 2025 09:34:41 +0100 Subject: [PATCH 1/2] [FIX] issue with permission remaining balance check in mobile app --- .../odex_mobile/controllers/rest_api_v2/permission.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py b/odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py index 4f8af0675..17f4c2c10 100644 --- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py +++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py @@ -380,8 +380,7 @@ class PermissionController(http.Controller): success=False) try: permission_type_id = http.request.env['hr.personal.permission.type'].browse(int(body.get('permission_type_id'))) - permission_hours = self.permission_number_decrement(employee, body['date_from'], body['date_to'], - permission_type_id) + permission_hours = self.permission_number_decrement(employee, body['date_from'], body['date_to'],permission_type_id) return http_helper.response(message="Data Found", data={'balance': permission_hours, 'permission_limit': permission_type_id.daily_hours}) @@ -398,8 +397,7 @@ class PermissionController(http.Controller): def permission_number_decrement(self, employee_id, permission_date_from, permission_date_to, permission_type_id): if employee_id: if not employee_id.first_hiring_date: - raise Warning( - _('You can not Request Permission The Employee have Not First Hiring Date')) + raise Warning(_('You can not Request Permission The Employee have Not First Hiring Date')) if permission_date_to: current_date = datetime.strptime(permission_date_to, DEFAULT_SERVER_DATETIME_FORMAT) current_month = current_date.month @@ -427,8 +425,7 @@ class PermissionController(http.Controller): permission_date_to, DEFAULT_SERVER_DATETIME_FORMAT).date() if permission_date1 == date_to_value1: - raise Warning( - _('Sorry You Have Used All Your Permission In This Day you have one permission per a Day')) + raise Warning(_('Sorry You Have Used All Your Permission In This Day you have one permission per a Day')) if number_of_per > all_perission: return round(number_of_per - all_perission, 2) From a7a37f97fd0af877492aa85855dd509ed5310a91 Mon Sep 17 00:00:00 2001 From: younes Date: Mon, 4 Aug 2025 09:35:31 +0100 Subject: [PATCH 2/2] [FIX] issue with permission remaining balance check in mobile app --- .../odex_mobile/controllers/rest_api_v2/permission.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py b/odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py index 17f4c2c10..e5a58093c 100644 --- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py +++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py @@ -421,8 +421,7 @@ class PermissionController(http.Controller): all_perission += rec.duration if rec.date_to and permission_date_to: permission_date1 = rec.date_to.date() if isinstance(rec.date_to,datetime) else datetime.strptime(str(rec.date_to), DEFAULT_SERVER_DATETIME_FORMAT).date() - date_to_value1 = permission_date_to.date() if isinstance(permission_date_to, datetime) else datetime.strptime( - permission_date_to, DEFAULT_SERVER_DATETIME_FORMAT).date() + date_to_value1 = permission_date_to.date() if isinstance(permission_date_to, datetime) else datetime.strptime(permission_date_to, DEFAULT_SERVER_DATETIME_FORMAT).date() if permission_date1 == date_to_value1: raise Warning(_('Sorry You Have Used All Your Permission In This Day you have one permission per a Day'))