jikimo/jikimo_sf
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/change.scss
This commit is contained in:
WEB许何哲\xuhez
2023-07-06 14:41:17 +08:00
parent 26319beaa4 8dfcd943f0
commit c440afa435
170 changed files with 4723 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_warehouse/__manifest__.py
View File

@@ -23,7 +23,9 @@
'web.assets_qweb': [
],
'web.assets_backend':[
'sf_warehouse/static/src/change.scss'
'sf_warehouse/static/src/change.scss',
'sf_warehouse/static/src/kanban_color_change.scss'
]