Merge pull request #1613 from OCA/18.0

Syncing from upstream OCA/product-attribute (18.0)

Author: bt-admin

README.md

@@ -72,10 +72,10 @@ addon | version | maintainers | summary
 [product_pricelist_alternative](product_pricelist_alternative/) | 18.0.1.0.0 |  | Calculate product price based on alternative pricelists
 [product_pricelist_assortment](product_pricelist_assortment/) | 18.0.1.0.1 |  | Product assortment and pricelist
 [product_pricelist_by_contact](product_pricelist_by_contact/) | 18.0.1.0.0 |  | Product Pricelist Per Contact
-[product_pricelist_direct_print](product_pricelist_direct_print/) | 18.0.1.1.0 | <a href='https://github.com/legalsylvain'><img src='https://github.com/legalsylvain.png' width='32' height='32' style='border-radius:50%;' alt='legalsylvain'/></a> | Print price list from menu option, product templates, products variants or price lists
+[product_pricelist_direct_print](product_pricelist_direct_print/) | 18.0.1.1.1 | <a href='https://github.com/legalsylvain'><img src='https://github.com/legalsylvain.png' width='32' height='32' style='border-radius:50%;' alt='legalsylvain'/></a> | Print price list from menu option, product templates, products variants or price lists
 [product_pricelist_direct_print_company_group](product_pricelist_direct_print_company_group/) | 18.0.1.0.0 |  | Print Pricelist items using the company group model
 [product_pricelist_direct_print_website_sale](product_pricelist_direct_print_website_sale/) | 18.0.1.0.1 | <a href='https://github.com/CarlosRoca13'><img src='https://github.com/CarlosRoca13.png' width='32' height='32' style='border-radius:50%;' alt='CarlosRoca13'/></a> | Extend Product Pricelist Direct Print for filter by public categories
-[product_pricelist_direct_print_xlsx](product_pricelist_direct_print_xlsx/) | 18.0.1.0.2 |  | Print price list in XLSX format
+[product_pricelist_direct_print_xlsx](product_pricelist_direct_print_xlsx/) | 18.0.1.0.3 |  | Print price list in XLSX format
 [product_pricelist_discount_by_range](product_pricelist_discount_by_range/) | 18.0.1.0.0 |  | Allows to create priceslists with discount ranges
 [product_pricelist_fixed_currency_rate](product_pricelist_fixed_currency_rate/) | 18.0.1.0.1 | <a href='https://github.com/LoisRForgeFlow'><img src='https://github.com/LoisRForgeFlow.png' width='32' height='32' style='border-radius:50%;' alt='LoisRForgeFlow'/></a> <a href='https://github.com/kobros-tech'><img src='https://github.com/kobros-tech.png' width='32' height='32' style='border-radius:50%;' alt='kobros-tech'/></a> | Set a fixed currency rate between pricelists
 [product_pricelist_item_list_view](product_pricelist_item_list_view/) | 18.0.1.0.0 | <a href='https://github.com/LoisRForgeFlow'><img src='https://github.com/LoisRForgeFlow.png' width='32' height='32' style='border-radius:50%;' alt='LoisRForgeFlow'/></a> | View and search the list of pricelist items

product_pricelist_direct_print/README.rst

@@ -11,7 +11,7 @@ Product Pricelist Direct Print
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:a12c01596213a3647cfc6109b3cdff7fa93db0e1b6488c61ee2a5f474117d93b
+   !! source digest: sha256:0c5e0096d45b292129979ae295c2839347859eae02f1c711bda9e6036b8cea4e
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

product_pricelist_direct_print/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Product Pricelist Direct Print",
     "summary": "Print price list from menu option, product templates, "
     "products variants or price lists",
-    "version": "18.0.1.1.0",
+    "version": "18.0.1.1.1",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
     "author": "Tecnativa, GRAP, Odoo Community Association (OCA)",

product_pricelist_direct_print/reports/report_product_pricelist.xml

@@ -5,6 +5,10 @@
     <template id="report_product_pricelist_document">
         <t t-call="web.html_container">
             <t t-set="o" t-value="o.with_context(lang=o.lang)" />
+            <t
+                t-set="o"
+                t-value="o.with_context(product_prices=o._get_product_prices(o.get_products_to_print()))"
+            />
             <t t-set="pricelist" t-value="o.get_pricelist_to_print()" />
             <t t-set="company" t-value="pricelist.company_id or env.company" />
             <t t-call="web.external_layout">

product_pricelist_direct_print/static/description/index.html

@@ -372,7 +372,7 @@ <h1>Product Pricelist Direct Print</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:a12c01596213a3647cfc6109b3cdff7fa93db0e1b6488c61ee2a5f474117d93b
+!! source digest: sha256:0c5e0096d45b292129979ae295c2839347859eae02f1c711bda9e6036b8cea4e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/product-attribute/tree/18.0/product_pricelist_direct_print"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_pricelist_direct_print"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/product-attribute&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Print price list from menu option, product templates, products variants

product_pricelist_direct_print/wizards/product_pricelist_print.py

@@ -97,12 +97,36 @@ class ProductPricelistPrint(models.TransientModel):
     def _onchange_categ_ids(self):
         self.print_child_categories = len(self.categ_ids) > 0
 
+    def _get_product_prices(self, products):
+        """Return ``{product_id: price}`` computing every product in a single
+        batched call.
+
+        The native ``_compute_price_rule`` fetches the applicable rules once for
+        the whole recordset, so calling it once for all the products avoids the
+        N+1 of recomputing the price (and re-searching the rules) per report
+        row. The result is meant to be injected in the context as
+        ``product_prices`` so ``_compute_product_price`` reads it instead of
+        recomputing.
+        """
+        self.ensure_one()
+        if not products:
+            return {}
+        return self.get_pricelist_to_print()._get_products_price(
+            products, 1, date=self.date
+        )
+
     @api.depends_context("product")
     def _compute_product_price(self):
         product = self.env.context["product"]
-        price = self.get_pricelist_to_print()._get_product_price(
-            product, 1, date=self.date
-        )
+        # Reuse the batched prices injected by the report when available to
+        # avoid recomputing the price (and re-searching the rules) per product.
+        prices = self.env.context.get("product_prices")
+        if prices is not None and product.id in prices:
+            price = prices[product.id]
+        else:
+            price = self.get_pricelist_to_print()._get_product_price(
+                product, 1, date=self.date
+            )
         if self.vat_mode == "vat_excl":
             self.product_price = product.taxes_id.compute_all(price)["total_excluded"]
         elif self.vat_mode == "vat_incl":

product_pricelist_direct_print_xlsx/README.rst

@@ -11,7 +11,7 @@ Product Pricelist Direct Print (XLSX)
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:0f7edad20ac09e9fb78de60a6ee62e9ae88e362fba9b420bbd129f81bda79750
+   !! source digest: sha256:d01459cfcc4c9c8047832601c2e0bb73d161ba4b006aad27a17bdc082c4482a2
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

product_pricelist_direct_print_xlsx/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Product Pricelist Direct Print (XLSX)",
     "summary": "Print price list in XLSX format",
-    "version": "18.0.1.0.2",
+    "version": "18.0.1.0.3",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
     "author": "Tecnativa, GRAP, Odoo Community Association (OCA)",

product_pricelist_direct_print_xlsx/report/product_pricelist_xlsx.py

@@ -17,6 +17,11 @@ def generate_xlsx_report(self, workbook, data, objects):
         self = self.with_context(
             lang=book.lang or self.env["res.users"].browse(book.create_uid.id).lang
         )
+        # Precompute every product price in a single batched call so the price
+        # column does not recompute (and re-search the pricelist rules) per row.
+        book = book.with_context(
+            product_prices=book._get_product_prices(book.get_products_to_print())
+        )
         pricelist = book.get_pricelist_to_print()
         sheet = self._create_product_pricelist_sheet(workbook, book, pricelist, formats)
         sheet = self._fill_data(workbook, sheet, book, pricelist, formats)

product_pricelist_direct_print_xlsx/static/description/index.html

@@ -372,7 +372,7 @@ <h1>Product Pricelist Direct Print (XLSX)</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:0f7edad20ac09e9fb78de60a6ee62e9ae88e362fba9b420bbd129f81bda79750
+!! source digest: sha256:d01459cfcc4c9c8047832601c2e0bb73d161ba4b006aad27a17bdc082c4482a2
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/product-attribute/tree/18.0/product_pricelist_direct_print_xlsx"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_pricelist_direct_print_xlsx"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/product-attribute&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module is based on the OCA module