[MIG] sale_blanket_order: Migration to 18.0

[MIG] sale_blanket_order: Migration to 18.0

Author: IsabelAForgeFlow

sale_blanket_order/models/blanket_orders.py

@@ -1,7 +1,7 @@
 # Copyright 2018 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError
 from odoo.tools import float_is_zero
 from odoo.tools.misc import format_date
@@ -239,7 +239,7 @@ def unlink(self):
         for order in self:
             if order.state not in ("draft", "expired") or order._check_active_orders():
                 raise UserError(
-                    _(
+                    self.env._(
                         "You can not delete an open blanket or "
                         "with active sale orders! "
                         "Try to cancel it before."
@@ -251,12 +251,12 @@ def _validate(self):
         try:
             today = fields.Date.today()
             for order in self:
-                assert order.validity_date, _("Validity date is mandatory")
-                assert order.validity_date > today, _(
+                assert order.validity_date, self.env._("Validity date is mandatory")
+                assert order.validity_date > today, self.env._(
                     "Validity date must be in the future"
                 )
-                assert order.partner_id, _("Partner is mandatory")
-                assert len(order.line_ids) > 0, _("Must have some lines")
+                assert order.partner_id, self.env._("Partner is mandatory")
+                assert len(order.line_ids) > 0, self.env._("Must have some lines")
                 order.line_ids._validate()
         except AssertionError as e:
             raise UserError(e) from e
@@ -287,7 +287,7 @@ def action_cancel(self):
         for order in self:
             if order._check_active_orders():
                 raise UserError(
-                    _(
+                    self.env._(
                         "You can not delete a blanket order with opened "
                         "sale orders! "
                         "Try to cancel them before."
@@ -481,9 +481,11 @@ def _compute_display_name(self):
                 name = f"[{record.order_id.name}]"
                 if record.date_schedule:
                     formatted_date = format_date(record.env, record.date_schedule)
-                    name += " - {}: {}".format(_("Date Scheduled"), formatted_date)
+                    name += " - {}: {}".format(
+                        self.env._("Date Scheduled"), formatted_date
+                    )
                 name += " ({}: {} {})".format(
-                    _("remaining"),
+                    self.env._("remaining"),
                     record.remaining_uom_qty,
                     record.product_uom.name,
                 )
@@ -506,12 +508,11 @@ def _get_real_price_currency(self, product, rule_id, qty, uom, pricelist_id):
         product_currency = None
         if rule_id:
             pricelist_item = PricelistItem.browse(rule_id)
-            if pricelist_item.pricelist_id.discount_policy == "without_discount":
+            if pricelist_item._show_discount():
                 while (
                     pricelist_item.base == "pricelist"
                     and pricelist_item.base_pricelist_id
-                    and pricelist_item.base_pricelist_id.discount_policy
-                    == "without_discount"
+                    and pricelist_item._show_discount()
                 ):
                     price, rule_id = pricelist_item.base_pricelist_id.with_context(
                         uom=uom.id
@@ -668,10 +669,10 @@ def _validate(self):
             for line in self:
                 assert (
                     not line.display_type and line.price_unit > 0.0
-                ) or line.display_type, _("Price must be greater than zero")
+                ) or line.display_type, self.env._("Price must be greater than zero")
                 assert (
                     not line.display_type and line.original_uom_qty > 0.0
-                ) or line.display_type, _("Quantity must be greater than zero")
+                ) or line.display_type, self.env._("Quantity must be greater than zero")
         except AssertionError as e:
             raise UserError(e) from e
 
@@ -715,7 +716,7 @@ def write(self, values):
             lambda line: line.display_type != values.get("display_type")
         ):
             raise UserError(
-                _(
+                self.env._(
                     """
                     You cannot change the type of a sale order line.
                     Instead you should delete the current line and create a new line

sale_blanket_order/models/sale_orders.py

@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from datetime import date, timedelta
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 
 
@@ -30,7 +30,7 @@ def action_confirm(self):
         for order in self:
             if order._check_exchausted_blanket_order_line():
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "Cannot confirm order %s as one of the lines refers "
                         "to a blanket order that has no remaining quantity."
                     )
@@ -44,7 +44,7 @@ def check_partner_id(self):
             if line.blanket_order_line:
                 if line.blanket_order_line.partner_id != self.partner_id:
                     raise ValidationError(
-                        _(
+                        self.env._(
                             "The customer must be equal to the "
                             "blanket order lines customer"
                         )
@@ -179,7 +179,7 @@ def check_product_id(self):
                 and line.product_id != line.blanket_order_line.product_id
             ):
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "The product in the blanket order and in the "
                         "sales order must match"
                     )
@@ -191,7 +191,7 @@ def check_currency(self):
             if line.blanket_order_line:
                 if line.currency_id != line.blanket_order_line.order_id.currency_id:
                     raise ValidationError(
-                        _(
+                        self.env._(
                             "The currency of the blanket order must match with "
                             "that of the sale order."
                         )

sale_blanket_order/tests/test_blanket_orders.py

@@ -15,6 +15,11 @@ def setUpClass(cls):
         cls.blanket_order_line_obj = cls.env["sale.blanket.order.line"]
         cls.blanket_order_wiz_obj = cls.env["sale.blanket.order.wizard"]
         cls.so_obj = cls.env["sale.order"]
+        cls.product_pricelist_item_obj = cls.env["product.pricelist.item"]
+
+        settings = cls.env["res.config.settings"].with_user(cls.env.user).create({})
+        settings.group_discount_per_so_line = True
+        settings.set_values()
 
         cls.payment_term = cls.env.ref("account.account_payment_term_immediate")
         cls.sale_pricelist = cls.env["product.pricelist"].create(
@@ -143,10 +148,22 @@ def test_01_create_blanket_order(self):
             }
         )
         blanket_order.sudo().onchange_partner_id()
-        blanket_order.pricelist_id.discount_policy = "without_discount"
+
+        pricelist_item = self.product_pricelist_item_obj.search(
+            [("pricelist_id", "=", blanket_order.pricelist_id.id)], limit=1
+        )
+        if not pricelist_item:
+            pricelist_item = self.product_pricelist_item_obj.create(
+                {
+                    "pricelist_id": blanket_order.pricelist_id.id,
+                    "fixed_price": 10.0,
+                }
+            )
+
         blanket_order.line_ids[0].sudo().onchange_product()
         self.assertEqual(blanket_order.line_ids[0].taxes_id, self.tax1)
-        blanket_order.pricelist_id.discount_policy = "with_discount"
+
+        pricelist_item.write({"compute_price": "percentage"})
         blanket_order.line_ids[0].sudo().onchange_product()
         blanket_order.line_ids[0].sudo()._get_display_price()
 

sale_blanket_order/views/sale_blanket_order_line_views.xml

@@ -8,13 +8,11 @@
         <field name="arch" type="xml">
             <list create="false">
                 <field name="sequence" widget="handle" />
-                <field name="name" invisible="1" />
                 <field name="order_id" />
                 <field
                     name="product_id"
                     context="{'partner_id':parent.partner_id, 'quantity':original_uom_qty, 'company_id': company_id}"
                 />
-                <field name="product_uom" invisible="1" />
                 <field name="price_unit" />
                 <field name="date_schedule" />
                 <field

sale_blanket_order/views/sale_order_views.xml

@@ -8,16 +8,6 @@
             <field name="currency_id" position="after">
                 <field name="blanket_order_id" invisible="1" />
             </field>
-            <xpath
-                expr="//field[@name='order_line']//list/field[@name='product_id']"
-                position="after"
-            >
-                <field
-                    name="blanket_order_line"
-                    context="{'from_sale_order': True}"
-                    column_invisible="not parent.blanket_order_id"
-                />
-            </xpath>
             <xpath expr="//field[@name='order_line']" position="attributes">
                 <attribute name="context">{'from_sale_order': True}</attribute>
             </xpath>
@@ -28,9 +18,6 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='order_line']" position="before">
-                <field name="disable_adding_lines" invisible="1" />
-            </xpath>
             <xpath expr="//field[@name='order_line']" position="attributes">
                 <attribute
                     name="options"

sale_blanket_order/wizard/create_sale_orders.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from collections import defaultdict
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError
 from odoo.tools import float_is_zero
 
@@ -22,7 +22,9 @@ def _default_order(self):
         )
         if blanket_order.state == "expired":
             raise UserError(
-                _("You can't create a sale order from " "an expired blanket order!")
+                self.env._(
+                    "You can't create a sale order from " "an expired blanket order!"
+                )
             )
         return blanket_order
 
@@ -37,16 +39,18 @@ def _check_valid_blanket_order_line(self, bo_lines):
             float_is_zero(line.remaining_uom_qty, precision_digits=precision)
             for line in bo_lines
         ):
-            raise UserError(_("The sale has already been completed."))
+            raise UserError(self.env._("The sale has already been completed."))
 
         for line in bo_lines:
             if line.order_id.state != "open":
                 raise UserError(
-                    _("Sale Blanket Order %s is not open") % line.order_id.name
+                    self.env._("Sale Blanket Order %s is not open") % line.order_id.name
                 )
             line_company_id = line.company_id and line.company_id.id or False
             if company_id is not False and line_company_id != company_id:
-                raise UserError(_("You have to select lines " "from the same company."))
+                raise UserError(
+                    self.env._("You have to select lines " "from the same company.")
+                )
             else:
                 company_id = line_company_id
 
@@ -134,7 +138,9 @@ def create_sale_order(self):
         payment_term_id = 0
         for line in self.line_ids.filtered(lambda line: line.qty != 0.0):
             if line.qty > line.remaining_uom_qty:
-                raise UserError(_("You can't order more than the remaining quantities"))
+                raise UserError(
+                    self.env._("You can't order more than the remaining quantities")
+                )
             vals = self._prepare_so_line_vals(line)
             order_lines_by_customer[line.partner_id.id].append((0, 0, vals))
 
@@ -159,11 +165,11 @@ def create_sale_order(self):
                 payment_term_id = False
 
         if not order_lines_by_customer:
-            raise UserError(_("An order can't be empty"))
+            raise UserError(self.env._("An order can't be empty"))
 
         if not currency_id:
             raise UserError(
-                _(
+                self.env._(
                     "Can not create Sale Order from Blanket "
                     "Order lines with different currencies"
                 )
@@ -183,7 +189,7 @@ def create_sale_order(self):
             res.append(sale_order.id)
         return {
             "domain": [("id", "in", res)],
-            "name": _("Sales Orders"),
+            "name": self.env._("Sales Orders"),
             "view_type": "form",
             "view_mode": "list,form",
             "res_model": "sale.order",