Merge pull request #1403 from OCA/16.0

Syncing from upstream OCA/product-attribute (16.0)

Author: bt-admin

README.md

@@ -64,12 +64,12 @@ addon | version | maintainers | summary
 [product_net_weight](product_net_weight/) | 16.0.1.0.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> | Add 'Net Weight' on product models
 [product_optional_product_quantity](product_optional_product_quantity/) | 16.0.1.1.0 |  | Specify optional products quantity for product
 [product_origin](product_origin/) | 16.0.1.0.0 | <a href='https://github.com/rousseldenis'><img src='https://github.com/rousseldenis.png' width='32' height='32' style='border-radius:50%;' alt='rousseldenis'/></a> <a href='https://github.com/legalsylvain'><img src='https://github.com/legalsylvain.png' width='32' height='32' style='border-radius:50%;' alt='legalsylvain'/></a> | Adds the origin of the product
-[product_packaging_container_deposit](product_packaging_container_deposit/) | 16.0.1.2.0 |  | Add container deposit fees in a order
+[product_packaging_container_deposit](product_packaging_container_deposit/) | 16.0.1.2.1 |  | Add container deposit fees in a order
 [product_packaging_dimension](product_packaging_dimension/) | 16.0.1.1.1 |  | Manage packaging dimensions and weight
 [product_packaging_level](product_packaging_level/) | 16.0.1.2.1 |  | This module binds a product packaging to a packaging level
 [product_packaging_level_purchasable](product_packaging_level_purchasable/) | 16.0.1.1.0 |  | Control purchase of products via packaging settings.
 [product_packaging_level_salable](product_packaging_level_salable/) | 16.0.1.0.0 |  | Product Packaging level salable
-[product_pricelist_alternative](product_pricelist_alternative/) | 16.0.1.2.0 |  | Calculate product price based on alternative pricelists
+[product_pricelist_alternative](product_pricelist_alternative/) | 16.0.1.2.1 |  | Calculate product price based on alternative pricelists
 [product_pricelist_direct_print](product_pricelist_direct_print/) | 16.0.1.3.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/) | 16.0.1.0.0 |  | Print Pricelist items using the company group model
 [product_pricelist_direct_print_website_sale](product_pricelist_direct_print_website_sale/) | 16.0.1.0.0 | <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_packaging_container_deposit/README.rst

@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 ===================================
 Product Packaging Container Deposit
 ===================================
@@ -7,13 +11,13 @@ Product Packaging Container Deposit
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:99a5d919b3a017ca6032d6bd9c7e3804a2bc3b8cd0edff0e902c2c2f45c7fad9
+   !! source digest: sha256:fb2b09c1d84254e1245d1b076aa016d57982fd7593e072dbcdee46c13770dfce
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github

product_packaging_container_deposit/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     "name": "Product Packaging Container Deposit",
-    "version": "16.0.1.2.0",
+    "version": "16.0.1.2.1",
     "development_status": "Beta",
     "category": "Product",
     "summary": "Add container deposit fees in a order",

product_packaging_container_deposit/models/container_deposit_order_mixin.py

@@ -40,8 +40,13 @@ def update_order_container_deposit_quantity(self):
         )
         line_ids_to_delete = []
         for order in self:
+            lines = order[self._get_order_line_field()]
+            fieldname_line_product_qty = lines._get_product_qty_field()
+            fieldname_line_product_qty_delivered_received = (
+                lines._get_product_qty_delivered_received_field()
+            )
             # Lines to compute container deposit
-            lines_to_comp_deposit = order[self._get_order_line_field()].filtered(
+            lines_to_comp_deposit = lines.filtered(
                 lambda ln: (
                     ln.product_packaging_id.package_type_id.container_deposit_product_id
                 )
@@ -52,15 +57,15 @@ def update_order_container_deposit_quantity(self):
             )
             lines_to_update = {}
             lines_to_create = []
-            for line in self[self._get_order_line_field()]:
+            for line in lines:
                 if not line.is_container_deposit:
                     continue
                 qty, qty_dlvd_rcvd = deposit_container_qties.pop(
                     line["product_id"], [False, False]
                 )
                 if not qty:
                     new_vals = {
-                        line._get_product_qty_field(): 0,
+                        fieldname_line_product_qty: 0,
                     }
                     if order.state == "draft":
                         # values_lst.append(Command.delete(line.id))
@@ -71,10 +76,17 @@ def update_order_container_deposit_quantity(self):
                     lines_to_update[line.id] = new_vals
 
                 else:
-                    lines_to_update[line.id] = {
-                        line._get_product_qty_field(): qty,
-                        line._get_product_qty_delivered_received_field(): qty_dlvd_rcvd,
-                    }
+                    lines_to_update[line.id] = values = {}
+                    if line[fieldname_line_product_qty] != qty:
+                        values[fieldname_line_product_qty] = qty
+                    if (
+                        line[fieldname_line_product_qty_delivered_received]
+                        != qty_dlvd_rcvd
+                    ):
+                        values[
+                            fieldname_line_product_qty_delivered_received
+                        ] = qty_dlvd_rcvd
+
             for product in deposit_container_qties:
                 if deposit_container_qties[product][0]:
                     values = order.prepare_deposit_container_line(
@@ -84,7 +96,9 @@ def update_order_container_deposit_quantity(self):
                     lines_to_create.append(values)
             line_model = self._fields[self._get_order_line_field()].comodel_name
             for line_id, values in lines_to_update.items():
-                self.env[line_model].browse(line_id).exists().write(values)
+                line = self.env[line_model].browse(line_id).exists()
+                if line and values:
+                    line.write(values)
             if lines_to_create:
                 self.env[line_model].create(lines_to_create)
         # Schedule line to delete after commit to avoid caching issue w/ UI

product_packaging_container_deposit/static/description/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Product Packaging Container Deposit</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="product-packaging-container-deposit">
-<h1 class="title">Product Packaging Container Deposit</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="product-packaging-container-deposit">
+<h1>Product Packaging Container Deposit</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:99a5d919b3a017ca6032d6bd9c7e3804a2bc3b8cd0edff0e902c2c2f45c7fad9
+!! source digest: sha256:fb2b09c1d84254e1245d1b076aa016d57982fd7593e072dbcdee46c13770dfce
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/product-attribute/tree/16.0/product_packaging_container_deposit"><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-16-0/product-attribute-16-0-product_packaging_container_deposit"><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=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<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/16.0/product_packaging_container_deposit"><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-16-0/product-attribute-16-0-product_packaging_container_deposit"><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=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Allow to indicate on a product packaging package type that it comes with a container deposit. The deposit product should be a service product.
 For instance, you can create a package type “plastic box” and indicate as container deposit “plastic box deposit”.</p>
 <p>Use the corresponding sales and purchase modules to add the deposit fees in the order. Each packaging level can have a deposit. The biggest package type of each packaging level will be used in the computation unless a specific package type is given on the order line.</p>
@@ -386,32 +391,32 @@ <h1 class="title">Product Packaging Container Deposit</h1>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/product-attribute/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/product-attribute/issues/new?body=module:%20product_packaging_container_deposit%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-3">Authors</a></h3>
 <ul class="simple">
 <li>Camptocamp</li>
 <li>BCIM</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">Contributors</a></h3>
 <ul class="simple">
 <li>Telmo Santos &lt;<a class="reference external" href="mailto:telmo.santos&#64;camptocamp.com">telmo.santos&#64;camptocamp.com</a>&gt;</li>
 <li>Jacques-Etienne Baudoux (BCIM) &lt;<a class="reference external" href="mailto:je&#64;bcim.be">je&#64;bcim.be</a>&gt;</li>
 <li>Simone Orsi &lt;<a class="reference external" href="mailto:simone.orsi&#64;camptocamp.com">simone.orsi&#64;camptocamp.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -424,5 +429,6 @@ <h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>

product_pricelist_alternative/README.rst

@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 =============================
 Product Pricelist Alternative
 =============================
@@ -7,13 +11,13 @@ Product Pricelist Alternative
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d0c65497950562e7e7984650f3fd3c19fe1edb10d0bf08eb62523523436aa7f1
+   !! source digest: sha256:cee97fb5bf7cd4cb64b1dc06958ca21fea79d0e8a88c29aeb9ff868d9f79ed84
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github

product_pricelist_alternative/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     "name": "Product Pricelist Alternative",
-    "version": "16.0.1.2.0",
+    "version": "16.0.1.2.1",
     "development_status": "Beta",
     "category": "Product",
     "summary": "Calculate product price based on alternative pricelists",

product_pricelist_alternative/models/product_pricelist.py

@@ -62,24 +62,31 @@ def _compute_price_rule(self, products, qty, uom=None, date=False, **kwargs):
 
         # In some contexts we want to ignore alternative pricelists
         # and return the original price
-        if self.env.context.get("skip_alternative_pricelist", False):
+        if self.env.context.get(
+            "skip_alternative_pricelist", False
+        ) or self.env.context.get("based_on_other_pricelist", False):
             return res
+        pricelist_items_ids = [val[1] for val in res.values()]
+        use_lower_price_item = (
+            self.env["product.pricelist.item"]
+            .browse(pricelist_items_ids)
+            .filtered(lambda rec: rec.alternative_pricelist_policy == "use_lower_price")
+        )
+        use_lower_price_item_ids = set(use_lower_price_item.ids)
 
-        for product in products:
-            reference_pricelist_item = self.env["product.pricelist.item"].browse(
-                res[product.id][1]
+        products_with_use_lower_price = products.filtered(
+            lambda rec: res[rec.id][1] in use_lower_price_item_ids
+        )
+        for alternative_pricelist in self.alternative_pricelist_ids:
+            alternative_res = alternative_pricelist._compute_price_rule(
+                products_with_use_lower_price, qty, uom, date, **kwargs
             )
-            if (
-                reference_pricelist_item.alternative_pricelist_policy
-                == "use_lower_price"
-            ):
-                for alternative_pricelist in self.alternative_pricelist_ids:
-                    alternative_price_rule = alternative_pricelist._compute_price_rule(
-                        product, qty, uom=uom, date=date, **kwargs
-                    )
-                    # use alternative price if lower
-                    if alternative_price_rule[product.id][0] < res[product.id][0]:
-                        res[product.id] = alternative_price_rule[product.id]
+            for product_id, (
+                alternative_price,
+                alternative_item_id,
+            ) in alternative_res.items():
+                if alternative_price < res[product_id][0]:
+                    res[product_id] = (alternative_price, alternative_item_id)
         return res
 
     @api.constrains("alternative_pricelist_ids")

product_pricelist_alternative/models/product_pricelist_item.py

@@ -33,3 +33,8 @@ def _check_pricelist_alternative_items_based_on_other_pricelist(self):
                         " Please change to another type of price computation."
                     )
                 )
+
+    def _compute_price(self, product, quantity, uom, date, currency=None):
+        if self.compute_price == "formula" and self.base == "pricelist":
+            self = self.with_context(based_on_other_pricelist=True)
+        return super()._compute_price(product, quantity, uom, date, currency)