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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划

Browse Source 
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/views/mrp_workcenter_views.xml
This commit is contained in:
qihao.gong@jikimo.com
2023-07-14 09:02:48 +08:00
parent 5e8e380a8e 2161f4c140
commit 8f795096c3
41 changed files with 846 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_maintenance/__manifest__.py
View File

@@ -12,7 +12,6 @@
'data': [
'security/group_security.xml',
'security/ir.model.access.csv',
'views/production_line_view.xml',
'views/maintenance_views.xml',
'views/maintenance_logs_views.xml',
'views/equipment_maintenance_standards_views.xml',