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

Merge branch 'feature/修改产品等信息' into develop

Browse Source 
# Conflicts:
#	sf_base/models/product_template.py
#	sf_route_workcenter/models/workcenter.py
This commit is contained in:
jinling.yang
2022-11-20 20:11:21 +08:00
parent cbf8366cc3 aeb9b0f796
commit c4876e9631
14 changed files with 128 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_route_workcenter/__manifest__.py
View File

@@ -10,7 +10,7 @@
""",
'category': 'YZ',
'website': 'https://www.sf.cs.jikimo.com',
'depends': ['mrp', 'sf_base', 'hr_holidays', 'maintenance'],
'depends': ['mrp', 'sf_base', 'hr_holidays', 'maintenance', 'sf_manufacturing_orders'],
'data': [
'views/sf_tray_view.xml',
'views/sf_workorder.xml',