Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能

2023-08-24 17:32:25 +08:00
parent f9e4b73fb0 e31858c9d7
commit 55504c2725
22 changed files with 810 additions and 394 deletions
--- a/sf_base/manifest.py
+++ b/sf_base/manifest.py
@@ -10,7 +10,7 @@
    """,
    'category': 'sf',
    'website': 'https://www.sf.jikimo.com',
-    'depends': ['account', 'base', 'mrp_workorder'],
+    'depends': ['account', 'base', 'mrp_workorder','sale'],
    'data': [
        'security/group_security.xml',
        'security/ir.model.access.csv',
@@ -18,6 +18,7 @@
        'views/common_view.xml',
        'views/fixture_view.xml',
        'views/functional_fixture_view.xml',
+        # 'views/quick_easy_order_view.xml',
        'views/menu_view.xml',
        "views/tool_views.xml",
        "views/tool_menu.xml",