Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

sf_base/models/functional_fixture.py

@@ -37,7 +37,7 @@ class FunctionalFixture(models.Model):
     vice_tray_model_ids = fields.Many2many('sf.fixture.model', 'rel_fixture_model_vice_tray', string="虎钳托盘型号",
                                            domain=[('fixture_material_type', '=', '虎钳托盘')])
     registration_status = fields.Selection([("已注册", "已注册"), ("未注册", "未注册")], string="注册状态", default='未注册', tracking=True)
-
+    active = fields.Boolean('有效', default=True)
 
     @api.onchange('type_id')
     def _onchange_type_id(self):