odoo-addon-sale-blanket-order 16.0.1.0.0.7__py3-none-any.whl → 17.0.1.0.0.3__py3-none-any.whl

odoo/addons/sale_blanket_order/i18n/pt.po

@@ -15,6 +15,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
 #, python-format
 msgid ""
@@ -122,6 +123,7 @@ msgid "Amount"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
 #, python-format
 msgid "An order can't be empty"
@@ -133,8 +135,18 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__analytic_tag_ids
-msgid "Analytic Tags"
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__analytic_distribution
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: sale_blanket_order
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
+
+#. module: sale_blanket_order
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: sale_blanket_order
@@ -190,6 +202,7 @@ msgid "Blanket order wizard line"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
 #, python-format
 msgid ""
@@ -203,6 +216,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/sale_orders.py:0
 #, python-format
 msgid ""
@@ -283,6 +297,7 @@ msgid "Customer Reference"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
 #, python-format
 msgid "Date Scheduled"
@@ -340,8 +355,6 @@ msgstr ""
 
 #. module: sale_blanket_order
 #: model:ir.actions.server,name:sale_blanket_order.expired_blanket_orders_cron_ir_actions_server
-#: model:ir.cron,cron_name:sale_blanket_order.expired_blanket_orders_cron
-#: model:ir.cron,name:sale_blanket_order.expired_blanket_orders_cron
 msgid "Expire Blanket Orders"
 msgstr ""
 
@@ -406,17 +419,13 @@ msgstr ""
 
 #. module: sale_blanket_order
 #: model:ir.model.fields,help:sale_blanket_order.field_sale_blanket_order__message_needaction
-#: model:ir.model.fields,help:sale_blanket_order.field_sale_blanket_order__message_unread
 #: model:ir.model.fields,help:sale_blanket_order.field_sale_blanket_order_line__message_needaction
-#: model:ir.model.fields,help:sale_blanket_order.field_sale_blanket_order_line__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: sale_blanket_order
 #: model:ir.model.fields,help:sale_blanket_order.field_sale_blanket_order__message_has_error
-#: model:ir.model.fields,help:sale_blanket_order.field_sale_blanket_order__message_has_sms_error
 #: model:ir.model.fields,help:sale_blanket_order.field_sale_blanket_order_line__message_has_error
-#: model:ir.model.fields,help:sale_blanket_order.field_sale_blanket_order_line__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -442,14 +451,6 @@ msgstr ""
 msgid "Is Follower"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order____last_update
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line____last_update
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_wizard____last_update
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_wizard_line____last_update
-msgid "Last Modified on"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__write_uid
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__write_uid
@@ -472,12 +473,6 @@ msgstr ""
 msgid "Lines"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__message_main_attachment_id
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__message_main_attachment_id
-msgid "Main Attachment"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__message_has_error
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__message_has_error
@@ -496,6 +491,7 @@ msgid "Missing required fields on accountable sale order line."
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
 #, python-format
 msgid "Must have some lines"
@@ -512,12 +508,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__activity_calendar_event_id
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__activity_calendar_event_id
-msgid "Next Activity Calendar Event"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__activity_date_deadline
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__activity_date_deadline
@@ -557,7 +547,7 @@ msgstr ""
 #. module: sale_blanket_order
 #: model:ir.model.fields,help:sale_blanket_order.field_sale_blanket_order__message_needaction_counter
 #: model:ir.model.fields,help:sale_blanket_order.field_sale_blanket_order_line__message_needaction_counter
-msgid "Number of messages which requires an action"
+msgid "Number of messages requiring action"
 msgstr ""
 
 #. module: sale_blanket_order
@@ -566,12 +556,6 @@ msgstr ""
 msgid "Number of messages with delivery error"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model:ir.model.fields,help:sale_blanket_order.field_sale_blanket_order__message_unread_counter
-#: model:ir.model.fields,help:sale_blanket_order.field_sale_blanket_order_line__message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields.selection,name:sale_blanket_order.selection__sale_blanket_order__state__open
 #: model_terms:ir.ui.view,arch_db:sale_blanket_order.view_blanket_order_search
@@ -634,6 +618,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
 #, python-format
 msgid "Partner is mandatory"
@@ -652,6 +637,7 @@ msgid "Price"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
 #, python-format
 msgid "Price must be greater than zero"
@@ -663,6 +649,11 @@ msgstr ""
 msgid "Pricelist"
 msgstr ""
 
+#. module: sale_blanket_order
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__pricelist_item_id
+msgid "Pricelist Item"
+msgstr ""
+
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__product_id
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__product_id
@@ -677,6 +668,7 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
 #, python-format
 msgid "Quantity must be greater than zero"
@@ -687,6 +679,12 @@ msgstr ""
 msgid "Quantity to Order"
 msgstr ""
 
+#. module: sale_blanket_order
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__rating_ids
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__rating_ids
+msgid "Ratings"
+msgstr ""
+
 #. module: sale_blanket_order
 #: model_terms:ir.ui.view,arch_db:sale_blanket_order.view_blanket_order_search
 msgid "Remaining Qty"
@@ -716,12 +714,7 @@ msgid "Responsible User"
 msgstr ""
 
 #. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__message_has_sms_error
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__message_has_sms_error
-msgid "SMS Delivery error"
-msgstr ""
-
-#. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
 #, python-format
 msgid "Sale Blanket Order %s is not open"
@@ -773,6 +766,7 @@ msgid "Sales Order Line"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
 #, python-format
 msgid "Sales Orders"
@@ -859,6 +853,7 @@ msgid "Terms and Conditions"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/sale_orders.py:0
 #, python-format
 msgid ""
@@ -866,18 +861,21 @@ msgid ""
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/sale_orders.py:0
 #, python-format
 msgid "The customer must be equal to the blanket order lines customer"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/sale_orders.py:0
 #, python-format
 msgid "The product in the blanket order and in the sales order must match"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
 #, python-format
 msgid "The sale has already been completed."
@@ -911,18 +909,6 @@ msgstr ""
 msgid "Unit of Measure"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__message_unread
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__message_unread_counter
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__amount_untaxed
 msgid "Untaxed Amount"
@@ -948,12 +934,14 @@ msgid "Validity Date"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
 #, python-format
 msgid "Validity date is mandatory"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
 #, python-format
 msgid "Validity date must be in the future"
@@ -982,6 +970,7 @@ msgid "Wizard"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
 #, python-format
 msgid ""
@@ -990,6 +979,7 @@ msgid ""
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
 #, python-format
 msgid ""
@@ -998,24 +988,28 @@ msgid ""
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
 #, python-format
 msgid "You can't create a sale order from an expired blanket order!"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
 #, python-format
 msgid "You can't order more than the remaining quantities"
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
 #, python-format
 msgid "You have to select lines from the same company."
 msgstr ""
 
 #. module: sale_blanket_order
+#. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
 #, python-format
 msgid "remaining"

odoo/addons/sale_blanket_order/i18n/sale_blanket_order.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 16.0\n"
+"Project-Id-Version: Odoo Server 17.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -128,13 +128,13 @@ msgid "An order can't be empty"
 msgstr ""
 
 #. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__analytic_distribution
-msgid "Analytic"
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__analytic_account_id
+msgid "Analytic Account"
 msgstr ""
 
 #. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__analytic_distribution
+msgid "Analytic Distribution"
 msgstr ""
 
 #. module: sale_blanket_order
@@ -353,7 +353,6 @@ msgstr ""
 
 #. module: sale_blanket_order
 #: model:ir.actions.server,name:sale_blanket_order.expired_blanket_orders_cron_ir_actions_server
-#: model:ir.cron,cron_name:sale_blanket_order.expired_blanket_orders_cron
 msgid "Expire Blanket Orders"
 msgstr ""
 
@@ -450,14 +449,6 @@ msgstr ""
 msgid "Is Follower"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order____last_update
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line____last_update
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_wizard____last_update
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_wizard_line____last_update
-msgid "Last Modified on"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__write_uid
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__write_uid
@@ -480,12 +471,6 @@ msgstr ""
 msgid "Lines"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__message_main_attachment_id
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__message_main_attachment_id
-msgid "Main Attachment"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__message_has_error
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__message_has_error
@@ -521,12 +506,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__activity_calendar_event_id
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__activity_calendar_event_id
-msgid "Next Activity Calendar Event"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__activity_date_deadline
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__activity_date_deadline
@@ -668,6 +647,11 @@ msgstr ""
 msgid "Pricelist"
 msgstr ""
 
+#. module: sale_blanket_order
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__pricelist_item_id
+msgid "Pricelist Item"
+msgstr ""
+
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__product_id
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__product_id
@@ -693,6 +677,12 @@ msgstr ""
 msgid "Quantity to Order"
 msgstr ""
 
+#. module: sale_blanket_order
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__rating_ids
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__rating_ids
+msgid "Ratings"
+msgstr ""
+
 #. module: sale_blanket_order
 #: model_terms:ir.ui.view,arch_db:sale_blanket_order.view_blanket_order_search
 msgid "Remaining Qty"

odoo/addons/sale_blanket_order/models/blanket_orders.py

@@ -6,8 +6,6 @@ from odoo.exceptions import UserError
 from odoo.tools import float_is_zero
 from odoo.tools.misc import format_date
 
-from odoo.addons.sale.models.sale_order import READONLY_FIELD_STATES
-
 
 class BlanketOrder(models.Model):
     _name = "sale.blanket.order"
@@ -44,7 +42,6 @@ class BlanketOrder(models.Model):
     partner_id = fields.Many2one(
         "res.partner",
         string="Partner",
-        states=READONLY_FIELD_STATES,
     )
     line_ids = fields.One2many(
         "sale.blanket.order.line", "order_id", string="Order lines", copy=True
@@ -63,7 +60,6 @@ class BlanketOrder(models.Model):
         "product.pricelist",
         string="Pricelist",
         required=True,
-        states=READONLY_FIELD_STATES,
     )
     currency_id = fields.Many2one("res.currency", related="pricelist_id.currency_id")
     analytic_account_id = fields.Many2one(
@@ -71,13 +67,11 @@ class BlanketOrder(models.Model):
         string="Analytic Account",
         copy=False,
         check_company=True,
-        states=READONLY_FIELD_STATES,
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
     )
     payment_term_id = fields.Many2one(
         "account.payment.term",
         string="Payment Terms",
-        states=READONLY_FIELD_STATES,
     )
     confirmed = fields.Boolean(copy=False)
     state = fields.Selection(
@@ -91,26 +85,21 @@ class BlanketOrder(models.Model):
         store=True,
         copy=False,
     )
-    validity_date = fields.Date(
-        states=READONLY_FIELD_STATES,
-    )
+    validity_date = fields.Date()
     client_order_ref = fields.Char(
         string="Customer Reference",
         copy=False,
-        states=READONLY_FIELD_STATES,
     )
-    note = fields.Text(default=_default_note, states=READONLY_FIELD_STATES)
+    note = fields.Text(default=_default_note)
     user_id = fields.Many2one(
         "res.users",
         string="Salesperson",
-        states=READONLY_FIELD_STATES,
     )
     team_id = fields.Many2one(
         "crm.team",
         string="Sales Team",
         change_default=True,
         default=lambda self: self.env["crm.team"]._get_default_team_id(),
-        states=READONLY_FIELD_STATES,
     )
     company_id = fields.Many2one(
         comodel_name="res.company",
@@ -198,7 +187,7 @@ class BlanketOrder(models.Model):
                 order.state = "expired"
             elif float_is_zero(
                 sum(
-                    order.line_ids.filtered(lambda l: not l.display_type).mapped(
+                    order.line_ids.filtered(lambda line: not line.display_type).mapped(
                         "remaining_uom_qty"
                     )
                 ),
@@ -483,23 +472,29 @@ class BlanketOrderLine(models.Model):
         default=False,
         help="Technical field for UX purpose.",
     )
+    pricelist_item_id = fields.Many2one(
+        comodel_name="product.pricelist.item", compute="_compute_pricelist_item_id"
+    )
 
-    def name_get(self):
-        result = []
+    @api.depends(
+        "order_id.name", "date_schedule", "remaining_uom_qty", "product_uom.name"
+    )
+    @api.depends_context("from_sale_order")
+    def _compute_display_name(self):
         if self.env.context.get("from_sale_order"):
             for record in self:
-                res = "[%s]" % record.order_id.name
+                name = "[%s]" % record.order_id.name
                 if record.date_schedule:
                     formatted_date = format_date(record.env, record.date_schedule)
-                    res += " - {}: {}".format(_("Date Scheduled"), formatted_date)
-                res += " ({}: {} {})".format(
+                    name += " - {}: {}".format(_("Date Scheduled"), formatted_date)
+                name += " ({}: {} {})".format(
                     _("remaining"),
                     record.remaining_uom_qty,
                     record.product_uom.name,
                 )
-                result.append((record.id, res))
-            return result
-        return super().name_get()
+                record.display_name = name
+        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
@@ -563,35 +558,43 @@ class BlanketOrderLine(models.Model):
 
         return product[field_name] * uom_factor * cur_factor, currency_id.id
 
-    def _get_display_price(self, product):
+    def _get_display_price(self):
         # Copied and adapted from the sale module
         self.ensure_one()
-        pricelist = self.order_id.pricelist_id
-        partner = self.order_id.partner_id
-        if self.order_id.pricelist_id.discount_policy == "with_discount":
-            return product.with_context(pricelist=pricelist.id).lst_price
-        final_price, rule_id = pricelist._get_product_price_rule(
-            self.product_id, self.original_uom_qty or 1.0, self.product_uom
+        self.product_id.ensure_one()
+
+        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,
         )
-        context_partner = dict(
-            self.env.context, partner_id=partner.id, date=fields.Date.today()
-        )
-        base_price, currency_id = self.with_context(
-            **context_partner
-        )._get_real_price_currency(
-            self.product_id,
-            rule_id,
-            self.original_uom_qty,
-            self.product_uom,
-            pricelist.id,
-        )
-        if currency_id != pricelist.currency_id.id:
-            currency = self.env["res.currency"].browse(currency_id)
-            base_price = currency.with_context(**context_partner).compute(
-                base_price, pricelist.currency_id
-            )
+
+        if self.order_id.pricelist_id.discount_policy == "with_discount":
+            return pricelist_price
+
+        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, final_price)
+        return max(base_price, pricelist_price)
+
+    def _get_pricelist_price_before_discount(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(
+            product=self.product_id,
+            quantity=self.product_uom_qty or 1.0,
+            uom=self.product_uom,
+            date=fields.Date.today(),
+            currency=self.currency_id,
+        )
 
     @api.onchange("product_id", "original_uom_qty")
     def onchange_product(self):
@@ -605,9 +608,9 @@ class BlanketOrderLine(models.Model):
             if self.order_id.partner_id and float_is_zero(
                 self.price_unit, precision_digits=precision
             ):
-                self.price_unit = self._get_display_price(self.product_id)
+                self.price_unit = self._get_display_price()
             if self.product_id.code:
-                name = "[{}] {}".format(name, self.product_id.code)
+                name = f"[{name}] {self.product_id.code}"
             if self.product_id.description_sale:
                 name += "\n" + self.product_id.description_sale
             self.name = name
@@ -656,6 +659,24 @@ class BlanketOrderLine(models.Model):
                 line.remaining_uom_qty, line.product_id.uom_id
             )
 
+    @api.depends("product_id", "product_uom", "original_uom_qty")
+    def _compute_pricelist_item_id(self):
+        # Copied and adapted from the sale module
+        for line in self:
+            if (
+                not line.product_id
+                or line.display_type
+                or not line.order_id.pricelist_id
+            ):
+                line.pricelist_item_id = False
+            else:
+                line.pricelist_item_id = line.order_id.pricelist_id._get_product_rule(
+                    line.product_id,
+                    quantity=line.original_uom_qty or 1.0,
+                    uom=line.product_uom,
+                    date=fields.Date.today(),
+                )
+
     def _validate(self):
         try:
             for line in self:
@@ -716,4 +737,4 @@ class BlanketOrderLine(models.Model):
                     """
                 )
             )
-        return super(BlanketOrderLine, self).write(values)
+        return super().write(values)

odoo/addons/sale_blanket_order/models/sale_config_settings.py

@@ -5,7 +5,6 @@ from odoo import fields, models
 
 
 class SaleConfigSettings(models.TransientModel):
-
     _inherit = "res.config.settings"
 
     group_blanket_disable_adding_lines = fields.Boolean(

odoo/addons/sale_blanket_order/models/sale_orders.py

@@ -61,14 +61,14 @@ class SaleOrderLine(models.Model):
         assigned_bo_line = False
         date_planned = date.today()
         date_delta = timedelta(days=365)
-        for line in bo_lines.filtered(lambda l: l.date_schedule):
+        for line in bo_lines.filtered(lambda bo_line: bo_line.date_schedule):
             date_schedule = line.date_schedule
             if date_schedule and abs(date_schedule - date_planned) < date_delta:
                 assigned_bo_line = line
                 date_delta = abs(date_schedule - date_planned)
         if assigned_bo_line:
             return assigned_bo_line
-        non_date_bo_lines = bo_lines.filtered(lambda l: not l.date_schedule)
+        non_date_bo_lines = bo_lines.filtered(lambda bo_line: not bo_line.date_schedule)
         if non_date_bo_lines:
             return non_date_bo_lines[0]