Update applying price by update _is_applicable_for function in product_pricelist

Author: DucTruongKomit

sale_pricelist_global_rule/README.rst

@@ -2,7 +2,7 @@
 Sale pricelist global rule
 ==========================
 
-..
+.. 
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
@@ -64,21 +64,7 @@ Configuration
 - Create a new Pricelist and add at least one line with the Apply On
   option set to Global - Product template or Global - Product category
 - Choose the specific product template or category for the rule.
-- Set the computation mode and save.
-
-**Global by Product Ancestor Category**
-
-- In the pricelist line, set **Apply On** to *Global - Ancestor Product Category*.
-- Select the **Ancestor Product Category**; the rule will apply to any product
-  whose category is a descendant of the selected ancestor.
-- Optionally set **Minimum Quantity**; this value is checked against the
-  **cumulative quantities** of all products in the sales order that belong to
-  any descendant category of the selected ancestor.
-- When multiple ancestor-category rules are eligible, the system will select
-  the one with the **highest discount** (*Percent Price*) after considering
-  the rule sequence (lowest sequence first).
-- Other fields (e.g., *Product*, *Product Category*) are not required and are
-  cleared when this option is chosen.
+- Set the computation mode and save
 
 Usage
 =====
@@ -90,17 +76,6 @@ Usage
 - Click the **Recompute pricelist global** button to update prices
   according to the specified pricelist rules.
 
-**Global by Product Ancestor Category**
-
-- Create or open a Sales Order and add lines for products from different
-  subcategories under the same ancestor category.
-- Click **Compute pricelist global rule** on the order.
-- The module will evaluate applicable ancestor-category rules using the
-  **cumulative quantity across descendant categories**. If the cumulative total
-  reaches the *Minimum Quantity*, the rule is applied.
-- When multiple rules qualify, the system selects based on **sequence**
-  (ascending) and then chooses the one with the **highest discount** (*Percent Price*).
-
 Known issues / Roadmap
 ======================
 
@@ -133,11 +108,6 @@ Contributors
 
   - Pedro M. Baeza
   - Carlos López
-- `Komit Company Limited <https://komit-consulting.com/>`__
-
-  - Jean-Charles Drubay
-  - Truong Dinh Minh Duc
-  - Vo Minh Bao Hieu
 
 Maintainers
 -----------

sale_pricelist_global_rule/models/product_pricelist.py

@@ -9,10 +9,7 @@ class ProductPricelistItem(models.Model):
         selection_add=[
             ("3_1_global_product_template", "Global - Product template"),
             ("3_2_global_product_category", "Global - Product category"),
-            (
-                "3_3_global_product_ancestor_category",
-                "Global - Ancestor Product Category",
-            ),
+            ("3_3_global_product_ancestor_category", "Global - Ancestor Product Category"),
         ],
         ondelete={
             "3_1_global_product_template": "set default",
@@ -69,12 +66,10 @@ def _check_product_consistency(self):
                 item.applied_on == "3_3_global_product_ancestor_category"
                 and not item.ancestor_product_category_id
             ):
-                raise ValidationError(
-                    _(
-                        "Please specify the product ancestor category for which this "
-                        "global rule should be applied"
-                    )
-                )
+                raise ValidationError(_(
+                    "Please specify the product ancestor category for which this global"
+                    " rule should be applied"
+                ))
         return res
 
     @api.depends(
@@ -113,8 +108,7 @@ def _compute_name_and_price(self):
                 and item.applied_on == "3_3_global_product_ancestor_category"
             ):
                 item.name = _("Ancestor product category: %s") % (
-                    item.ancestor_product_category_id.display_name
-                )
+                    item.ancestor_product_category_id.display_name)
         return res
 
     @api.model_create_multi
@@ -144,15 +138,13 @@ def create(self, vals_list):
                         }
                     )
                 elif applied_on == "3_3_global_product_ancestor_category":
-                    values.update(
-                        {
-                            "product_id": None,
-                            "product_tmpl_id": None,
-                            "categ_id": None,
-                            "global_categ_id": None,
-                            "global_product_tmpl_id": None,
-                        }
-                    )
+                    values.update({
+                        "product_id": None,
+                        "product_tmpl_id": None,
+                        "categ_id": None,
+                        "global_categ_id": None,
+                        "global_product_tmpl_id": None,
+                    })
         return super().create(vals_list)
 
     def write(self, values):
@@ -204,36 +196,57 @@ def _is_applicable_for(self, product, qty_in_product_uom):
         :rtype: bool
         """
         self.ensure_one()
-        qty_data = self.env.context.get("pricelist_global_cummulative_quantity", {})
-        if not qty_data or self.applied_on not in [
+        qty_data = self.env.context.get("pricelist_global_cummulative_quantity", {}) or {}
+        applied_on_vals = {
             "3_1_global_product_template",
             "3_2_global_product_category",
             "3_3_global_product_ancestor_category",
-        ]:
+        }
+        # If not one of the supported "global" applied_on values → fallback to super()
+        if not qty_data or self.applied_on not in applied_on_vals:
             return super()._is_applicable_for(product, qty_in_product_uom)
 
         is_applicable = True
+        # Global Product Template
         if self.applied_on == "3_1_global_product_template":
-            total_qty = qty_data["by_template"].get(product.product_tmpl_id, 0.0)
+            total_qty = qty_data.get("by_template", {}).get(product.product_tmpl_id, 0.0)
             if self.min_quantity and total_qty < self.min_quantity:
                 is_applicable = False
             elif self.global_product_tmpl_id != product.product_tmpl_id:
                 is_applicable = False
+        # Global Product Category
         elif self.applied_on == "3_2_global_product_category":
-            total_qty = qty_data["by_categ"].get(product.categ_id, 0.0)
+            total_qty = qty_data.get("by_categ", {}).get(product.categ_id, 0.0)
             if self.min_quantity and total_qty < self.min_quantity:
                 is_applicable = False
             elif not product.categ_id.parent_path.startswith(
                 self.global_categ_id.parent_path
             ):
                 is_applicable = False
-
+        # Global Product Ancestor Category
         elif self.applied_on == "3_3_global_product_ancestor_category":
-            total_qty = qty_data.get("by_categ", {}).get(product.categ_id, 0.0)
+            ancestor_categ = self.ancestor_product_category_id
+            if not ancestor_categ:
+                return False
+
+            # collect all ids in ancestor branch using child_of
+            child_ids = self.env['product.category'].search([
+                ('id', 'child_of', ancestor_categ.id)
+            ])
+            # product must belong to the branch
+            prod_categ = product.categ_id
+            if not prod_categ or prod_categ not in child_ids:
+                return False
+
+            # compute total qty across all categories in this branch
+            total_qty = 0.0
+            by_categ = qty_data.get("by_categ", {})
+            for categ_id, qty in by_categ.items():
+                c_id = categ_id.id if hasattr(categ_id, "id") else int(categ_id)
+                if c_id in child_ids:
+                    total_qty += qty
+
             if self.min_quantity and total_qty < self.min_quantity:
                 is_applicable = False
-            elif not product.categ_id.parent_path.startswith(
-                self.ancestor_product_category_id.parent_path
-            ):
-                is_applicable = False
+
         return is_applicable

sale_pricelist_global_rule/models/sale_order_line.py

@@ -1,72 +1,22 @@
-from odoo import api, models
+from odoo import models
 
 
 class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"
 
-    @api.depends("product_id", "product_uom", "product_uom_qty")
     def _compute_pricelist_item_id(self):
-        # Compute the applicable pricelist item for each sale order line.
-        # For rules using "Global - Ancestor Product Category":
-        # - Compute cumulative product quantities per category in the order.
-        # - Evaluate whether total quantity of descendant products meets min_quantity.
-        # - Select the valid rule based on sequence (ASC) and discount (DESC).
-        # Sale order data is cached per order to avoid redundant calculations.
+        # Compute the cumulative quantity of products in the sale order
+        # for each line to ensure quantities are not mixed between different orders.
+        # Store the data in a dictionary to avoid redundant computations
+        # for the same order multiple times.
         sale_data = {}
         res = None
-        product_categ_env = self.env["product.category"]
         for line in self:
             if line.order_id not in sale_data:
                 sale_data[line.order_id] = line.order_id._get_cummulative_quantity()
             qty_data = sale_data[line.order_id]
-            # First run the normal pricelist logic
             res = super(
                 SaleOrderLine,
                 line.with_context(pricelist_global_cummulative_quantity=qty_data),
             )._compute_pricelist_item_id()
-
-            # Check if there are any global-ancestor-category rules applicable
-            valid_items = []
-            pricelist_items = line.order_id.pricelist_id.item_ids.filtered(
-                lambda rule: rule.applied_on == "3_3_global_product_ancestor_category"
-                and rule.ancestor_product_category_id
-            )
-
-            for rule in pricelist_items:
-                ancestor_product_categ = rule.ancestor_product_category_id
-                categories = set(
-                    product_categ_env.search(
-                        [("id", "child_of", ancestor_product_categ.id)]
-                    ).ids
-                )
-
-                if line.product_id.categ_id.id not in categories:
-                    continue
-
-                total_qty = sum(
-                    qty
-                    for categ, qty in qty_data["by_categ"].items()
-                    if categ.id in categories
-                )
-
-                if total_qty >= rule.min_quantity:
-                    valid_items.append(rule)
-
-            # If there's any valid global-ancestor rule, compare it with the current one
-            if valid_items:
-                valid_items.sort(key=lambda r: -r.percent_price)
-                best_rule = valid_items[0]
-                # Overwrite only if it's a better match than the current rule has best
-                # discount.
-                if (
-                    not line.pricelist_item_id
-                    or line.pricelist_item_id.applied_on
-                    == "3_3_global_product_ancestor_category"
-                    or (
-                        best_rule.percent_price > line.pricelist_item_id.percent_price
-                        and best_rule.applied_on
-                        == "3_3_global_product_ancestor_category"
-                    )
-                ):
-                    line.pricelist_item_id = best_rule
         return res

sale_pricelist_global_rule/readme/CONTRIBUTORS.md

@@ -1,7 +1,3 @@
 - [Tecnativa](https://www.tecnativa.com)
   - Pedro M. Baeza
   - Carlos López
-- [Komit Company Limited](https://komit-consulting.com/)
-  - Jean-Charles Drubay
-  - Truong Dinh Minh Duc
-  - Vo Minh Bao Hieu

sale_pricelist_global_rule/views/product_pricelist_item_views.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="view_product_pricelist_item_form" model="ir.ui.view">
         <field name="name">view.product.pricelist.item.form</field>
         <field name="model">product.pricelist.item</field>
@@ -25,5 +24,4 @@
             </xpath>
         </field>
     </record>
-
 </odoo>

sale_pricelist_global_rule/views/sale_order_views.xml

@@ -11,14 +11,14 @@
                     string="Recompute pricelist global"
                     name="button_compute_pricelist_global_rule"
                     type="object"
-                    attrs="{'invisible': [('state', 'not in', ['draft', 'sent']), ('has_pricelist_global', '=', False), ('need_recompute_pricelist_global', '=', False)]}"
+                    attrs="{'invisible': ['|', '|', ('state', 'not in', ['draft', 'sent']), ('has_pricelist_global', '=', False), ('need_recompute_pricelist_global', '=', False)]}"
                     class="oe_highlight"
                 />
                 <button
                     string="Recompute pricelist global"
                     name="button_compute_pricelist_global_rule"
                     type="object"
-                    attrs="{'invisible': [('state', 'not in', ['draft', 'sent']), ('has_pricelist_global', '=', False), ('need_recompute_pricelist_global', '=', True)]}"
+                    attrs="{'invisible': ['|', '|', ('state', 'not in', ['draft', 'sent']), ('has_pricelist_global', '=', False), ('need_recompute_pricelist_global', '=', True)]}"
                 />
                 <field name="has_pricelist_global" invisible="1" />
                 <field name="need_recompute_pricelist_global" invisible="1" />