Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送

# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -380,7 +380,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//search" position="inside">
                     <searchpanel class="account_root">
-                        <field name="state" icon="fa-filter"/>
+                        <field name="state" icon="fa-filter" enable_counters="1"/>
                     </searchpanel>
                 </xpath>
                 <filter name='todo' position="replace"/>