Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/消息提醒优化

# Conflicts: # sf_sale/views/purchase_order_view.xml
2024-12-23 14:06:11 +08:00
parent 5a06811732 a2f29766e6
commit 88f3155132
34 changed files with 555 additions and 93 deletions
--- a/sf_sale/manifest.py
+++ b/sf_sale/manifest.py
@@ -27,6 +27,7 @@
    'assets': {
        'web.assets_backend': [
            'sf_sale/static/js/setTableWidth.js',
+            'sf_sale/static/src/css/purchase_list.css',
        ]
    },
    'demo': [