diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py index 83bd2075a..02de05832 100644 --- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py +++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py @@ -441,7 +441,6 @@ class HrAttendanceDetail(models.Model): end_datetime = datetime.combine(date, datetime.min.time()).replace( hour=end_hour, minute=end_minute, second=0, microsecond=0 ) - timedelta(hours=8) - if template.planning_name == '中夜': end_datetime = datetime.combine(date, datetime.min.time()).replace( hour=22, minute=0, second=0, microsecond=0 diff --git a/yuthon_property_approval/views/property_fee_spending_view.xml b/yuthon_property_approval/views/property_fee_spending_view.xml index 8ddd65745..f41a11bd2 100644 --- a/yuthon_property_approval/views/property_fee_spending_view.xml +++ b/yuthon_property_approval/views/property_fee_spending_view.xml @@ -51,6 +51,7 @@ + @@ -60,7 +61,7 @@ - + diff --git a/yuthon_stock/views/inherit_stock_picking.xml b/yuthon_stock/views/inherit_stock_picking.xml index 40f3c6030..795a9d590 100644 --- a/yuthon_stock/views/inherit_stock_picking.xml +++ b/yuthon_stock/views/inherit_stock_picking.xml @@ -10,12 +10,11 @@ + + - - -