Accept Merge Request #1588: (feature/sale_order_route_pick -> develop)

Merge Request: 修改文件位置

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1588?initial=true

jikimo_sale_multiple_supply_methods/__manifest__.py

@@ -11,6 +11,7 @@
         'security/ir.model.access.csv',
         'data/stock_routes.xml',
         'data/product_data.xml',
+        'views/sale_order_view.xml',
         # 'views/product_product_views.xml',
     ],'assets': {
             #   'web.assets_backend': [

sf_stock/__manifest__.py

@@ -26,7 +26,6 @@
         # 'security/ir.model.access.csv',
         'views/stock_picking.xml',
         'views/stock_product_template.xml',
-        'views/sale_order_view.xml',
     ],
     # only loaded in demonstration mode
     'demo': [