diff --git a/jikimo_sale_multiple_supply_methods/__manifest__.py b/jikimo_sale_multiple_supply_methods/__manifest__.py index e4b94ff4..cfc56321 100644 --- a/jikimo_sale_multiple_supply_methods/__manifest__.py +++ b/jikimo_sale_multiple_supply_methods/__manifest__.py @@ -6,12 +6,11 @@ 'author': 'fox', 'website': '', 'category': '', - 'depends': ['sf_dlm', 'sale_stock', 'sf_sale'], + 'depends': ['sf_dlm', 'sale_stock', 'sf_sale', 'sale'], "data": [ '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': [ diff --git a/jikimo_sale_multiple_supply_methods/views/sale_order_view.xml b/jikimo_sale_multiple_supply_methods/views/sale_order_view.xml deleted file mode 100644 index 81e9f7d8..00000000 --- a/jikimo_sale_multiple_supply_methods/views/sale_order_view.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - view.sale.order.form.inherit.sf - - sale.order - - - - - - - - \ No newline at end of file diff --git a/sf_manufacturing/views/sale_order_views.xml b/sf_manufacturing/views/sale_order_views.xml index 5de69b64..ba26134d 100644 --- a/sf_manufacturing/views/sale_order_views.xml +++ b/sf_manufacturing/views/sale_order_views.xml @@ -91,6 +91,16 @@ - + + view.sale.order.form.inherit.jikimo + + sale.order + + + + + + +