Accept Merge Request #861: (feature/优化工单搜索 -> develop)

Merge Request: 优化工单搜索和修复销售审查按钮

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/861?initial=true

sf_machine_connect/views/WorkCenterBarcodes.xml

@@ -2,18 +2,23 @@
 <odoo>
     <record id="workcenter_form_vieww_scan_barcode_search" model="ir.ui.view">
         <field name="name">work.order.search</field>
-<!--        <field name="model">mrp.workcenter</field>-->
+        <!--        <field name="model">mrp.workcenter</field>-->
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="mrp.view_mrp_production_work_order_search"/>
         <field name="arch" type="xml">
-                <xpath expr="//field[@name='production_id']" position="before">
+            <xpath expr="//group" position="before">
-<!--                    <field name="name" filter_domain="['|', '|', ('明确的字段内容', 'ilike', self), ('shortdesc', 'ilike', self), ('name', 'ilike', self)]" string="Theme"/>-->
+                <searchpanel>
-<!--                    <field name="tray_code" filter_domain="[('production_id.tray_ids.code','=',self)]"/>-->
+                    <field name="routing_type" select="multi" string="工序类型" icon="fa-building" enable_counters="1"/>
-<!--                    <field name="production_id"/>-->
+                    <field name="state" select="multi" string="状态" icon="fa-building" enable_counters="1"/>
-                </xpath>
+                </searchpanel>
-<!--                <xpath expr="//search//group//filter[@name='product']" position="before">-->
+
-<!--                    <filter string="Tray code" name="traycode" domain="[]" context="{'group_by': 'tray_code'}"/>-->
+                <!--                    <field name="name" filter_domain="['|', '|', ('明确的字段内容', 'ilike', self), ('shortdesc', 'ilike', self), ('name', 'ilike', self)]" string="Theme"/>-->
-<!--                </xpath>-->
+                <!--                    <field name="tray_code" filter_domain="[('production_id.tray_ids.code','=',self)]"/>-->
+                <!--                    <field name="production_id"/>-->
+            </xpath>
+            <!--                <xpath expr="//search//group//filter[@name='product']" position="before">-->
+            <!--                    <filter string="Tray code" name="traycode" domain="[]" context="{'group_by': 'tray_code'}"/>-->
+            <!--                </xpath>-->
 
         </field>
     </record>

sf_sale/__manifest__.py

@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale', 'sale_management', 'web_widget_model_viewer', 'sf_base', 'account', 'purchase'],
+    'depends': ['sale', 'sale_management', 'web_widget_model_viewer', 'sf_base', 'account', 'purchase', 'delivery'],
     'data': [
         'security/group_security.xml',
         'security/ir.model.access.csv',

sf_sale/views/sale_order_view.xml

@@ -73,7 +73,7 @@
                     <field name="schedule_status" invisible="1"/>
                     <button name="sf_sale.action_sale_order_check_wizard" string="审核" type="action"
                             context="{'default_order_id':active_id}" groups="sf_base.group_sale_director"
-                            attrs="{'invisible': ['|',('check_status','in', ['approved',False]),('state', 'in', ['cancel'])]}"
+                            attrs="{'invisible': ['|',('check_status','in', ['approved',False,'fail']),('state', 'in', ['cancel'])]}"
                             class="oe_highlight"/>
                 </xpath>
                 <!--                <xpath expr="//form/header/button[@name='action_confirm'][1]" position="attributes">-->