解决冲突

2024-09-26 10:30:40 +08:00
parent 6c35ec13fd 83107b05e2
commit 29bd1c2968
13 changed files with 568 additions and 212 deletions
--- a/sf_message/manifest.py
+++ b/sf_message/manifest.py
@@ -11,9 +11,9 @@
    """,
    'category': 'sf',
    'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify','stock', 'sf_manufacturing', 'sf_hr'],
+    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify','stock', 'sf_tool_management', 'sf_manufacturing', 'sf_hr'],
    'data': [
-        'data/bussiness_node.xml'
+        'data/bussiness_node.xml',
    ],
    'test': [
    ],