From 0f0bb6fbc0c552e61548dc961bb095aee111f1a4 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Tue, 25 Feb 2025 18:44:17 +0800 Subject: [PATCH] =?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_month.py | 30 +++++++---- .../views/hr_attendance_month_views.xml | 16 ++++-- .../views/yuthon_hr_employee_views.xml | 8 +-- .../report/meeting_minutes_report.xml | 51 +++++++----------- yuthon_notice/models/yuthon_notice.py | 2 +- .../models/property_accounts_receivable.py | 20 ++++++- .../models/property_bank_statements.py | 3 ++ .../others/property_accounts_template.xlsx | Bin 0 -> 971163 bytes .../static/others/property_bases_account.xlsx | Bin 0 -> 12302 bytes .../property_accounts_receivable_views.xml | 7 +++ .../views/property_bank_statements_views.xml | 7 +++ .../inherit_hr_payroll_structure_views.xml | 3 +- 12 files changed, 88 insertions(+), 59 deletions(-) create mode 100644 yuthon_property/static/others/property_accounts_template.xlsx create mode 100644 yuthon_property/static/others/property_bases_account.xlsx diff --git a/yuthon_hr_attendance/models/hr_attendance_month.py b/yuthon_hr_attendance/models/hr_attendance_month.py index a18525282..df0494230 100644 --- a/yuthon_hr_attendance/models/hr_attendance_month.py +++ b/yuthon_hr_attendance/models/hr_attendance_month.py @@ -91,20 +91,22 @@ class HrAttendanceMonthDetail(models.Model): ('11', '11月份'), ('12', '12月份') ], string="考勤月份") - required_attendance_days = fields.Float(string="应出勤天数") - actual_attendance_days = fields.Float(string="实际出勤天数") - compensatory_leave = fields.Float(string="调休(小时)") - leave_of_absence = fields.Float(string="事假(小时)") - leave_of_sick = fields.Float(string="病假(天)") - statutory_leave = fields.Float(string="法定假(天)") - work_overtime = fields.Float(string="加班(小时)") + required_attendance_days = fields.Integer(string="应出勤天数") + actual_attendance_days = fields.Integer(string="实际出勤天数") + compensatory_leave = fields.Integer(string="调休(小时)") + leave_of_absence = fields.Integer(string="事假(小时)") + leave_of_sick = fields.Integer(string="病假(天)") + statutory_leave = fields.Integer(string="法定假(天)") + work_overtime = fields.Integer(string="加班(小时)") + entry_date = fields.Date(string="入职时间") + expected_date = fields.Date(string="离职日期") # todo 需要什么字段往上加什么 # 打卡 - come_late = fields.Float(string="迟到(次)") - is_early_card = fields.Float(string="早退(次)") - is_no_card = fields.Float(string="缺卡(次)") + come_late = fields.Integer(string="迟到") + is_early_card = fields.Integer(string="早退") + is_no_card = fields.Integer(string="缺卡") # 假期 - unpaid_leave = fields.Float(string="无薪假(小时)") + unpaid_leave = fields.Integer(string="无薪假(小时)") note = fields.Char(string='备注') @@ -352,3 +354,9 @@ class HrAttendanceMonthDetail(models.Model): for record in self: # 更新用户的考勤明细 record.analysis_attendance_month_detail() + + def button_put(self): + pass + + def button_all_put(self): + pass \ No newline at end of file diff --git a/yuthon_hr_attendance/views/hr_attendance_month_views.xml b/yuthon_hr_attendance/views/hr_attendance_month_views.xml index c9abfba8b..c62d25315 100644 --- a/yuthon_hr_attendance/views/hr_attendance_month_views.xml +++ b/yuthon_hr_attendance/views/hr_attendance_month_views.xml @@ -66,7 +66,7 @@ - + @@ -75,9 +75,12 @@ - - + + + + +