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 #5898 from expsa/bakry_hr 

Bakry hr
This commit is contained in:
bakry 2025-12-31 09:48:09 +03:00 committed by GitHub
parent d1d3bd64e5 2b973f411d
commit 011d4a49de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
odex25_hr/attendances/models/hr_attendance_transactions.py
View File

@ -282,8 +282,8 @@ class HrAttendanceTransactions(models.Model):
def _calculate_working_hours(self, day_trans): def _calculate_working_hours(self, day_trans):
""" Helper method to calculate total working hours """ """ Helper method to calculate total working hours """
print({'office_hours': sum(day_trans.mapped('office_hours')) + sum(day_trans.mapped('total_mission_hours'))}) #print({'office_hours': sum(day_trans.mapped('office_hours')) + sum(day_trans.mapped('total_mission_hours'))})
print(sum(day_trans.mapped('office_hours')) , sum(day_trans.mapped('total_mission_hours'))) #print(sum(day_trans.mapped('office_hours')) , sum(day_trans.mapped('total_mission_hours')))
day_trans.update({'office_hours': sum(day_trans.mapped('office_hours')) + sum(day_trans.mapped('total_mission_hours'))}) day_trans.update({'office_hours': sum(day_trans.mapped('office_hours')) + sum(day_trans.mapped('total_mission_hours'))})
return ( return (
sum(day_trans.mapped('office_hours')) + sum(day_trans.mapped('total_permission_hours')) sum(day_trans.mapped('office_hours')) + sum(day_trans.mapped('total_permission_hours'))
@ -762,7 +762,7 @@ class HrAttendanceTransactions(models.Model):
return {'shift': shift_dict, 'out_ids': linked_out_ids, 'creep': creep} return {'shift': shift_dict, 'out_ids': linked_out_ids, 'creep': creep}
def manage_permission(self, trans_id, shift_in, shift_out, sign_in, sign_out, breaks, state=None): def manage_permission(self, trans_id, shift_in, shift_out, sign_in, sign_out, breaks, state=None):
print(trans_id, "*********************manage_permission***********************************") #print(trans_id, "*********************manage_permission***********************************")
trans, feedback = self.browse(trans_id)[0], [] trans, feedback = self.browse(trans_id)[0], []
# حساب التوقيع المتوقع للدخول والخروج بناء علي بصمة الدخول # حساب التوقيع المتوقع للدخول والخروج بناء علي بصمة الدخول
expected_sign_in, expected_sign_out = self._compute_expected_times(trans) expected_sign_in, expected_sign_out = self._compute_expected_times(trans)
@ -907,7 +907,7 @@ class HrAttendanceTransactions(models.Model):
if state is not None: return feedback if state is not None: return feedback
def manage_mission(self, trans_id, shift_in, shift_out, sign_in, sign_out, breaks, state=None): def manage_mission(self, trans_id, shift_in, shift_out, sign_in, sign_out, breaks, state=None):
print(trans_id, "*********************manage_mission***********************************") #print(trans_id, "*********************manage_mission***********************************")
trans , feedback = self.browse(trans_id)[0] , [] trans , feedback = self.browse(trans_id)[0] , []
expected_sign_in, expected_sign_out = self._compute_expected_times(trans) expected_sign_in, expected_sign_out = self._compute_expected_times(trans)
full_min_sign_in, full_max_sign_in, full_max_sign_out, working_hours = self.get_shift_timings(trans) full_min_sign_in, full_max_sign_in, full_max_sign_out, working_hours = self.get_shift_timings(trans)
@ -950,11 +950,7 @@ class HrAttendanceTransactions(models.Model):
continue continue
elif trans.sign_in == 0.0 or trans.sign_out == 0.0: elif trans.sign_in == 0.0 or trans.sign_out == 0.0:
mission_hours = min(trans.plan_hours, emp_mission.hours) mission_hours = min(trans.plan_hours, emp_mission.hours)
print("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&") #print("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
print("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
print(mission_hours)
print("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
print("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
miss_dic = {'is_official': True, 'official_id': mission.id, 'total_mission_hours': mission_hours, } miss_dic = {'is_official': True, 'official_id': mission.id, 'total_mission_hours': mission_hours, }
if state != 'check':trans.update(miss_dic) if state != 'check':trans.update(miss_dic)
if state is not None:feedback.append({'mission_id': mission.id, 'miss_start': mission_df, 'miss_end': mission_dt, 'type': 'all'}) if state is not None:feedback.append({'mission_id': mission.id, 'miss_start': mission_df, 'miss_end': mission_dt, 'type': 'all'})

4
odex25_hr/exp_payroll_loans/models/reconcile_leaves.py
View File

@ -263,7 +263,9 @@ class ReconcileLeaves(models.Model):
'You can not re-draft reconcile leaves because account move with ID "%s" in state Posted') % self.account_move_id.name) 'You can not re-draft reconcile leaves because account move with ID "%s" in state Posted') % self.account_move_id.name)
for item in self.loans_ids: for item in self.loans_ids:
last_date = datetime.strptime(str(self.write_date), "%Y-%m-%d %H:%M:%S").date().month #last_date = datetime.strptime(str(self.write_date), "%Y-%m-%d %H:%M:%S").date().month
last_date = fields.Datetime.from_string(self.write_date).month
for install in item.deduction_lines: for install in item.deduction_lines:
loan_date = datetime.strptime(str(install.write_date), "%Y-%m-%d %H:%M:%S").date().month loan_date = datetime.strptime(str(install.write_date), "%Y-%m-%d %H:%M:%S").date().month
if loan_date >= last_date and install.paid == True: if loan_date >= last_date and install.paid == True: