devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #152 from expsa/dev_odex25_mobile 

Dev odex25 mobile
This commit is contained in:
AbuzarExp 2024-07-10 15:07:29 +03:00 committed by GitHub
parent c6f920ec1a b9fcc57f7e
commit 34d441ea55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py
View File

@ -92,13 +92,13 @@ class LeaveController(http.Controller):
[('state', 'in', ['confirm','validate','approved']), ('employee_id', '!=', employee.id), ('type', '=', 'remove')],
offset=offset, limit=limit)
count = http.request.env['hr.holidays'].search_count(
[('state', 'not in', ['confirm','validate','approved']), ('employee_id', '!=', employee.id), ('type', '=', 'remove')],)
[('state', 'in', ['confirm','validate','approved']), ('employee_id', '!=', employee.id), ('type', '=', 'remove')],)
if done:
holidays = http.request.env['hr.holidays'].search(
[('state', 'not in', ['validate1','refuse','cancel']), ('employee_id', '!=', employee.id), ('type', '=', 'remove')],
[('state', 'in', ['validate1','refuse','cancel']), ('employee_id', '!=', employee.id), ('type', '=', 'remove')],
offset=offset, limit=limit)
count = http.request.env['hr.holidays'].search_count(
[('state', 'not in', ['validate1','refuse','cancel']), ('employee_id', '!=', employee.id), ('type', '=', 'remove')],)
[('state', 'in', ['validate1','refuse','cancel']), ('employee_id', '!=', employee.id), ('type', '=', 'remove')],)
else:
holidays = http.request.env['hr.holidays'].search(
[('employee_id', '=', employee.id), ('type', '=', 'remove')], offset=offset, limit=limit)