diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py index acdf574ad..f78aa1c28 100644 --- a/yuthon_hr_attendance/models/hr_attendance.py +++ b/yuthon_hr_attendance/models/hr_attendance.py @@ -133,7 +133,7 @@ class HrAttendance(models.Model): def card_remind(self): menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的异常')]) all_employees = self.env['hr.employee'].search([('name', '=', '叶华锋')]) - current_date = fields.Date.to_date('2025-04-21') # 使用当前年份2025 + current_date = fields.Date.today() month_start = current_date.replace(day=1) month_end = (month_start + relativedelta(months=1) - relativedelta(days=1)) for employee in all_employees: diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml index 547def847..ff39851b1 100644 --- a/yuthon_property_approval/views/property_lease_contract.xml +++ b/yuthon_property_approval/views/property_lease_contract.xml @@ -15,7 +15,6 @@ - @@ -61,7 +60,7 @@ - + @@ -240,25 +239,6 @@ - - - - - - - - - - - - - - - - - - - @@ -335,6 +315,25 @@ + + + + + + + + + + + + + + + + + + + @@ -438,7 +437,7 @@ - + @@ -448,9 +447,6 @@ - - - @@ -649,25 +645,6 @@ - - - - - - - - - - - - - - - - - - - @@ -745,6 +722,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +