diff --git a/purchase_stock_usability/models/stock_move.py b/purchase_stock_usability/models/stock_move.py
index b87676f..86d61bf 100644
--- a/purchase_stock_usability/models/stock_move.py
+++ b/purchase_stock_usability/models/stock_move.py
@@ -21,10 +21,11 @@ class StockMove(models.Model):
                 partner_id = po.partner_id.commercial_partner_id.id
                 if partner_id:
                     sinfo = pso.search_read([
-                        ('product_code', '!=', False),
-                        ('partner_id', '=', partner_id),
-                        ('company_id', 'in', (False, move.company_id.id)),
+                        ('product_tmpl_id', '=', move.product_id.product_tmpl_id.id),
                         ('product_id', 'in', (False, move.product_id.id)),
+                        ('partner_id', '=', partner_id),
+                        ('product_code', '!=', False),
+                        ('company_id', 'in', (False, move.company_id.id)),
                         ], ['product_code'], limit=1, order='product_id')
                     # if I order by product_id, I get the null values at the end
                     if sinfo:
diff --git a/purchase_stock_usability/models/stock_move_line.py b/purchase_stock_usability/models/stock_move_line.py
index 455d861..7950b76 100644
--- a/purchase_stock_usability/models/stock_move_line.py
+++ b/purchase_stock_usability/models/stock_move_line.py
@@ -22,10 +22,11 @@ class StockMoveLine(models.Model):
                 partner_id = po.partner_id.commercial_partner_id.id
                 if partner_id:
                     sinfo = pso.search_read([
-                        ('product_code', '!=', False),
-                        ('partner_id', '=', partner_id),
-                        ('company_id', 'in', (False, mline.company_id.id)),
+                        ('product_tmpl_id', '=', mline.product_id.product_tmpl_id.id),
                         ('product_id', 'in', (False, mline.product_id.id)),
+                        ('partner_id', '=', partner_id),
+                        ('product_code', '!=', False),
+                        ('company_id', 'in', (False, mline.company_id.id)),
                         ], ['product_code'], limit=1, order='product_id')
                     # if I order by product_id, I get the null values at the end
                     if sinfo:
diff --git a/purchase_usability/models/purchase_order.py b/purchase_usability/models/purchase_order.py
index 76db2cc..3d792d9 100644
--- a/purchase_usability/models/purchase_order.py
+++ b/purchase_usability/models/purchase_order.py
@@ -86,10 +86,11 @@ class PurchaseOrderLine(models.Model):
                 partner_id = line.order_id.partner_id.commercial_partner_id.id
                 if partner_id:
                     sinfo = pso.search_read([
-                        ('product_code', '!=', False),
-                        ('partner_id', '=', partner_id),
-                        ('company_id', 'in', (False, line.order_id.company_id.id)),
+                        ('product_tmpl_id', '=', line.product_id.product_tmpl_id.id),
                         ('product_id', 'in', (False, line.product_id.id)),
+                        ('partner_id', '=', partner_id),
+                        ('product_code', '!=', False),
+                        ('company_id', 'in', (False, line.order_id.company_id.id)),
                         ], ['product_code'], limit=1, order='product_id')
                     # if I order by product_id, I get the null values at the end
                     if sinfo: