Merge pull request #30 from cormaza/13.0-fix-sales_product_filter

[13.0][FIX] sales_product_filter, change domain process to search in variants when comes from product template search

Author: cormaza

sales_product_filter/models/sale_order.py

@@ -1,4 +1,5 @@
 from odoo import api, fields, models
+from odoo.osv.expression import AND
 
 
 class SaleOrderLine(models.Model):
@@ -25,6 +26,16 @@ def search(self, args, offset=0, limit=None, order=None, count=False):
         return super(ProductProduct, self).search(args, offset, limit, order, count)
 
 
+def add_product_variant_to_domain(args):
+    new_args = []
+    for arg in args:
+        if isinstance(arg, (list, tuple)):
+            new_args.append((f"product_variant_ids.{arg[0]}", arg[1], arg[2]))
+        else:
+            new_args.append(arg)
+    return new_args
+
+
 class ProductTemplate(models.Model):
 
     _inherit = "product.template"
@@ -33,11 +44,15 @@ class ProductTemplate(models.Model):
     def name_search(self, name="", args=None, operator="ilike", limit=100):
         if self.env["sale.product.filter"].get_user_domains():
             args = self.env["sale.product.filter"].get_user_domains()
+            args = add_product_variant_to_domain(args)
         return super(ProductTemplate, self).name_search(name, args, operator, limit)
 
     def search(self, args, offset=0, limit=None, order=None, count=False):
         if self.env["sale.product.filter"].get_user_domains():
             if not args:
                 args = []
-            args += self.env["sale.product.filter"].get_user_domains()
+            domain = self.env["sale.product.filter"].get_user_domains()
+            domain = add_product_variant_to_domain(domain)
+            if domain:
+                args = AND([args, domain])
         return super(ProductTemplate, self).search(args, offset, limit, order, count)