合并企业版代码(未测试，先提交到测试分支)

2023-04-14 17:42:23 +08:00
parent 7a7b3d7126
commit d28525526a
1300 changed files with 513579 additions and 5426 deletions
--- a/sf_dlm/manifest.py
+++ b/sf_dlm/manifest.py
@@ -12,7 +12,7 @@
    'website': 'https://www.sf.jikimo.com',
    'depends': ['mrp', 'base', 'sf_manufacturing','web_widget_model_viewer','mrp_subcontracting'],
    'data': [
-        # 'data/product_data.xml',
+        'data/uom_data.xml',
        'views/product_template_view.xml',
        'views/product_workorder.xml'
    ],