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

Merge branch 'preprod_odex25_mobile' into dev_odex25_mobile

This commit is contained in:
شركة خبير المحدودة 2025-06-16 14:37:42 +03:00 committed by GitHub
parent c187d614f7 e79c1ccf8e
commit a54eeb6f82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/production_pull_code.yml vendored
View File

@ -106,7 +106,7 @@ jobs:
sahli_prod_master_server:
name: Deploy to Sahli Prod Master
runs-on: sahli-client-project-runner
if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Sahli-Project' && (github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_project')
if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Sahli-Project' && (github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_helpdesk' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_project')
steps:
- name: Checkout And Restart Project
run: |

8
odex25_mobile/odex_mobile/controllers/rest_api_v2/attendance.py
View File

@ -439,18 +439,18 @@ class AttendanceController(http.Controller):
diff = diff.seconds / 60
zone = http.request.env['attendance.zone'].search([('employee_ids', 'in', employee.id)], limit=1)
zone_general = http.request.env['attendance.zone'].search([('general', '=', True)], limit=1)
auto = zone.auto_checkout or zone_general.auto_checkout or request.env.user.company_id.auto_checkout or 20
auto = zone.auto_checkout or zone_general.auto_checkout or request.env.user.company_id.auto_checkout or 1
if diff >= auto:
attendance = http.request.env['attendance.attendance'].create({
'employee_id': employee.id,
'action': 'sign_out',
'action_type': 'auto',
'name': fields.datetime.now(),
'name': last,
'zone': "%s,%s" % (body.get('longitude'), body.get('latitude')),
'longitude': body.get('longitude'),
'latitude': body.get('latitude'),
})
msg = _("Auto Checkout successfully")
msg = _("Auto Checkout successfully")
subject = _("Auto Checkout")
self.send_msg(employee, msg, subject)
records = employee.attendance_log_ids.sudo().filtered(
@ -458,7 +458,7 @@ class AttendanceController(http.Controller):
for r in records:
r.old = True
employee.message_sent = False
return http_helper.response(message="Auto Checkout successfully", data={'status': True})
return http_helper.response(message="Auto Checkout successfully", data={'status': True})
else:
if not employee.message_sent:
msg = _("You are out of attendance zone you will be auto sign out")