Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化

# Conflicts: # sf_manufacturing/models/stock.py
2023-09-14 09:46:28 +08:00
parent ad0603f921 4613dc791b
commit eb0d83aa3a
19 changed files with 410 additions and 208 deletions
--- a/sf_sale/manifest.py
+++ b/sf_sale/manifest.py
@@ -10,7 +10,7 @@
    """,
    'category': 'sf',
    'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale_management', 'web_widget_model_viewer',],
+    'depends': ['sale_management', 'web_widget_model_viewer', 'sale_stock'],
    'data': [
        'security/group_security.xml',
        'security/ir.model.access.csv',