Merge branch 'refs/heads/develop' into feature/delivery_status

# Conflicts:
#	sf_manufacturing/models/mrp_production.py

sf_manufacturing/views/model_type_view.xml

@@ -31,7 +31,7 @@
                 <form string="模型类型">
                     <group>
                         <field name="name" required="1"/>
-                        <field name="embryo_tolerance_id" required="1" string="坯料容余(mm)"/>
+                        <field name="embryo_tolerance_id" required="1"/>
                     </group>
                     <group>
                         <field name='product_routing_tmpl_ids'>

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -370,7 +370,8 @@
                                        attrs="{'readonly': [('id', '!=', False)]}" options="{'no_create': True}"/>
                                 <field name="process_parameters_id"
                                        attrs="{'readonly': [('id', '!=', False),('routing_tag', '=', 'standard')]}"
-                                       string="参数" context="{'route_id':route_id}" options="{'no_create': True}"/>
+                                       string="参数" context="{'route_id':route_id,'production_id': production_id}"
+                                       options="{'no_create': True}"/>
                                 <field name="panel" readonly="1"/>
                                 <field name="routing_tag" readonly="1" widget="badge"
                                        decoration-success="routing_tag == 'standard'"
@@ -740,5 +741,19 @@
         <!--                  parent="mrp.menu_mrp_manufacturing"-->
         <!--                  sequence="1"/>-->
 
+        <menuitem id="mrp.menu_mrp_production_action"
+                  name="制造订单"
+                  parent="mrp.menu_mrp_manufacturing"
+                  action="mrp.mrp_production_action"
+                  groups="sf_base.group_plan_dispatch,sf_base.group_sf_mrp_manager"
+                  sequence="1"/>
+
+        <menuitem id="stock_picking_type_menu"
+                  name="驾驶舱"
+                  parent="stock.menu_stock_root"
+                  action="stock.stock_picking_type_action"
+                  groups="sf_base.group_sf_stock_user"
+                  sequence="0"/>
+
     </data>
 </odoo>

sf_manufacturing/views/mrp_workorder_view.xml

@@ -139,7 +139,7 @@
                 <button type="object" name="action_view_surface_technics_purchase" class="oe_stat_button"
                         icon="fa-credit-card"
                         groups="base.group_user,sf_base.group_sf_order_user"
-                        attrs="{'invisible': [('surface_technics_purchase_count', '=', 0),('routing_type', '!=', '表面工艺')]}">
+                        attrs="{'invisible': [('surface_technics_purchase_count', '=', 0)]}">
                     <div class="o_field_widget o_stat_info">
                         <span class="o_stat_value">
                             <field name="surface_technics_purchase_count"/>

sf_manufacturing/views/sale_order_views.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_order_form_inherit_supply_method" model="ir.ui.view">
+        <field name="name">view.sale.order.form.inherit.supply.method</field>
+        <field name="inherit_id" ref="sf_sale.view_sale_order_form_inherit_sf"/>
+        <field name="model">sale.order</field>
+        <field name="arch" type="xml">
+             <xpath expr="//header/button[@name='action_confirm'][last()]" position="attributes">
+                <attribute name="attrs">{'invisible': [('state', '!=', 'draft')]}</attribute>
+                <attribute name="name">confirm_to_supply_method</attribute>
+            </xpath>
+            <xpath expr="//header/button[@name='confirm_to_supply_method']" position="before">
+                <button name="action_confirm" string="供货方式确认" type="object" attrs="{'invisible': [('state', '!=', 'supply method')]}" confirm="确认供货方式"/>
+            </xpath>
+            <xpath expr="//header/field[@name='state']" position="attributes">
+                <attribute name="statusbar_visible">draft,sent,supply method,sale</attribute>
+            </xpath>
+            <xpath expr="//page/field[@name='order_line']/tree/field[@name='remark']" position="before">
+                <field name="supply_method" attrs="{'invisible': [('state', '=', 'draft')], 'required': [('state', '=', 'supply method')]}" />
+            </xpath>
+            <xpath expr="//header/button[@name='action_cancel']" position="attributes">
+                <attribute name="attrs">{'invisible': [('state', '!=', 'draft')]}</attribute>
+            </xpath>
+            <xpath expr="//header/button[@name='action_cancel']" position="attributes">
+                <attribute name="attrs">{'invisible': [('state', '!=', 'draft')]}</attribute>
+            </xpath>
+            <xpath expr="//header/button[@name='action_quotation_send'][5]" position="attributes">
+                <attribute name="attrs">{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel','supply method']),'&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel','supply method'])]}</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="jikimo_sale_order_view_search_inherit_quotation_supply_method" model="ir.ui.view">
+        <field name="name">jikimo.sale.order.search.inherit.quotation.supply.method</field>
+        <field name="model">sale.order</field>
+        <field name="mode">primary</field>
+        <field name="inherit_id" ref="sale.sale_order_view_search_inherit_quotation"/>
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='my_quotation']" position="attributes">
+                <attribute name="domain">[('state', 'in', ('draft', 'sent')), ('user_id', '=', uid)]</attribute>
+            </xpath>
+            <xpath expr="//filter[@name='draft']" position="after">
+                <filter string="供货方式待确认" name="supply_method" domain="[('state', '=', 'supply method')]"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="sale.action_quotations_with_onboarding" model="ir.actions.act_window">
+        <field name="search_view_id" ref="jikimo_sale_order_view_search_inherit_quotation_supply_method"/>
+        <field name="context">{'search_default_draft': 1}</field>
+    </record>
+
+    <record id="action_quotations_supply_method" model="ir.actions.act_window">
+        <field name="name">报价单</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+        <field name="view_id" ref="sale.view_quotation_tree_with_onboarding"/>
+        <field name="search_view_id" ref="jikimo_sale_order_view_search_inherit_quotation_supply_method"/>
+        <field name="context">{'search_default_supply_method': 1}</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+            Create a new quotation, the first step of a new sale!
+            </p><p>
+            Once the quotation is confirmed by the customer, it becomes a sales order.<br/> You will be able to create an invoice and collect the payment.
+            </p>
+        </field>
+    </record>
+    <menuitem
+        id="sale.sale_menu_root"
+        groups="sf_base.group_production_engineer,sf_base.group_sale_director,sf_base.group_sale_salemanager"
+        />
+    <!--供货路线专员菜单-->
+    <menuitem
+        id="sale_order_menu_quotations_supply_method"
+        name="报价"
+        action="action_quotations_supply_method"
+        parent="sale.sale_order_menu"
+        groups="sf_base.group_production_engineer"
+        sequence="2"/>
+
+    <record id="sale.menu_sale_order" model="ir.ui.menu">
+        <field name="groups_id" eval="[(4, ref('sf_base.group_production_engineer'))]"/>
+    </record>
+
+    <record id="sale.report_sales_team" model="ir.ui.menu">
+        <field name="groups_id" eval="[(4, ref('sf_base.group_production_engineer'))]"/>
+    </record>
+
+    <record id="sale.res_partner_menu" model="ir.ui.menu">
+        <field name="groups_id" eval="[(4, ref('sf_base.group_production_engineer'))]"/>
+    </record>
+    
+</odoo>

sf_manufacturing/views/stock_picking_view.xml

@@ -51,5 +51,10 @@
                 </xpath>
             </field>
         </record>
+
+        <record id="stock.action_picking_tree_all" model="ir.actions.act_window">
+            <field name="view_ids" eval="[(5, 0, 0),
+                (0, 0, {'view_mode': 'tree', 'view_id': ref('stock.vpicktree')})]"/>
+        </record>
     </data>
 </odoo>