添加功能

yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml

@@ -5,9 +5,9 @@
         <field name="model">yuthon.department.change</field>
         <field name="arch" type="xml">
             <tree string="部门变更审批">
-        <!--                <header>-->
-        <!--                    <button name="approval_end" type="object" string="结束" dclass="oe_highlight"/>-->
-        <!--                </header>-->
+            <!--                <header>-->
+            <!--                    <button name="approval_end" type="object" string="结束" dclass="oe_highlight"/>-->
+            <!--                </header>-->
                 <field name="code"/>
                 <field name="name"/>
             </tree>

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'

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)