diff --git a/product_variant_sale_price/README.rst b/product_variant_sale_price/README.rst index 39dbe41c4..66cd08fe8 100644 --- a/product_variant_sale_price/README.rst +++ b/product_variant_sale_price/README.rst @@ -66,6 +66,7 @@ Contributors * Alex Comba * Fabien Bourgeois * Vicent Cubells +* Eric Antones Maintainers ~~~~~~~~~~~ diff --git a/product_variant_sale_price/models/product_product.py b/product_variant_sale_price/models/product_product.py index aa556bd2b..05bdaee33 100644 --- a/product_variant_sale_price/models/product_product.py +++ b/product_variant_sale_price/models/product_product.py @@ -34,7 +34,10 @@ def _compute_lst_price(self): uom_model = self.env["uom.uom"] for product in self: price = product.fix_price or product.list_price - if "uom" in self.env.context: + if ( + "uom" in self.env.context + and "default_description_sale" not in self.env.context + ): price = product.uom_id._compute_price( price, uom_model.browse(self.env.context["uom"]) ) @@ -54,7 +57,10 @@ def _inverse_product_lst_price(self): uom_model = self.env["uom.uom"] for product in self: vals = {} - if "uom" in self.env.context: + if ( + "uom" in self.env.context + and "default_description_sale" not in self.env.context + ): vals["fix_price"] = product.uom_id._compute_price( product.lst_price, uom_model.browse(self.env.context["uom"]) ) diff --git a/product_variant_sale_price/readme/CONTRIBUTORS.rst b/product_variant_sale_price/readme/CONTRIBUTORS.rst index 242403047..0f1578e3d 100644 --- a/product_variant_sale_price/readme/CONTRIBUTORS.rst +++ b/product_variant_sale_price/readme/CONTRIBUTORS.rst @@ -3,3 +3,4 @@ * Alex Comba * Fabien Bourgeois * Vicent Cubells +* Eric Antones diff --git a/product_variant_sale_price/static/description/index.html b/product_variant_sale_price/static/description/index.html index 9888f3ed7..ae0956963 100644 --- a/product_variant_sale_price/static/description/index.html +++ b/product_variant_sale_price/static/description/index.html @@ -1,4 +1,3 @@ - @@ -9,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -275,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -301,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -411,12 +411,15 @@

Contributors

  • Alex Comba <alex.comba@agilebg.com>
  • Fabien Bourgeois <fabien@yaltik.com>
  • Vicent Cubells <info@obertix.net>
    • +
  • Eric Antones <eantones@nuobit.com>

    • Maintainers

    This module is maintained by the OCA.

    -Odoo Community Association + +Odoo Community Association +

    OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.