Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

# Conflicts: # sf_manufacturing/security/ir.model.access.csv
2025-01-09 16:14:23 +08:00
parent aaf72d5e35 bb241095e2
commit 4b5661108a
11 changed files with 89 additions and 125 deletions
--- a/sf_manufacturing/manifest.py
+++ b/sf_manufacturing/manifest.py
@@ -16,6 +16,7 @@
        'data/stock_data.xml',
        'data/empty_racks_data.xml',
        'data/panel_data.xml',
+        'data/sf_work_individuation_page.xml',
        'data/agv_scheduling_data.xml',
        'security/group_security.xml',
        'security/ir.model.access.csv',