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

Merge branch 'develop' into feature/修改看板样式

Browse Source 
# Conflicts:
#	sf_warehouse/__manifest__.py
#	sf_warehouse/static/src/kanban_color_change.scss
#	sf_warehouse/views/view.xml
This commit is contained in:
WEB许何哲\xuhez
2023-07-11 16:05:53 +08:00
parent a3760a7d9d 58b9ea404b
commit b6de9d5e64
17 changed files with 594 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sf_warehouse/__manifest__.py
View File

@@ -22,10 +22,12 @@
'web.assets_qweb': [
],
'web.assets_backend': [
'sf_warehouse/static/src/change.scss',
'sf_warehouse/static/src/kanban_color_change.scss',
'sf_warehouse/static/src/colorGuide.js'
'web.assets_backend':[
# 'sf_warehouse/static/src/js/vanilla-masker.min.js',
'sf_warehouse/static/src/css/kanban_color_change.scss',
'sf_warehouse/static/src/js/custom_kanban_controller.js',
'sf_warehouse/static/src/xml/custom_kanban_controller.xml',
]
},