jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #221: (feature/刀具管理同步优化，增加字段 -> develop)

Browse Source 
Merge Request: 修改依赖关系，解决依赖冲突

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/221?initial=true
This commit is contained in:
马广威
2023-06-30 15:17:49 +08:00
parent 1a937a7476 e0315bafc7
commit 4199a86264
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_maintenance/__manifest__.py
View File

@@ -7,7 +7,7 @@
'category': '工厂设备', 'category': '工厂设备',
'description': """ 'description': """
Track equipments and maintenance requests""", Track equipments and maintenance requests""",
'depends': ['maintenance', 'sf_base'], 'depends': ['mrp_maintenance', 'sf_base'],
'summary': 'Track equipment and manage maintenance requests', 'summary': 'Track equipment and manage maintenance requests',
'data': [ 'data': [
'security/group_security.xml', 'security/group_security.xml',

2
sf_manufacturing/__manifest__.py
View File

@@ -10,7 +10,7 @@
""", """,
'category': 'sf', 'category': 'sf',
'website': 'https://www.sf.jikimo.com', 'website': 'https://www.sf.jikimo.com',
'depends': ['mrp', 'sf_base', 'maintenance', 'web_widget_model_viewer', 'stock'], 'depends': ['mrp', 'sf_base', 'mrp_maintenance', 'web_widget_model_viewer', 'stock'],
'data': [ 'data': [
'data/stock_data.xml', 'data/stock_data.xml',
'security/group_security.xml', 'security/group_security.xml',