Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化

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_manufacturing/views/mrp_workorder_view.xml

@@ -143,7 +143,12 @@
                     </group>
                 </page>
             </xpath>
-
+           <xpath expr="//label[1]" position="before">
+                <field name='routing_type'/>
+            </xpath>
+             <xpath expr="//label[1]" position="attributes">
+                <attribute name="string">计划加工时间</attribute>
+            </xpath>
             <!--            隐藏物料清单-->
             <!--            <xpath expr="//page[@name='components']" position="attributes">-->
             <!--                <attribute name="invisible">1</attribute>-->
@@ -159,7 +164,6 @@
             </xpath>
             <field name="production_id" position="after" invisible="0">
                 <group>
-                    <field name='routing_type'/>
                     <field name="date_planned_start" invisible="1"/>
                     <field name="date_planned_finished" invisible="1"/>
                     <!--                    <field name="production_id" readonly="1"/>-->
@@ -491,7 +495,7 @@
                 </page>
             </xpath>
             <xpath expr="//form//sheet//group//group//div[1]" position="after">
-                <label for="date_start" string="实际开始时间"/>
+                <label for="date_start" string="实际加工时间"/>
                 <div class="oe_inline">
                     <field name="date_start" class="mr8 oe_inline"/>
                     <strong class="mr8 oe_inline">到</strong>

sf_mrs_connect/models/res_config_setting.py

@@ -90,7 +90,6 @@ class ResConfigSettings(models.TransientModel):
         token = config.get_param('token', default='')
         sf_secret_key = config.get_param('sf_secret_key', default='')
         sf_url = config.get_param('sf_url', default='')
-        bfm_url = config.get_param('bfm_url', default='')
         ftp_host = config.get_param('ftp_host', default='')
         ftp_port = config.get_param('ftp_port', default='')
         ftp_user = config.get_param('ftp_user', default='')
@@ -100,7 +99,6 @@ class ResConfigSettings(models.TransientModel):
             token=token,
             sf_secret_key=sf_secret_key,
             sf_url=sf_url,
-            bfm_url=bfm_url,
             ftp_host=ftp_host,
             ftp_port=ftp_port,
             ftp_user=ftp_user,
@@ -114,7 +112,6 @@ class ResConfigSettings(models.TransientModel):
         ir_config.set_param("token", self.token or "")
         ir_config.set_param("sf_secret_key", self.sf_secret_key or "")
         ir_config.set_param("sf_url", self.sf_url or "")
-        ir_config.set_param("bfm_url", self.bfm_url or "")
         ir_config.set_param("ftp_host", self.ftp_host or "")
         ir_config.set_param("ftp_port", self.ftp_port or "")
         ir_config.set_param("ftp_user", self.ftp_user or "")

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">-->