Merge branch 'develop' into feature/commercially_launched

mrp_workorder/models/quality.py

@@ -190,6 +190,7 @@ class QualityCheck(models.Model):
     # doubly linked chain for tablet view navigation
     next_check_id = fields.Many2one('quality.check')
     previous_check_id = fields.Many2one('quality.check')
+    is_produced = fields.Boolean(string="Has Been Produced")
 
     # For components registration
     move_id = fields.Many2one(

quality_control/wizard/quality_check_wizard.py

@@ -122,8 +122,8 @@ class PickingCheckCancelWizard(models.TransientModel):
     picking_id = fields.Many2one('stock.picking', 'stock picking')
 
     def confirm_picking_check(self):
-        self.picking_id.action_cancel()
-        return {'type': 'ir.actions.act_window_close'}
+        res = self.picking_id.action_cancel()
+        return res
 
     def cancel_picking_check(self):
         # 这里是取消后的逻辑

sf_quality/wizard/check_picking_wizard.py

@@ -9,8 +9,8 @@ class PickingValidateCheckWizard(models.TransientModel):
     fail_check_text = fields.Text('提示信息')
 
     def confirm_picking_validate_check(self):
-        self.picking_id.button_validate()
-        return {'type': 'ir.actions.act_window_close'}
+        res = self.picking_id.button_validate()
+        return res
 
     def cancel_picking_validate_check(self):
         # 这里是取消后的逻辑