Merge branch 'feature/销售订单、工单优化' into feature/无效刀返工

# Conflicts:
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/models/mrp_workorder.py

sf_manufacturing/views/mrp_workorder_view.xml

@@ -18,6 +18,7 @@
             </field>
             <field name="state" position="after">
                 <field name="work_state" optional="hide"/>
+                <field name="tool_state" invisible="1"/>
                 <field name="product_tmpl_name" invisible="1"/>
             </field>
             <field name="duration" position="replace">
@@ -120,6 +121,7 @@
                 </button>
             </xpath>
             <xpath expr="//field[@name='state']" position="before">
+                <field name='tool_state' invisible="1"/>
                 <field name='user_permissions' invisible="1"/>
                 <field name='name' invisible="1"/>
                 <field name='is_rework' invisible="1"/>