diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index af0f0aa9..f065f562 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1378,9 +1378,9 @@ class MrpProduction(models.Model):
             move = self.env['stock.move'].search([('origin', '=', productions.name)], order='id desc')
             for mo in move:
                 domain = []
-                if mo.location_id.barcode == 'WH-POSTPRODUCTION' and mo.rule_id.picking_type_id.barcode == 'PC':
+                if mo.location_id.barcode == 'PL' and mo.rule_id.picking_type_id.sequence_code == 'PC':
                     domain = [('barcode', '=', 'WH-PC'), ('sequence_code', '=', 'PC')]
-                elif mo.location_id.barcode == 'PL' and mo.rule_id.picking_type_id.barcode == 'INT':
+                elif mo.location_id.barcode == 'WH-INPUT' and mo.rule_id.picking_type_id.sequence_code == 'INT':
                     domain = [('barcode', '=', 'WH-INTERNAL'), ('sequence_code', '=', 'INT')]
                 if domain:
                     picking_type = self.env['stock.picking.type'].search(domain)
@@ -1540,7 +1540,7 @@ class MrpProduction(models.Model):
     @api.depends('procurement_group_id', 'procurement_group_id.stock_move_ids.group_id')
     def _compute_picking_ids(self):
         for order in self:
-            if order.product_id.product_tmpl_id.single_manufacturing == True:
+            if order.product_id.product_tmpl_id.single_manufacturing == True and not order.is_remanufacture:
                 first_order = self.env['mrp.production'].search(
                     [('origin', '=', order.origin), ('product_id', '=', order.product_id.id)], limit=1, order='id asc')
                 order.picking_ids = self.env['stock.picking'].search([