diff --git a/mrp_workorder/models/quality.py b/mrp_workorder/models/quality.py
index 7867c029..a0797b61 100644
--- a/mrp_workorder/models/quality.py
+++ b/mrp_workorder/models/quality.py
@@ -190,7 +190,6 @@ 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(
diff --git a/quality_control/models/stock_picking.py b/quality_control/models/stock_picking.py
index bc8638d7..243ffd18 100644
--- a/quality_control/models/stock_picking.py
+++ b/quality_control/models/stock_picking.py
@@ -108,15 +108,11 @@ class StockPicking(models.Model):
 
     def action_open_quality_check_picking(self):
         action = self.env["ir.actions.actions"]._for_xml_id("quality_control.quality_check_action_picking")
-        action['context'] = self.env.context.copy()
-        keys_to_remove = [key for key in action['context'] if key.startswith('default_')]
-        for key in keys_to_remove:
-            del action['context'][key]
-        action['context'].update({
+        action['context'] = {
             'search_default_picking_id': [self.id],
             'default_picking_id': self.id,
             'show_lots_text': self.show_lots_text,
-        })
+        }
         return action
 
     def button_quality_alert(self):
diff --git a/sf_quality/models/stock.py b/sf_quality/models/stock.py
index c9788a51..fa5003e7 100644
--- a/sf_quality/models/stock.py
+++ b/sf_quality/models/stock.py
@@ -18,13 +18,13 @@ class StockPicking(models.Model):
             fail_check_text = ''
             for product_id in product_list:
                 check_ids = quality_check_ids.filtered(lambda qc: qc.product_id == product_id)
-                number = sum(check_ids.mapped('qty_line'))
-                if number != 0:
-                    fail_check_text = (f'{fail_check_text}、{product_id.name} {number}件'
-                                       if fail_check_text != '' else f'{product_id.name} {number}件')
+                if all(check_id.measure_on == 'move_line' for check_id in check_ids):
+                    number = sum(check_ids.mapped('qty_line'))
                 else:
-                    fail_check_text = (f'{fail_check_text}、{product_id.name}'
-                                       if fail_check_text != '' else f'{product_id.name}')
+                    number = sum(self.move_ids_without_package.filtered(
+                        lambda ml: ml.product_id == product_id).mapped('quantity_done'))
+                fail_check_text = (f'{fail_check_text}、{product_id.name}  {number}件'
+                                   if fail_check_text != '' else f'{product_id.name}  {number}件')
             return {
                 'type': 'ir.actions.act_window',
                 'res_model': 'picking.validate.check.wizard',