!9601 日程

Merge pull request !9601 from 李鹏宇/dev_wang

ks_dashboard_ninja/models/ks_dashboard_ninja_items.py

@@ -100,6 +100,7 @@ def ks_read(self, records):
         sql = comodel._order_to_sql(None, wquery)
         order_by_clause = comodel.env.cr.mogrify(sql).decode()
         order_by = order_by_clause and (' ORDER BY %s ' % order_by_clause) or ''
+        # order_by = ''  # 临时修复：跳过排序
         from_c, where_c, where_params = wquery.get_sql()
         query = """ SELECT {rel}.{id1}, {rel}.{id2} FROM {rel}, {from_c}
                             WHERE {where_c} AND {rel}.{id1} IN %s AND {rel}.{id2} = {tbl}.id

soong_workflow/wizard/soong_workflow_comment_wizard_view.xml

@@ -108,7 +108,8 @@
                                options="{'no_open': True}" widget="radio" force_save="1"/>
                         <field name="employee_trans_domain_ids" invisible="1"/>
                         <!--  退回意见退回类型  -->
-                        <field name="return_link_id" invisible="node_btn_name != '退回'" string="退回节点"
+                        <div invisible="node_btn_name != '退回'" style="white-space: nowrap; color: #dc3545; font-weight: bold; font-size: 14px; padding: 2px 8px; border-left: 3px solid #dc3545; margin-bottom: 6px;">退回节点</div>
+                        <field name="return_link_id" invisible="node_btn_name != '退回'" string="退回节点" nolabel="1"
                                domain="[('link_type', '=', 'return'), ('workflow_record_id', '=', workflow_record_id)]"
                                options="{'no_open': True, 'fg_color': 'red'}"   widget="radio" force_save="1"/>
                     </group>

yuthon_stock/views/menu.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
+    <!-- 继承并修改 maintenance.hr_equipment_action 的名称 -->
+    <record id="maintenance.hr_equipment_action" model="ir.actions.act_window">
+        <field name="name">固定资产</field>
+    </record>
+
     <menuitem id="purchase_assets_equipment_root"
               name="固定资产"
               parent="stock.menu_stock_inventory_control"

yuthon_will_task/models/inherit_room_booking.py

@@ -78,7 +78,7 @@ class InheritRoomBooking(models.Model):
 
         if task_time_ids:
             start_datetime = new_record.start_datetime
-            start_date = (start_datetime + timedelta(hours=8)).date()
+            start_date = start_datetime.date()
             request_hour_from = get_hour_selection(new_record.start_datetime)
             request_hour_to = get_hour_selection(new_record.stop_datetime)
             task_id = self.env['yuthon.will.task'].sudo().create({
@@ -95,4 +95,5 @@ class InheritRoomBooking(models.Model):
                 'task_state': 'will',
             })
             task_id._onchange_employee_ids()
+            task_id._sync_dates_task()
         return new_record