[IMP] sale_order_line_cancel: Adapt code to work with base addon

Author: mt-software-de

sale_order_line_cancel/__init__.py

@@ -1,3 +1 @@
 from . import models
-from . import wizards
-from .hooks import pre_init_hook

sale_order_line_cancel/__manifest__.py

@@ -7,18 +7,12 @@
 {
     "name": "Sale Order Line Cancel",
     "version": "16.0.1.3.1",
-    "author": "Okia, BCIM, Camptocamp, ACSONE SA/NV, Odoo Community Association (OCA)",
+    "author": "Okia, BCIM, Camptocamp, ACSONE SA/NV, "
+    "MT Software, Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Sales",
     "summary": """Sale cancel remaining""",
-    "depends": ["sale_stock"],
-    "data": [
-        "security/sale_order_line_cancel.xml",
-        "wizards/sale_order_line_cancel.xml",
-        "views/sale_order.xml",
-        "views/sale_order_line.xml",
-        "views/res_config_settings_views.xml",
-    ],
+    "depends": ["sale_order_line_cancel_base", "sale_stock"],
+    "data": [],
     "website": "https://github.com/OCA/sale-workflow",
-    "pre_init_hook": "pre_init_hook",
 }

sale_order_line_cancel/hooks.py

@@ -1,5 +1,3 @@
 from . import sale_order_line
-from . import stock_move
 from . import sale_order
-from . import res_company
-from . import res_config_settings
+from . import stock_move

sale_order_line_cancel/models/__init__.py

@@ -1,21 +1,13 @@
 # Copyright 2023 ACSONE SA/NV
+# Copyright 2025 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-
 from odoo import models
 
 
 class SaleOrder(models.Model):
-
     _inherit = "sale.order"
 
-    def action_draft(self):
-        res = super().action_draft()
-        orders = self.filtered(lambda s: s.state == "draft")
-        orders.order_line.write({"product_qty_canceled": 0})
-        return res
-
     def _action_cancel(self):
         new_self = self.with_context(ignore_sale_order_line_cancel=True)
         res = super(SaleOrder, new_self)._action_cancel()
-        self.order_line._update_qty_canceled()
         return res

sale_order_line_cancel/models/sale_order.py

@@ -4,79 +4,27 @@
 # Copyright 2025 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
-from odoo.tools import float_compare
+from odoo import models
 
 
 class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"
 
-    product_qty_canceled = fields.Float(
-        "Qty canceled", readonly=True, copy=False, digits="Product Unit of Measure"
-    )
-    product_qty_remains_to_deliver = fields.Float(
-        string="Remains to deliver",
-        digits="Product Unit of Measure",
-        compute="_compute_product_qty_remains_to_deliver",
-        store=True,
-    )
-    can_cancel_remaining_qty = fields.Boolean(
-        compute="_compute_can_cancel_remaining_qty"
-    )
-
-    @api.depends("product_qty_remains_to_deliver", "state")
-    def _compute_can_cancel_remaining_qty(self):
-        precision = self.env["decimal.precision"].precision_get(
-            "Product Unit of Measure"
-        )
-        for rec in self:
-            rec.can_cancel_remaining_qty = (
-                float_compare(
-                    rec.product_qty_remains_to_deliver, 0, precision_digits=precision
-                )
-                == 1
-                and rec.state in ("sale", "done")
-                and rec.qty_delivered_method == "stock_move"
-            )
-
-    @api.depends("qty_to_deliver", "product_qty_canceled")
-    def _compute_product_qty_remains_to_deliver(self):
-        for line in self:
-            qty_remaining = max(0, line.qty_to_deliver - line.product_qty_canceled)
-            line.product_qty_remains_to_deliver = qty_remaining
-
     def _get_moves_to_cancel(self):
-        lines = self.filtered(lambda l: l.qty_delivered_method == "stock_move")
+        lines = self.filtered(
+            lambda l: l.qty_delivered_method == "stock_move"
+            and l.can_cancel_remaining_qty
+        )
         return lines.move_ids.filtered(lambda m: m.state not in ("done", "cancel"))
 
     def _check_moves_to_cancel(self, moves):
         """Override this method to add checks before cancel"""
-        self.ensure_one()
-
-    def _update_qty_canceled(self):
-        """Update SO line qty canceled only when all remaining moves are canceled"""
-        for line in self:
-            if line._get_moves_to_cancel():
-                continue
-            qty_to_deliver = line.qty_to_deliver
-            vals = {"product_qty_canceled": qty_to_deliver}
-            if (
-                line.state == "sale"
-                and line.company_id.on_sale_line_cancel_decrease_line_qty
-            ):
-                vals["product_uom_qty"] = line.qty_delivered
-            line.write(vals)
 
     def cancel_remaining_qty(self):
-        lines = self.filtered(lambda l: l.can_cancel_remaining_qty)
-        for line in lines:
-            moves_to_cancel = line._get_moves_to_cancel()
-            line._check_moves_to_cancel(moves_to_cancel)
-            moves_to_cancel._action_cancel()
-            line.order_id.message_post(
-                body=_(
-                    "<b>%(product)s</b>: The order line has been canceled",
-                    product=line.product_id.display_name,
-                )
-            )
-            return True
+        moves_to_cancel = self._get_moves_to_cancel()
+        moves_to_cancel.sale_line_id._check_moves_to_cancel(moves_to_cancel)
+        if moves_to_cancel:
+            moves_to_cancel.with_context(
+                ignore_sale_order_line_cancel=True
+            )._action_cancel()
+        return super().cancel_remaining_qty()

sale_order_line_cancel/models/sale_order_line.py

@@ -29,18 +29,17 @@ def _action_done(self, cancel_backorder=False):
     def _get_sale_lines_to_update_qty_canceled(self):
         sale_lines = self.env["sale.order.line"]
         for move in self:
-            if (
-                move.sale_line_id
-                and move._is_move_to_take_into_account_for_qty_canceled()
-            ):
+            if move._is_move_to_take_into_account_for_qty_canceled():
                 sale_lines |= move.sale_line_id
         return sale_lines
 
     def _is_move_to_take_into_account_for_qty_canceled(self):
         self.ensure_one()
+        sale_line = self.sale_line_id
         return (
-            self.state == "cancel"
-            and self.sale_line_id
-            and self.sale_line_id.state not in ["draft", "sent"]
+            sale_line
+            and self.state == "cancel"
             and self.picking_type_id.code == "outgoing"
+            and sale_line.state not in ["draft", "sent", "cancel"]
+            and not sale_line._get_moves_to_cancel()
         )

sale_order_line_cancel/models/stock_move.py

@@ -1,17 +1,13 @@
-This module allows you to cancel the remaining quantity on sale order by adding
-a dedicated action to sale lines. It also add two new fields to track canceled
-and remaining to deliver quantities.
+This module cancels only the stock moves for the remaining qty to deliver.
+Also it will track the canceled qty if a order line's stock move is canceled
+but only if there are not other started operations for this sale order line.
 
-This module differs from the original odoo behavior in the following way:
-
-* In odoo, if the update of the quantity ordered is allowed on the sale order at
-  the confirmed state, odoo will recompute the required stock operations
-  according to the new quantity. This change is possible
-  even the stock operations are started for this sale order line.
-* In this module, the quantity ordered is not updated on the sale order line to
-  keep track of the original ordered by the customer. At the same time, we
-  cancel only the stock moves for the remaining qty to deliver. This is only
-  possible if no operation is started for this sale order line.
+When the base addon is configured to also decrease the original ordered qty
+it ensures that there are now new moves created. Because by default,
+odoo will recompute the required stock operations if the ordered qty is changed.
+By canceling the operations for the remaining qty before the ordered qty is changed,
+odoo will not recompute the required stock operations, because the qty done by moves
+is the same as the ordered qty.
 
 
 .. warning::

sale_order_line_cancel/readme/DESCRIPTION.rst

@@ -1,63 +1,28 @@
 # Copyright 2023 ACSONE SA/NV
+# Copyright 2025 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo.addons.sale_order_line_cancel_base.tests.common import (
+    TestSaleOrderLineCancelBase as Base,
+)
 
-from odoo import Command
-from odoo.tests.common import TransactionCase
 
-
-class TestSaleOrderLineCancelBase(TransactionCase):
+class TestSaleOrderLineCancelBase(Base):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.partner = cls.env["res.partner"].create({"name": "Partner"})
         cls.warehouse = cls.env.ref("stock.warehouse0")
-        cls.product_1 = cls.env["product.product"].create(
-            {
-                "name": "test product 1",
-                "type": "product",
-                "sale_ok": True,
-                "active": True,
-            }
-        )
-        cls.product_2 = cls.product_1.copy({"name": "test product 2"})
-        cls.product_3 = cls.product_1.copy({"name": "test product 3"})
-        cls.sale = cls._add_done_sale_order()
-        cls.sale.action_done()
-        cls.wiz = cls.env["sale.order.line.cancel"].create({})
         cls.env["stock.quant"]._update_available_quantity(
             cls.product_1, cls.warehouse.lot_stock_id, 10.0
         )
 
     @classmethod
-    def _add_done_sale_order(
-        cls, partner=None, product=None, qty=10, picking_policy="direct"
-    ):
-        if partner is None:
-            partner = cls.partner
-        if product is None:
-            product = cls.product_1
-        warehouse = cls.warehouse
-        sale_order_model = cls.env["sale.order"]
-        lines = [
-            Command.create(
-                {
-                    "name": p.name,
-                    "product_id": p.id,
-                    "product_uom_qty": qty,
-                    "product_uom": p.uom_id.id,
-                    "price_unit": 1,
-                },
-            )
-            for p in product
-        ]
-        so_values = {
-            "partner_id": partner.id,
-            "warehouse_id": warehouse.id,
-            "order_line": lines,
-        }
-        if picking_policy:
-            so_values["picking_policy"] = picking_policy
-        so = sale_order_model.create(so_values)
-        so.action_confirm()
-        so.action_done()
-        return so
+    def _prepare_product_vals(cls):
+        vals = super()._prepare_product_vals()
+        vals["type"] = "product"
+        return vals
+
+    @classmethod
+    def _add_done_sale_order(cls, **kwargs):
+        if "picking_policy" not in kwargs:
+            kwargs["picking_policy"] = "direct"
+        return super()._add_done_sale_order(**kwargs)