Accept Merge Request #254: (feature/修改缺陷 -> develop)

Merge Request: 修复工作中心计划报错的问题，修改制造模块目录结构

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/254?initial=true

sf_manufacturing/models/mrp_workcenter.py

@@ -61,7 +61,7 @@ class ResWorkcenter(models.Model):
                AND equipment_id IS NOT NULL
                AND maintenance_equipment.workcenter_id IS NOT NULL
                AND maintenance_equipment.workcenter_id IN %s
-               AND (schedule_date, schedule_date + INT ERVAL '1h' * duration) OVERLAPS (%s, %s)
+               AND (schedule_date, schedule_date + INTERVAL '1 hour') OVERLAPS (%s, %s)
            GROUP BY maintenance_equipment.workcenter_id;
            """
         self.env.cr.execute(sql, [tuple(self.ids), fields.Datetime.to_string(start_datetime.astimezone()),

sf_plan_management/views/operations_rename_menu.xml

@@ -4,5 +4,17 @@
         <record id="mrp.menu_mrp_manufacturing" model="ir.ui.menu">
             <field name="name">计划管理</field>
         </record>
+
+        <record id="mrp_workorder.mrp_workorder_menu_planning" model="ir.ui.menu">
+           <field name="name">工单计划</field>
+           <field name="sequence" eval="300"/>
+           <field name="parent_id" ref="mrp.menu_mrp_manufacturing"/>
+        </record>
+
+        <record id="mrp.mrp_planning_menu_root" model="ir.ui.menu">
+           <field name="active" eval="False"/>
+        </record>
+
+
     </data>
 </odoo>