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

@@ -121,4 +121,21 @@
<field name="context">{}</field>
<field name="target">new</field>
</record>
<!-- ================================================================================================== -->
<record id="picking_check_cancel_wizard_form" model="ir.ui.view">
<field name="name">picking.check.cancel.wizard</field>
<field name="model">picking.check.cancel.wizard</field>
<field name="arch" type="xml">
<form string="Quality Check Failed">
<div>质量检查单已完成,继续取消吗?</div>
<div class="'color': 'red'">注意:关联质量检查单也将被取消。</div>
<footer>
<button name="confirm_picking_check" type="object" class="btn-primary" string="确认"/>
<button name="cancel_picking_check" type="object" string="取消"/>
</footer>
</form>
</field>
</record>
</odoo>