Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承

2023-12-11 14:47:34 +08:00
parent e300ca1822
commit 6bf3df0ef4
18 changed files with 996 additions and 441 deletions
--- a/sf_quality/manifest.py
+++ b/sf_quality/manifest.py
@@ -13,7 +13,7 @@
    'author': 'jikimo',
    'website': 'https://sf.cs.jikimo.com',
    # 此处依赖sf_manufacturing是因为我要重写其中的一个字段operation_id的string，故需要sf_manufacturing先安装
-    'depends': ['quality_control'],
+    'depends': ['quality_control', 'sf_maintenance'],
    'data': [
        'security/ir.model.access.csv',
        'views/view.xml'