[MIG] sale_blanket_order to 18.0

- Replace `analytic_account_id` on `blanket.order.line` by using the new
  `analitic.mixin` from Odoo 18.0.
- In `_get_display_price`, fall back to simply using price calculation from
  `product.pricelist`, triggered by the fact that `product.pricelist` no longer
   has a `discount_policy` field.
- Removed `_get_real_price_currency` method as it is now dead code.
- Removed logic in report template for conditionally including/excluding
  taxes from line subtotals
  (`account.group_show_line_subtotals_tax_excluded` no longer exists).

Author: mdurepos

sale_blanket_order/__manifest__.py

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

sale_blanket_order/data/ir_cron.xml

@@ -10,8 +10,6 @@
             name="nextcall"
             eval="(DateTime.now() + relativedelta(hour=00, minute=1, second=0)).strftime('%Y-%m-%d %H:%M:%S')"
         />
-        <field name="numbercall">-1</field>
-        <field name="doall" eval="False" />
         <field name="model_id" ref="model_sale_blanket_order" />
         <field name="state">code</field>
         <field name="code">model.expire_orders()</field>

sale_blanket_order/models/blanket_orders.py

@@ -62,13 +62,6 @@ def _compute_amount_all(self):
         required=True,
     )
     currency_id = fields.Many2one("res.currency", related="pricelist_id.currency_id")
-    analytic_account_id = fields.Many2one(
-        comodel_name="account.analytic.account",
-        string="Analytic Account",
-        copy=False,
-        check_company=True,
-        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
-    )
     payment_term_id = fields.Many2one(
         "account.payment.term",
         string="Payment Terms",
@@ -243,10 +236,10 @@ def onchange_partner_id(self):
             ._get_fiscal_position(self.partner_id),
         }
 
-        if self.partner_id.user_id:
+        if user := self.partner_id.user_id:
             values["user_id"] = self.partner_id.user_id.id
-        if self.partner_id.team_id:
-            values["team_id"] = self.partner_id.team_id.id
+            if user.sale_team_id:
+                values["team_id"] = user.sale_team_id.id
         self.update(values)
 
     def unlink(self):
@@ -273,7 +266,7 @@ def _validate(self):
                 assert len(order.line_ids) > 0, _("Must have some lines")
                 order.line_ids._validate()
         except AssertionError as e:
-            raise UserError(e) from e
+            raise UserError(e)
 
     def set_to_draft(self):
         for order in self:
@@ -322,7 +315,7 @@ def action_view_sale_orders(self):
 
     def action_view_sale_blanket_order_line(self):
         action = self.env["ir.actions.act_window"]._for_xml_id(
-            "sale_blanket_order.act_open_sale_blanket_order_lines_view_tree"
+            "sale_blanket_order.act_open_sale_blanket_order_lines_view_list"
         )
         lines = self.mapped("line_ids")
         if len(lines) > 0:
@@ -387,7 +380,9 @@ def _search_remaining_uom_qty(self, operator, value):
 class BlanketOrderLine(models.Model):
     _name = "sale.blanket.order.line"
     _description = "Blanket Order Line"
-    _inherit = ["mail.thread", "mail.activity.mixin", "analytic.mixin"]
+    _inherit = ["analytic.mixin"]
+    _order = "order_id, sequence, id"
+    _check_company_auto = True
 
     @api.depends(
         "original_uom_qty",
@@ -505,106 +500,19 @@ def _compute_display_name(self):
         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.pricelist_id.discount_policy == "without_discount":
-                while (
-                    pricelist_item.base == "pricelist"
-                    and pricelist_item.base_pricelist_id
-                    and pricelist_item.base_pricelist_id.discount_policy
-                    == "without_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
+        # Compute the display price for blanket order lines
         self.ensure_one()
         self.product_id.ensure_one()
 
-        pricelist_price = self.pricelist_item_id._compute_price(
+        return 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 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, 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):
         precision = self.env["decimal.precision"].precision_get(
@@ -687,7 +595,7 @@ def _validate(self):
                     not line.display_type and line.original_uom_qty > 0.0
                 ) or line.display_type, _("Quantity must be greater than zero")
         except AssertionError as e:
-            raise UserError(e) from e
+            raise UserError(str(e)) from e
 
     @api.model_create_multi
     def create(self, vals_list):

sale_blanket_order/report/templates.xml

@@ -54,12 +54,6 @@
                             <t
                                 t-set="current_subtotal"
                                 t-value="current_subtotal + l.price_subtotal"
-                                groups="account.group_show_line_subtotals_tax_excluded"
-                            />
-                            <t
-                                t-set="current_subtotal"
-                                t-value="current_subtotal + l.price_total"
-                                groups="account.group_show_line_subtotals_tax_included"
                             />
                             <tr
                                 t-att-class="'bg-200 fw-bold o_line_section' if l.display_type == 'line_section' else 'fst-italic o_line_note' if l.display_type == 'line_note' else ''"

sale_blanket_order/tests/test_blanket_orders.py

@@ -143,10 +143,8 @@ def test_01_create_blanket_order(self):
             }
         )
         blanket_order.sudo().onchange_partner_id()
-        blanket_order.pricelist_id.discount_policy = "without_discount"
         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"
         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

@@ -2,11 +2,11 @@
 <odoo>
     <!-- VIEWS -->
 
-    <record id="sale_blanket_order_line_tree" model="ir.ui.view">
-        <field name="name">sale.blanket.order.line.tree</field>
+    <record id="sale_blanket_order_line_list" model="ir.ui.view">
+        <field name="name">sale.blanket.order.line.list</field>
         <field name="model">sale.blanket.order.line</field>
         <field name="arch" type="xml">
-            <tree create="false">
+            <list create="false">
                 <field name="sequence" widget="handle" />
                 <field name="name" invisible="1" />
                 <field name="order_id" />
@@ -27,7 +27,7 @@
                 <field name="delivered_uom_qty" />
                 <field name="remaining_uom_qty" />
                 <field name="company_id" invisible="1" />
-            </tree>
+            </list>
         </field>
     </record>
 
@@ -121,24 +121,29 @@
                                     readonly="1"
                                 />
                             </div>
+                            <field
+                                name="analytic_distribution"
+                                widget="analytic_distribution"
+                                groups="analytic.group_analytic_accounting"
+                                options="{
+                                    'product_field': 'product_id',
+                                    'business_domain': 'sale_order'
+                                }"
+                            />
                         </group>
                     </group>
                     <notebook>
                         <page name="sale_lines" string="Sale Order Lines">
                             <field
                                 name="sale_lines"
-                                mode="tree"
+                                mode="list"
                                 readonly="1"
                                 domain="[('product_id', '=', product_id)]"
                             />
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" />
-                    <field name="activity_ids" widget="mail_activity" />
-                    <field name="message_ids" widget="mail_thread" />
-                </div>
+                <chatter/>
             </form>
         </field>
     </record>
@@ -158,20 +163,20 @@
     <!-- ACTIONS (SERVER) -->
 
     <record
-        id="act_open_sale_blanket_order_lines_view_tree"
+        id="act_open_sale_blanket_order_lines_view_list"
         model="ir.actions.act_window"
     >
         <field name="name">Blanket Order Lines</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.blanket.order.line</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
         <field name="search_view_id" ref="sale_blanket_order_line_search" />
     </record>
 
     <!-- MENU'S -->
 
     <menuitem
-        action="act_open_sale_blanket_order_lines_view_tree"
+        action="act_open_sale_blanket_order_lines_view_list"
         id="menu_sale_blanket_order_line"
         groups="sales_team.group_sale_salesman"
         sequence="21"

sale_blanket_order/views/sale_blanket_order_views.xml

@@ -2,11 +2,11 @@
 <odoo>
     <!-- VIEWS -->
 
-    <record id="view_blanket_order_tree" model="ir.ui.view">
-        <field name="name">sale.blanket.order.tree</field>
+    <record id="view_blanket_order_list" model="ir.ui.view">
+        <field name="name">sale.blanket.order.list</field>
         <field name="model">sale.blanket.order</field>
         <field name="arch" type="xml">
-            <tree
+            <list
                 decoration-info="state == 'draft'"
                 decoration-muted="state == 'expired'"
             >
@@ -21,7 +21,7 @@
                     optional="show"
                     readonly="1"
                 />
-            </tree>
+            </list>
         </field>
     </record>
 
@@ -121,7 +121,7 @@
                                 readonly="state in ['open', 'done', 'expired']"
                                 widget="section_and_note_one2many"
                             >
-                                <tree editable="bottom">
+                                <list editable="bottom">
                                     <control>
                                         <create
                                             name="add_product_control"
@@ -215,7 +215,7 @@
                                         invisible="display_type"
                                     />
                                     <field name="company_id" invisible="1" />
-                                </tree>
+                                </list>
                             </field>
                             <group class="oe_subtotal_footer oe_right">
                                 <field
@@ -273,16 +273,6 @@
                                         groups="base.group_multi_company"
                                     />
                                 </group>
-                                <group name="invoicing" string="Invoicing">
-                                    <t groups="base.group_multi_company">
-                                        <field
-                                            name="analytic_account_id"
-                                            readonly="sale_count != 0 and state != 'draft'"
-                                            groups="analytic.group_analytic_accounting"
-                                            force_save="1"
-                                        />
-                                    </t>
-                                </group>
                             </group>
                         </page>
                     </notebook>
@@ -347,7 +337,7 @@
         <field name="name">Blanket Orders</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.blanket.order</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
         <field name="search_view_id" ref="view_blanket_order_search" />
         <field name="domain">[]</field>
         <field name="context">{}</field>

sale_blanket_order/views/sale_order_views.xml

@@ -9,7 +9,7 @@
                 <field name="blanket_order_id" invisible="1" />
             </field>
             <xpath
-                expr="//field[@name='order_line']//tree/field[@name='product_id']"
+                expr="//field[@name='order_line']//list/field[@name='product_id']"
                 position="after"
             >
                 <field
@@ -28,7 +28,7 @@
         <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']//tree" position="attributes">
+            <xpath expr="//field[@name='order_line']//list" position="attributes">
                 <t groups="sale_blanket_order.blanket_orders_disable_adding_lines">
                     <attribute name="create">blanket_order_id==False</attribute>
                 </t>

sale_blanket_order/wizard/create_sale_orders.py

@@ -125,7 +125,6 @@ def _prepare_so_vals(
             "pricelist_id": pricelist_id,
             "payment_term_id": payment_term_id,
             "order_line": order_lines_by_customer[customer],
-            "analytic_account_id": self.blanket_order_id.analytic_account_id.id,
             "client_order_ref": client_order_ref,
             "tag_ids": [(6, 0, tag_ids.ids)] if tag_ids else False,
         }