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

fix next url

This commit is contained in:
younes 2025-06-29 14:44:53 +01:00
parent 8ba0353f88
commit 86442bc35a
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
odex25_mobile/odex_mobile/controllers/rest_api_v2/employee_other_request.py
View File

@ -526,7 +526,7 @@ class EmployeeOtherRequestController(http.Controller):
page, offset, limit, prev = validator.get_page_pagination(page) page, offset, limit, prev = validator.get_page_pagination(page)
domain = [('employee_id', '=', employee.id)] domain = [('employee_id', '=', employee.id)]
if approvel: if approvel:
domain=[('state', 'not in', ['approved','refuse']),('employee_id', '!=', employee.id)] domain=[('state', 'not in', ['approved','refuse','draft']),('employee_id', '!=', employee.id)]
elif done: elif done:
domain = [('state', 'in', ['approved','refuse']), ('employee_id', '!=', employee.id)] domain = [('state', 'in', ['approved','refuse']), ('employee_id', '!=', employee.id)]
if filters_str: if filters_str:

4
odex25_mobile/odex_mobile/controllers/rest_api_v2/loan.py
View File

@ -41,8 +41,8 @@ class LoanController(http.Controller):
loan_advantage = http.request.env['loan.request.type'].search([]) loan_advantage = http.request.env['loan.request.type'].search([])
if approvel: if approvel:
# domain = [] # domain = []
loans = http.request.env['hr.loan.salary.advance'].search([('employee_id', '!=', employee.id),('state', 'not in', ['pay','closed','refused'])], order='date desc', offset=offset, limit=limit) loans = http.request.env['hr.loan.salary.advance'].search([('employee_id', '!=', employee.id),('state', 'not in', ['pay','closed','refused','draft'])], order='date desc', offset=offset, limit=limit)
count = http.request.env['hr.loan.salary.advance'].search_count([('employee_id', '!=', employee.id),('state', 'not in', ['pay','closed','refused'])]) count = http.request.env['hr.loan.salary.advance'].search_count([('employee_id', '!=', employee.id),('state', 'not in', ['pay','closed','refused','draft'])])
elif done: elif done:
loans = http.request.env['hr.loan.salary.advance'].search( loans = http.request.env['hr.loan.salary.advance'].search(
[('employee_id', '!=', employee.id), ('state', 'in', ['pay','closed','refused'])], order='date desc', offset=offset,limit=limit) [('employee_id', '!=', employee.id), ('state', 'in', ['pay','closed','refused'])], order='date desc', offset=offset,limit=limit)

2
odex25_mobile/odex_mobile/controllers/rest_api_v2/official_mission.py
View File

@ -359,7 +359,7 @@ class HrOfficialMissionController(http.Controller):
domain = [('employee_id', '=', employee.id)] domain = [('employee_id', '=', employee.id)]
if approvel: if approvel:
domain=[('state', 'not in', ['approve','refused']),('employee_id', '!=', employee.id)] domain=[('state', 'not in', ['approve','refused','draft']),('employee_id', '!=', employee.id)]
elif done: elif done:
domain = [('state', 'in', ['approve','refused']), ('employee_id', '!=', employee.id)] domain = [('state', 'in', ['approve','refused']), ('employee_id', '!=', employee.id)]

2
odex25_mobile/odex_mobile/controllers/rest_api_v2/overtime.py
View File

@ -75,7 +75,7 @@ class OverTimeController(http.Controller):
success=False) success=False)
try: try:
if approvel: if approvel:
domain = [('state','not in',['refused','validated']),('line_ids_over_time.employee_id', '!=', employee.id)] domain = [('state','not in',['refused','validated','draft']),('line_ids_over_time.employee_id', '!=', employee.id)]
overtime = http.request.env['employee.overtime.request'].search(domain, order='request_date desc', offset=offset, limit=limit) overtime = http.request.env['employee.overtime.request'].search(domain, order='request_date desc', offset=offset, limit=limit)
count = http.request.env['employee.overtime.request'].search_count(domain) count = http.request.env['employee.overtime.request'].search_count(domain)
elif done: elif done:

2
odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py
View File

@ -43,7 +43,7 @@ class PermissionController(http.Controller):
count = 0 count = 0
emp = [] emp = []
if approvel: if approvel:
domain = [('state', 'not in', ['approve','refused']), ('employee_id', '!=', employee.id)] domain = [('state', 'not in', ['approve','refused','draft']), ('employee_id', '!=', employee.id)]
permissions = http.request.env['hr.personal.permission'].search(domain, offset=offset, limit=limit) permissions = http.request.env['hr.personal.permission'].search(domain, offset=offset, limit=limit)
count = http.request.env['hr.personal.permission'].search_count(domain) count = http.request.env['hr.personal.permission'].search_count(domain)
elif done: elif done: