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

# Conflicts:
#	quality_control/security/ir.model.access.csv
#	quality_control/wizard/quality_check_wizard.py
#	sf_quality/__manifest__.py
#	sf_quality/models/__init__.py
#	sf_quality/models/stock.py
This commit is contained in:
mgw
2025-03-17 13:46:40 +08:00
28 changed files with 322 additions and 109 deletions

View File

@@ -24,7 +24,8 @@
'views/quality_cnc_test_view.xml',
'views/mrp_workorder.xml',
'views/quality_check_view.xml',
'views/quality_company.xml'
'views/quality_company.xml',
'wizard/check_picking_wizard_view.xml',
],
'assets': {