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

解决冲突

# Conflicts:
#	sf_warehouse/__manifest__.py
#	sf_warehouse/static/src/change.scss

sf_warehouse/static/src/kanban_color_change.scss

@@ -0,0 +1,11 @@
+.oe_kanban_card.kanban_color_1 {
+    background-color: red !important;
+}
+
+.oe_kanban_card.kanban_color_2 {
+    background-color: blue !important;
+}
+
+.oe_kanban_card.kanban_color_3 {
+    background-color: green !important;
+}