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 #314 from expsa/dev_odex25_mobile 

Dev odex25 mobile
This commit is contained in:
AbuzarExp 2024-07-20 21:28:54 +03:00 committed by GitHub
parent 75751a0522 d269eca778
commit 781a611c96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,8 @@ class OverTimeController(http.Controller):
data = {}
if transfer_type == 'accounting':
account = request.env['account.account'].sudo().search([])
journal = request.env['account.journal'].sudo().search([('type','in',['cash','bank'])])
# journal = request.env['account.journal'].sudo().search([('type','in',['cash','bank'])])
journal = request.env['account.journal'].sudo().search([])
data = {'account':account.read(['name','id']),'journal':journal.read(['name','id'])}
else:
rules = request.env['hr.salary.rule'].sudo().search([('rules_type', '=', 'overtime')])
@ -331,10 +332,10 @@ class OverTimeController(http.Controller):
s.account_id = False
s.journal_id = False
s.write(vals)
# if s.state == 'hr_aaproval':
s.get_account_ids()
s.onchange_transfer_type()
s.get_account_ids()
if s.state == 'financial_manager':
# s.get_account_ids()
s.onchange_transfer_type()
# s.get_account_ids()
if data:
for t in data:
self.get_overtime_line(s.employee_id, s, t)