update

delivery_line_qty_delivered/__manifest__.py

@@ -13,7 +13,6 @@
     "website": "https://github.com/OCA/delivery-carrier",
     "depends": [
         "delivery",
-        "sale_delivery_state",
     ],
     "installable": True,
 }

delivery_line_qty_delivered/models/__init__.py

@@ -1,2 +1 @@
-from . import sale_order
 from . import sale_order_line

delivery_line_qty_delivered/models/sale_order_line.py

@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models
+from odoo.tools import float_is_zero, groupby
 
 
 class SaleOrderLine(models.Model):
@@ -16,18 +17,26 @@ def _compute_qty_delivered_method(self):
             if line._is_delivery() and line.product_id.type == "service":
                 line.qty_delivered_method = "delivery"
 
-    def _get_delivery_qty_delivered(self):
+    def _get_delivery_qty_delivered(self, delivered):
         self.ensure_one()
-        if (
-            self.product_id.invoice_policy == "delivery"
-            and self.order_id.delivery_state in ["done", "partially"]
-        ):
+        if delivered:
             return self.product_uom_qty
         return 0.0
 
+    # @api.depends("qty_delivered_manual")
     def _compute_qty_delivered(self):
         super(SaleOrderLine, self)._compute_qty_delivered()
-        for line in self:
-            if line.qty_delivered_method != "delivery":
+        precision = self.env["decimal.precision"].precision_get(
+            "Product Unit of Measure"
+        )
+        lines_grouped = groupby(self, lambda l: l.order_id)
+        for order, lines in lines_grouped:
+            lines = dict(groupby(order.order_line, lambda l: l.qty_delivered_method))
+            if "delivery" not in lines or "stock_move" not in lines:
                 continue
-            line.qty_delivered = line._get_delivery_qty_delivered()
+            delivered = any(
+                not float_is_zero(line.qty_delivered, precision)
+                for line in lines["stock_move"]
+            )
+            for line in lines["delivery"]:
+                line.qty_delivered = line._get_delivery_qty_delivered(delivered)

oca_dependencies.txt

@@ -1,3 +1,2 @@
 # See https://github.com/OCA/odoo-community.org/blob/master/website/Contribution/CONTRIBUTING.rst#oca_dependencies-txt
 partner-contact
-sale-workflow