解决冲突

2023-06-12 14:35:14 +08:00
parent e0983d0530
commit 3d04200ca7
167 changed files with 3468 additions and 7898 deletions
--- a/sf_dlm/init.py
+++ b/sf_dlm/init.py
@@ -1 +1 @@
-from . import models
+# from . import models
--- a/sf_dlm/manifest.py
+++ b/sf_dlm/manifest.py
@@ -15,8 +15,8 @@
    'data': [
        'data/product_data.xml',
        'data/uom_data.xml',
-        'views/product_template_view.xml',
-        'views/product_workorder.xml'
+        # 'views/product_template_view.xml',
+        # 'views/product_workorder.xml'
    ],
    'demo': [
    ],