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

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

View File

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