From 9a77d831f575593b0be5a4af7b4b261803b89d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Tue, 7 Jul 2026 09:55:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/hr_attendance_detail_wechat.py | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py index 68c77b127..4d6a15591 100644 --- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py +++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py @@ -402,26 +402,26 @@ class HrAttendanceDetail(models.Model): absenteeism_card = True is_expatriation = self.env['expatriation.approval'].search([('work_end', '=', True),('expatriates_ids', 'in', [employee.id]), ('is_effect', '=', False)]) - if not self._process_shift_days(current_data) and template.role_id.name == '集团行政': - start_datetime = datetime.combine(current_data, datetime.min.time()) - end_datetime = datetime.combine(current_data, datetime.max.time()) - domain = [ - ('employee_id', '=', employee.id), - ('checkin_time', '>=', start_datetime), - ('checkin_time', '<=', end_datetime) - ] - attendance_records = self.search(domain) - if attendance_records: - checkin_time_list = [rec.checkin_time for rec in attendance_records if rec.checkin_time] - if checkin_time_list: - min_time = min(checkin_time_list) - max_time = max(checkin_time_list) - if min_time == max_time: - check_in_time = min_time - check_out_time = None - else: - check_in_time = min_time - check_out_time = max_time + # if not self._process_shift_days(current_data) and template.role_id.name == '集团行政': + # start_datetime = datetime.combine(current_data, datetime.min.time()) + # end_datetime = datetime.combine(current_data, datetime.max.time()) + # domain = [ + # ('employee_id', '=', employee.id), + # ('checkin_time', '>=', start_datetime), + # ('checkin_time', '<=', end_datetime) + # ] + # attendance_records = self.search(domain) + # if attendance_records: + # checkin_time_list = [rec.checkin_time for rec in attendance_records if rec.checkin_time] + # if checkin_time_list: + # min_time = min(checkin_time_list) + # max_time = max(checkin_time_list) + # if min_time == max_time: + # check_in_time = min_time + # check_out_time = None + # else: + # check_in_time = min_time + # check_out_time = max_time if attendance: attendance.write({ From 47f921fe60d61de71ce48e076a947a891eb4a85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Tue, 7 Jul 2026 10:08:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_property/models/property_bank_statements.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yuthon_property/models/property_bank_statements.py b/yuthon_property/models/property_bank_statements.py index 3f4bae9e2..27ac56a7f 100644 --- a/yuthon_property/models/property_bank_statements.py +++ b/yuthon_property/models/property_bank_statements.py @@ -265,13 +265,13 @@ class ReceivableModifyLine(models.Model): key=lambda l: ( 0 if l.reconciliation_date else 1, l.reconciliation_date or date.max, - l.id, + l.id if isinstance(l.id, int) else 0, ) ) cumsum = 0.0 for line in sorted_lines: - if line.id == rec.id: + if line == rec: remaining = rec.receivable_id.original_amount - cumsum rec.delivered1 = rec.receivable_id.original_amount if remaining <= 0 else remaining break