Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

# Conflicts:
#	sf_base/models/sf_base.py
#	sf_manufacturing_orders/__manifest__.py
#	sf_route_workcenter/models/workcenter.py

sf_base/views/mrs_common_view.xml

@@ -296,9 +296,8 @@
                 <search string="托盘">
                     <field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
                     <field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
-<!--                    <field name="state" string="状态" filter_domain="[('state','ilike',self)]"/>-->
                     <group string="分组">
-                    <filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
+                        <filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
                     </group>
                 </search>
 
@@ -338,5 +337,6 @@
         </record>
 
 
+
     </data>
 </odoo>