diff --git a/yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml b/yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml index f41739fcd..117be8fa1 100644 --- a/yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml +++ b/yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml @@ -5,9 +5,9 @@ yuthon.department.change - - - + + + diff --git a/yuthon_purchase/models/inherit_purchase_order.py b/yuthon_purchase/models/inherit_purchase_order.py index 32b18dc04..6caf4fcf4 100644 --- a/yuthon_purchase/models/inherit_purchase_order.py +++ b/yuthon_purchase/models/inherit_purchase_order.py @@ -42,6 +42,7 @@ class InheritPurchaseOrder(models.Model): for order in order_ids: order.button_cancel() + def end_approval(self): self.button_confirm() self.state = 'purchase' diff --git a/yuthon_will_task/models/inherit_room_booking.py b/yuthon_will_task/models/inherit_room_booking.py index ebbd1d6e4..5414e963d 100644 --- a/yuthon_will_task/models/inherit_room_booking.py +++ b/yuthon_will_task/models/inherit_room_booking.py @@ -30,9 +30,9 @@ class InheritRoomBooking(models.Model): domain = [ ('start_datetime', '>=', today_start), ('start_datetime', '<=', today_end), - '|', - ('stop_datetime', '=', False), - ('stop_datetime', '>', current_datetime) + # '|', + # ('stop_datetime', '=', False), + # ('stop_datetime', '>', current_datetime) ] # 4. 查询符合条件的记录(先获取记录集,再统计数量,便于输出会议时间) matching_records = self.search(domain)