Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）

# Conflicts: # sf_sale/models/quick_easy_order.py
2023-10-24 09:45:35 +08:00
parent 2d32419a7d 8f29696b64
commit 093724a277
10 changed files with 546 additions and 341 deletions
--- a/sf_base/manifest.py
+++ b/sf_base/manifest.py
@@ -10,7 +10,7 @@
    """,
    'category': 'sf',
    'website': 'https://www.sf.jikimo.com',
-    'depends': ['account', 'base', 'mrp_workorder', 'sale'],
+    'depends': ['account', 'base', 'mrp_workorder', 'sale', 'purchase'],
    'data': [
        'security/group_security.xml',
        'security/ir.model.access.csv',