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

# Conflicts:
#	sf_base/views/menu_view.xml
#	sf_base/views/mrs_common_view.xml

sf_base/views/menu_view.xml

@@ -91,6 +91,14 @@
                 sequence="1"
                 action="mrs_processing_technology"/>
 
+         <menuitem
+                id="menu_sf_partner_views"
+                name="工厂token"
+                parent="menu_mrs_base"
+                sequence="1"
+                action="token_factory_view"
+        />
+
 
         <menuitem
                 id="menu_mrs_machine_brand"
@@ -133,6 +141,7 @@
                 sequence="1"
                 action="action_mrs_machine_control_system"/>
 
+
 <!--         <menuitem-->
 <!--                id="menu_sf_partner_views"-->
 <!--                name="工厂token"-->
@@ -142,5 +151,6 @@
 <!--        />-->
 
 
+
     </data>
 </odoo>