处理冲突

This commit is contained in:
qihao.gong@jikimo.com
2023-06-16 10:02:33 +08:00
parent e9ad452c43
commit 018fecfc59
25 changed files with 2855 additions and 905 deletions

View File

@@ -10,13 +10,14 @@
""",
'category': 'sf',
'website': 'https://www.sf.jikimo.com',
'depends': ['mrp', 'base', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting', 'purchase_stock',
'depends': ['mrp', 'base', 'sale', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting', 'purchase_stock',
'uom'],
'data': [
'data/product_data.xml',
'data/uom_data.xml',
# 'views/product_template_view.xml',
# 'views/product_workorder.xml'
'data/cutting_tool_data.xml',
'views/product_template_view.xml',
'views/product_workorder.xml'
],
'demo': [
],