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

Accept Merge Request #239: (feature/设备模块文件解决冲突 -> develop)

Browse Source 
Merge Request: 设备模块文件解决冲突

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/239?initial=true
This commit is contained in:
杨金灵
2023-07-14 10:16:51 +08:00
parent 48cb394b3f 31d335af48
commit ad565d0096
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sf_maintenance/__manifest__.py
View File

@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-
{ {
'name': '设备管理模块', 'name': '设备管理模块',
'version': '1.0', 'version': '1.0',
@@ -7,21 +5,18 @@
'sequence': 100, 'sequence': 100,
'category': '工厂设备', 'category': '工厂设备',
'description': """ 'description': """
Track equipments and maintenance requests""", """,
'depends': ['mrp_maintenance', 'sf_base'], 'depends': ['maintenance', 'sf_base'],
'summary': 'Track equipment and manage maintenance requests', 'data': [
""", 'security/group_security.xml',
'depends': ['maintenance', 'sf_base'], 'security/ir.model.access.csv',
'data': [ 'views/maintenance_views.xml',
'security/group_security.xml', 'views/maintenance_logs_views.xml',
'security/ir.model.access.csv', 'views/equipment_maintenance_standards_views.xml',
'views/maintenance_views.xml', 'views/maintenance_request_views.xml',
'views/maintenance_logs_views.xml', ],
'views/equipment_maintenance_standards_views.xml', 'installable': True,
'views/maintenance_request_views.xml', 'application': False,
], 'auto_install': False,
'installable': True, 'license': 'LGPL-3',
'application': False,
'auto_install': False,
'license': 'LGPL-3',
} }