解决冲突

2024-11-15 15:30:35 +08:00
parent 73c986cd50 f8a9a38778
commit 9410ca82db
10 changed files with 150 additions and 33 deletions
--- a/sf_manufacturing/manifest.py
+++ b/sf_manufacturing/manifest.py
@@ -12,6 +12,7 @@
    'website': 'https://www.sf.jikimo.com',
    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer', 'jikimo_sale_multiple_supply_methods'],
    'data': [
+        'data/cron_data.xml',
        'data/stock_data.xml',
        'data/empty_racks_data.xml',
        'data/panel_data.xml',