jikimo/test
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_mrs_connect/models/res_config_setting.py
This commit is contained in:
jinling.yang
2023-06-29 11:15:40 +08:00
parent b02cb16dc9 78c13acbab
commit 37b834b3cf
15 changed files with 273 additions and 852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_dlm/__manifest__.py
View File

@@ -15,7 +15,7 @@
'data': [
'data/product_data.xml',
'data/uom_data.xml',
'data/cutting_tool_data.xml',
# 'data/cutting_tool_data.xml',
'views/product_template_view.xml',
'views/product_workorder.xml'
],