Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化

# Conflicts: # sf_tool_management/__manifest__.py # sf_tool_management/views/tool_base_views.xml
2023-06-28 18:34:39 +08:00
parent eab6f0ceee 05e69d21fa
commit b02cb16dc9
112 changed files with 19097 additions and 44 deletions
--- a/sf_tool_management/manifest.py
+++ b/sf_tool_management/manifest.py
@@ -1,3 +1,4 @@
+
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
@@ -16,7 +17,9 @@
        'security/ir.model.access.csv',
        # 'views/tool_base_views.xml',
        #         # 'views/menu_view.xml',
-
+        'wizard/wizard_view.xml',
+        'views/tool_base_views.xml',
+        'views/menu_view.xml',
    ],
    'demo': [
    ],