Merge branch refs/heads/develop into refs/heads/release/release_1.8

2024-06-25 09:47:34 +08:00
parent 828b4b0f6b 6a24776701
commit f005a29beb
16 changed files with 482 additions and 402 deletions
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -331,7 +331,7 @@ class ToolInventory(models.Model):
    work_material = fields.Selection([('钢', '钢'), ('铝', '铝')], string='加工材料')
    life_span = fields.Float('寿命(min)')

-    tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组')
+    tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组', required=True)

    active = fields.Boolean('已归档', default=True)