odoo-addon-sale-blanket-order 18.0.1.0.0.13__py3-none-any.whl → 18.0.1.0.1__py3-none-any.whl

odoo/addons/sale_blanket_order/README.rst

@@ -11,7 +11,7 @@ Sale Blanket Orders
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:f0f9cee803ac6b3a9aaed08fda171398c5febb7e96021d27938e1377ce6a0847
+   !! source digest: sha256:aaae6e79ce4ede41911cbeb419334c2c0fbbd04aba08f4962e15c162ba312924
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -130,6 +130,14 @@ factors:
 .. |image5| image:: https://raw.githubusercontent.com/OCA/sale-blanket/18.0/sale_blanket_order/static/description/BO_lines.png
 .. |image6| image:: https://raw.githubusercontent.com/OCA/sale-blanket/18.0/sale_blanket_order/static/description/PO_BOLine.png
 
+Known issues / Roadmap
+======================
+
+- Currently, combo products are not supported in blanket orders nor
+  blanket order lines, they are treated as regular products. Future
+  versions of the module should include support for these types of
+  products.
+
 Bug Tracker
 ===========
 

odoo/addons/sale_blanket_order/__manifest__.py

@@ -5,7 +5,7 @@
     "category": "Sale",
     "license": "AGPL-3",
     "author": "Acsone SA/NV, Odoo Community Association (OCA)",
-    "version": "18.0.1.0.0",
+    "version": "18.0.1.0.1",
     "website": "https://github.com/OCA/sale-blanket",
     "summary": "Blanket Orders",
     "depends": ["uom", "sale_management"],

odoo/addons/sale_blanket_order/models/blanket_orders.py

@@ -500,101 +500,27 @@ class BlanketOrderLine(models.Model):
         else:
             return super()._compute_display_name()
 
-    def _get_real_price_currency(self, product, rule_id, qty, uom, pricelist_id):
-        """Retrieve the price before applying the pricelist
-        :param obj product: object of current product record
-        :param float qty: total quentity of product
-        :param tuple price_and_rule: tuple(price, suitable_rule) coming
-               from pricelist computation
-        :param obj uom: unit of measure of current order line
-        :param integer pricelist_id: pricelist id of sale order"""
-        # Copied and adapted from the sale module
-        PricelistItem = self.env["product.pricelist.item"]
-        field_name = "lst_price"
-        currency_id = None
-        product_currency = None
-        if rule_id:
-            pricelist_item = PricelistItem.browse(rule_id)
-            if pricelist_item._show_discount():
-                while (
-                    pricelist_item.base == "pricelist"
-                    and pricelist_item.base_pricelist_id
-                    and pricelist_item._show_discount()
-                ):
-                    price, rule_id = pricelist_item.base_pricelist_id.with_context(
-                        uom=uom.id
-                    )._get_product_price_rule(product, qty, uom)
-                    pricelist_item = PricelistItem.browse(rule_id)
-
-            if pricelist_item.base == "standard_price":
-                field_name = "standard_price"
-            if pricelist_item.base == "pricelist" and pricelist_item.base_pricelist_id:
-                field_name = "price"
-                product = product.with_context(
-                    pricelist=pricelist_item.base_pricelist_id.id
-                )
-                product_currency = pricelist_item.base_pricelist_id.currency_id
-            currency_id = pricelist_item.pricelist_id.currency_id
-
-        product_currency = (
-            product_currency
-            or (product.company_id and product.company_id.currency_id)
-            or self.env.company.currency_id
-        )
-        if not currency_id:
-            currency_id = product_currency
-            cur_factor = 1.0
-        else:
-            if currency_id.id == product_currency.id:
-                cur_factor = 1.0
-            else:
-                cur_factor = currency_id._get_conversion_rate(
-                    product_currency, currency_id
-                )
-
-        product_uom = product.uom_id.id
-        if uom and uom.id != product_uom:
-            # the unit price is in a different uom
-            uom_factor = uom._compute_price(1.0, product.uom_id)
-        else:
-            uom_factor = 1.0
-
-        return product[field_name] * uom_factor * cur_factor, currency_id.id
-
     def _get_display_price(self):
         # Copied and adapted from the sale module
+        # No need to call _get_pricelist_price_before_discount()
+        # since BO lines cannot have discounts
+        # TODO: handle combos the way Odoo does in the sale module
         self.ensure_one()
-        self.product_id.ensure_one()
+        pricelist_price = self._get_pricelist_price()
+        return pricelist_price
 
-        pricelist_price = self.pricelist_item_id._compute_price(
-            product=self.product_id,
-            quantity=self.original_uom_qty or 1.0,
-            uom=self.product_uom,
-            date=fields.Date.today(),
-            currency=self.currency_id,
-        )
-
-        if not self.pricelist_item_id:
-            # No pricelist rule found => no discount from pricelist
-            return pricelist_price
-
-        base_price = self._get_pricelist_price_before_discount()
-
-        # negative discounts (= surcharge) are included in the display price
-        return max(base_price, pricelist_price)
-
-    def _get_pricelist_price_before_discount(self):
+    def _get_pricelist_price(self):
         # Copied and adapted from the sale module
         self.ensure_one()
         self.product_id.ensure_one()
-
-        return self.pricelist_item_id._compute_price_before_discount(
+        price = self.pricelist_item_id._compute_price(
             product=self.product_id,
             quantity=self.original_uom_qty or 1.0,
             uom=self.product_uom,
             date=fields.Date.today(),
             currency=self.currency_id,
         )
+        return price
 
     @api.onchange("product_id", "original_uom_qty")
     def onchange_product(self):

odoo/addons/sale_blanket_order/readme/ROADMAP.md

@@ -0,0 +1,3 @@
+- Currently, combo products are not supported in blanket orders nor blanket
+  order lines, they are treated as regular products. Future versions of the
+  module should include support for these types of products.

odoo/addons/sale_blanket_order/static/description/index.html

@@ -372,7 +372,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:f0f9cee803ac6b3a9aaed08fda171398c5febb7e96021d27938e1377ce6a0847
+!! source digest: sha256:aaae6e79ce4ede41911cbeb419334c2c0fbbd04aba08f4962e15c162ba312924
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/sale-blanket/tree/18.0/sale_blanket_order"><img alt="OCA/sale-blanket" src="https://img.shields.io/badge/github-OCA%2Fsale--blanket-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-blanket-18-0/sale-blanket-18-0-sale_blanket_order"><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/sale-blanket&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>A blanket order is a pre-agreement to sell a certain number of
@@ -385,12 +385,13 @@ exhausting all the quantities of products.</p>
 <ul class="simple">
 <li><a class="reference internal" href="#use-cases-context" id="toc-entry-1">Use Cases / Context</a></li>
 <li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
-<li><a class="reference internal" href="#other-credits" id="toc-entry-7">Other credits</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-3">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-7">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-8">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-9">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -459,8 +460,17 @@ factors:</p>
 </ul>
 <p><img alt="image6" src="https://raw.githubusercontent.com/OCA/sale-blanket/18.0/sale_blanket_order/static/description/PO_BOLine.png" /></p>
 </div>
+<div class="section" id="known-issues-roadmap">
+<h2><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h2>
+<ul class="simple">
+<li>Currently, combo products are not supported in blanket orders nor
+blanket order lines, they are treated as regular products. Future
+versions of the module should include support for these types of
+products.</li>
+</ul>
+</div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/sale-blanket/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
@@ -468,15 +478,15 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-4">Credits</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-5">Credits</a></h2>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-5">Authors</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-6">Authors</a></h3>
 <ul class="simple">
 <li>Acsone SA/NV</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-7">Contributors</a></h3>
 <ul>
 <li><p class="first">André Pereira &lt;<a class="reference external" href="mailto:github&#64;andreparames.com">github&#64;andreparames.com</a>&gt; (<a class="reference external" href="https://www.acsone.eu/">https://www.acsone.eu/</a>)</p>
 </li>
@@ -504,12 +514,12 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 </ul>
 </div>
 <div class="section" id="other-credits">
-<h3><a class="toc-backref" href="#toc-entry-7">Other credits</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-8">Other credits</a></h3>
 <p>The migration of this module from 15.0 to 16.0 was financially supported
 by Camptocamp</p>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-9">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" />

{odoo_addon_sale_blanket_order-18.0.1.0.0.13.dist-info → odoo_addon_sale_blanket_order-18.0.1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-sale_blanket_order
-Version: 18.0.1.0.0.13
+Version: 18.0.1.0.1
 Requires-Python: >=3.10
 Requires-Dist: odoo==18.0.*
 Summary: Blanket Orders
@@ -27,7 +27,7 @@ Sale Blanket Orders
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:f0f9cee803ac6b3a9aaed08fda171398c5febb7e96021d27938e1377ce6a0847
+   !! source digest: sha256:aaae6e79ce4ede41911cbeb419334c2c0fbbd04aba08f4962e15c162ba312924
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -146,6 +146,14 @@ factors:
 .. |image5| image:: https://raw.githubusercontent.com/OCA/sale-blanket/18.0/sale_blanket_order/static/description/BO_lines.png
 .. |image6| image:: https://raw.githubusercontent.com/OCA/sale-blanket/18.0/sale_blanket_order/static/description/PO_BOLine.png
 
+Known issues / Roadmap
+======================
+
+- Currently, combo products are not supported in blanket orders nor
+  blanket order lines, they are treated as regular products. Future
+  versions of the module should include support for these types of
+  products.
+
 Bug Tracker
 ===========
 

{odoo_addon_sale_blanket_order-18.0.1.0.0.13.dist-info → odoo_addon_sale_blanket_order-18.0.1.0.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/sale_blanket_order/README.rst,sha256=6zmBOczrsVe7xnTksneSv_BBOOmz1RXwKvFSzKITAOU,6900
+odoo/addons/sale_blanket_order/README.rst,sha256=kuQE9cMWXIpHf8xu7wBgsnnJzdr2iKdYsmFKWw8IQS0,7163
 odoo/addons/sale_blanket_order/__init__.py,sha256=rKfzYX9RhkkCxgh2f0PJLYN45Kw8T8-fwxw1pbjLuug,108
-odoo/addons/sale_blanket_order/__manifest__.py,sha256=-bAEuKoBr2v0VrkbsedCJI1cwtgTR-S_7uJylps5kcE,999
+odoo/addons/sale_blanket_order/__manifest__.py,sha256=ZLB3hdwzON1aeLKv8H--UaJVaHQZXS87IuMAmdZe2BY,999
 odoo/addons/sale_blanket_order/data/ir_cron.xml,sha256=X7ZZAlOwACAxbhWWI8ml7OhLHOF_gWaI8zJtLe-SMts,749
 odoo/addons/sale_blanket_order/data/sequence.xml,sha256=xsEzImnYlOTADfACH_eBMFFjdy6nM_WqJTWJ3MN1_eM,416
 odoo/addons/sale_blanket_order/i18n/de.po,sha256=Bxbp9pBtzg6cANls-puIwA9n--CD0PFl_xWwrV9lghU,43507
@@ -11,13 +11,14 @@ odoo/addons/sale_blanket_order/i18n/it.po,sha256=rCqr1a9bwEV7WW99yKLL7aVQc6niV5Y
 odoo/addons/sale_blanket_order/i18n/pt.po,sha256=KaUVIngbe6A60uEcctZZV-ONz0UMbZf8eX8xX1xEtLw,38132
 odoo/addons/sale_blanket_order/i18n/sale_blanket_order.pot,sha256=2wgvZqwWpLCa-4le4StdN8wA5QccI7bHy7fm1hCFArg,37641
 odoo/addons/sale_blanket_order/models/__init__.py,sha256=7adrBSDps9-KQKNJjoCBKeoWgeF21I62H9yqyQVcZGM,90
-odoo/addons/sale_blanket_order/models/blanket_orders.py,sha256=c_H-pp0SQdervNLGjm-ahSwkKsrCIcOAcSeUjVrbQIw,26325
+odoo/addons/sale_blanket_order/models/blanket_orders.py,sha256=DxIFbhJCHZ8PWom3H1Ll-jTrmKzBNUpLFpvySrHQ-go,23282
 odoo/addons/sale_blanket_order/models/sale_config_settings.py,sha256=zYTEVPXYmCUp8p-OYyIiGdZajGl07HGNBrrIkxB1GwQ,410
 odoo/addons/sale_blanket_order/models/sale_orders.py,sha256=EAuIqDG4Z7ABxbSBUQ7FzKEzb7BrRhZNB92Elo_4l8E,7572
 odoo/addons/sale_blanket_order/readme/CONTEXT.md,sha256=wOxt02O7J6yLZOTTC6V-f5k0IIXEmxRzAM88lJQrM4o,633
 odoo/addons/sale_blanket_order/readme/CONTRIBUTORS.md,sha256=fJugLGdf1dLnUhz5Z07BBOrKRhY6IViSzuhhZdNuLKw,529
 odoo/addons/sale_blanket_order/readme/CREDITS.md,sha256=YP3UAmtN99a01txssowJnlWMSHoFGSrDmvhW_kir-dQ,87
 odoo/addons/sale_blanket_order/readme/DESCRIPTION.md,sha256=zLsygDRJRyguTPv-AbBQ-o-qDNMcLF5WhO-W5sCQIzo,311
+odoo/addons/sale_blanket_order/readme/ROADMAP.md,sha256=VgWgOGaGcDcLzx6_M5sW-C3d93rfTHXkQ2NfB26XVLg,213
 odoo/addons/sale_blanket_order/readme/USAGE.md,sha256=F3duHsDRx_XpUM66kQnLlUouNttk_7KsJhRzmfsaKHY,1795
 odoo/addons/sale_blanket_order/report/report.xml,sha256=BOdh42iNPyEQw0307Q3WhoQ0CILhLWj44UfJjogPQJg,708
 odoo/addons/sale_blanket_order/report/templates.xml,sha256=IXb4Ufp29mdNtsogBiBoOrP-HE31nA3RoKwKmr-T77M,9084
@@ -30,7 +31,7 @@ odoo/addons/sale_blanket_order/static/description/BO_menu.png,sha256=TWKnQPgzBgN
 odoo/addons/sale_blanket_order/static/description/PO_BOLine.png,sha256=O8dfvlVOqDcmrKrHtWw5J1gm76fOQ53YCtu9_ujb4bs,37234
 odoo/addons/sale_blanket_order/static/description/PO_from_BO.png,sha256=lmRWLs1DYkXmZfRVn_Hg2X8nEfazH2eVZ8unVlcdj-0,27671
 odoo/addons/sale_blanket_order/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/sale_blanket_order/static/description/index.html,sha256=uyVplISL2QP7GxvHA57IkZp1fe2Gs9_JoYLEhASIprc,18226
+odoo/addons/sale_blanket_order/static/description/index.html,sha256=dfjqkBSdVDeya0SzQshryrPN1J1SKjOO6wfdnd3xVS0,18714
 odoo/addons/sale_blanket_order/static/src/js/disable_add_order_line.esm.js,sha256=7qz-sPBpoESHDvSsD9USVX_2relewhEDXLsY_CpiCOg,893
 odoo/addons/sale_blanket_order/tests/__init__.py,sha256=0z5WGDe8esOreObf1dM01uMp-O3GmL20PeIvqK0usXY,130
 odoo/addons/sale_blanket_order/tests/test_blanket_orders.py,sha256=aPYPtMgeuViTlIk6-rxMpGvUDDr2Ot-Dxzdvrc9wmaQ,18465
@@ -42,7 +43,7 @@ odoo/addons/sale_blanket_order/views/sale_order_views.xml,sha256=RUObyUYPm3yCtp1
 odoo/addons/sale_blanket_order/wizard/__init__.py,sha256=4P5jq1IlE7JDNFP0ly3-alAHbqdIYf6fLjQjotKrG08,99
 odoo/addons/sale_blanket_order/wizard/create_sale_orders.py,sha256=pgB2SjEF09Wdq4f2Gbhalk2JycCns073Rmg8PzPu74w,8644
 odoo/addons/sale_blanket_order/wizard/create_sale_orders.xml,sha256=AkNfOsEqqrb5ruxbsdX9NSJfAbUDeY6fD4kJxvz-59Y,2637
-odoo_addon_sale_blanket_order-18.0.1.0.0.13.dist-info/METADATA,sha256=_coUKjSq6zCQg0K2S-h38q3bTY2Bvo8Rt69uVLJQsgM,7441
-odoo_addon_sale_blanket_order-18.0.1.0.0.13.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
-odoo_addon_sale_blanket_order-18.0.1.0.0.13.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_sale_blanket_order-18.0.1.0.0.13.dist-info/RECORD,,
+odoo_addon_sale_blanket_order-18.0.1.0.1.dist-info/METADATA,sha256=0JPRHVIOaWcBwzprX0ncbDUrvWaoTRcjTKyev6R-sNg,7701
+odoo_addon_sale_blanket_order-18.0.1.0.1.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
+odoo_addon_sale_blanket_order-18.0.1.0.1.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_sale_blanket_order-18.0.1.0.1.dist-info/RECORD,,