From 6148b1bbc821e04041726253f68ba69e39f9c48c Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Mon, 18 May 2026 11:59:59 +0800
Subject: [PATCH 01/26] fix(spp_drims): bundled round-1 fixes for DRIMS tracker
 (#651)

- #967: require beneficiary_count via the view (asterisk + pre-save check)
- #961: auto-create stock.lot from donation_line.lot_number on action_stock,
  with friendly UserErrors for missing-lot + serial-qty>1; expose Lot/Batch
  + Expiry Date columns by default on donation items
- #964: fall back to quantity_pledged when quantity_received is 0;
  relax wizard equality check to splits-only so a single line is treated
  as the user reporting the final received quantity
- #968: hide New + Delete on the DRIMS Dispatches list via a primary-mode
  inherited view pinned to the action
- #1026: wire the donation form's Inspect button to action_open_inspection_wizard
  instead of the raw action_inspect state-flip
---
 spp_drims/models/donation.py            |  88 +++++++++++-
 spp_drims/tests/test_donation.py        | 175 ++++++++++++++++++++++++
 spp_drims/tests/test_wizard.py          |  73 ++++++++--
 spp_drims/views/donation_views.xml      |  12 +-
 spp_drims/views/stock_picking_views.xml |  45 +++++-
 spp_drims/wizard/inspection_wizard.py   |  31 ++++-
 6 files changed, 394 insertions(+), 30 deletions(-)

diff --git a/spp_drims/models/donation.py b/spp_drims/models/donation.py
index 518ba8fa..8476afb4 100644
--- a/spp_drims/models/donation.py
+++ b/spp_drims/models/donation.py
@@ -404,17 +404,24 @@ def action_open_inspection_wizard(self):
             }
         )
 
-        # Create all line records with default values (New/Accept)
+        # Create all line records with default values (New/Accept).
+        # OP#964: fall back to quantity_pledged when quantity_received is 0
+        # so wizard lines never open with an expected of 0 — that happens
+        # when a donation line is added after the donation was marked
+        # received (so action_mark_received didn't copy pledged → received
+        # for it), and would otherwise force the user into a quantity
+        # mismatch they cannot resolve.
         line_vals = []
         for donation_line in self.line_ids:
+            expected_qty = donation_line.quantity_received or donation_line.quantity_pledged
             line_vals.append(
                 {
                     "wizard_id": wizard.id,
                     "donation_line_id": donation_line.id,
                     "product_id": donation_line.product_id.id,
                     "uom_id": donation_line.uom_id.id,
-                    "quantity_expected": donation_line.quantity_received,
-                    "quantity": donation_line.quantity_received,
+                    "quantity_expected": expected_qty,
+                    "quantity": expected_qty,
                     "condition_id": condition_new.id if condition_new else False,
                     "disposition_id": disposition_accept.id if disposition_accept else False,
                     "is_inspected": True,  # Default to inspected (New/Accept)
@@ -440,10 +447,18 @@ def action_stock(self):
         This action:
         1. Transitions the donation from 'inspected' to 'stocked' state
         2. Validates all pending stock pickings (assigns and confirms moves)
-        3. Items become available in warehouse inventory
+        3. For lot/serial-tracked products, creates stock.lot records from
+           the donation line's ``lot_number`` (+ ``expiry_date`` if the
+           ``product_expiry`` module is installed) and attaches them to
+           the picking's move lines so ``button_validate()`` succeeds
+        4. Items become available in warehouse inventory
 
         Raises:
             UserError: If donation is not in 'inspected' state.
+            UserError: If a tracked product line has no ``lot_number`` set.
+            UserError: If a serial-tracked product line has quantity > 1
+                (each serial must be unique; the donation line must be
+                split so quantity == 1).
         """
         stocked_state = self.env["spp.vocabulary.code"].search(
             [
@@ -452,6 +467,8 @@ def action_stock(self):
             ],
             limit=1,
         )
+        Lot = self.env["stock.lot"]
+        has_expiration = "expiration_date" in Lot._fields
         for rec in self:
             if rec.state != DONATION_STATE_INSPECTED:
                 raise UserError(_("Only inspected donations can be marked as stocked."))
@@ -459,10 +476,73 @@ def action_stock(self):
             # Validate the picking to complete the receipt
             for picking in rec.picking_ids.filtered(lambda p: p.state not in ("done", "cancel")):
                 picking.action_assign()
+                rec._assign_lots_to_picking(picking, Lot, has_expiration)
                 for move in picking.move_ids:
                     move.quantity = move.product_uom_qty
                 picking.button_validate()
 
+    def _assign_lots_to_picking(self, picking, Lot, has_expiration):
+        """Create + attach stock.lot for tracked-product moves on the picking.
+
+        For each move whose product is tracked by lot or serial, the
+        corresponding donation line (via ``drims_donation_line_id``)
+        carries the lot number and (optionally) the expiry date. This
+        method finds or creates the ``stock.lot`` and attaches it to the
+        move's move lines so the picking validates without Odoo's
+        "lot/serial required" UserError.
+        """
+        self.ensure_one()
+        for move in picking.move_ids:
+            tracking = move.product_id.tracking
+            if tracking == "none":
+                continue
+            line = move.drims_donation_line_id
+            if not line or not line.lot_number:
+                raise UserError(
+                    _(
+                        "Product %(product)s on donation %(donation)s requires a "
+                        "lot/serial number. Please fill the Lot/Batch field on "
+                        "the donation line before stocking."
+                    )
+                    % {
+                        "product": move.product_id.display_name,
+                        "donation": self.reference,
+                    }
+                )
+            if tracking == "serial" and move.product_uom_qty > 1:
+                raise UserError(
+                    _(
+                        "Product %(product)s is serial-tracked but the donation "
+                        "line provides one serial number for %(qty)s units. Each "
+                        "serial must be unique — split the donation line into "
+                        "%(qty)s separate lines (quantity 1 each)."
+                    )
+                    % {
+                        "product": move.product_id.display_name,
+                        "qty": int(move.product_uom_qty),
+                    }
+                )
+            lot = Lot.search(
+                [
+                    ("name", "=", line.lot_number),
+                    ("product_id", "=", move.product_id.id),
+                    ("company_id", "=", picking.company_id.id),
+                ],
+                limit=1,
+            )
+            if not lot:
+                lot_vals = {
+                    "name": line.lot_number,
+                    "product_id": move.product_id.id,
+                    "company_id": picking.company_id.id,
+                }
+                if has_expiration and line.expiry_date:
+                    lot_vals["expiration_date"] = line.expiry_date
+                lot = Lot.create(lot_vals)
+            for ml in move.move_line_ids:
+                if not ml.lot_id:
+                    ml.lot_id = lot.id
+
     def _change_state_and_cancel_pickings(self, new_state_code):
         """Helper to transition state and cancel pending pickings.
 
diff --git a/spp_drims/tests/test_donation.py b/spp_drims/tests/test_donation.py
index 15bf5c7c..d567c5bd 100644
--- a/spp_drims/tests/test_donation.py
+++ b/spp_drims/tests/test_donation.py
@@ -668,3 +668,178 @@ def test_donation_cannot_cancel_rejected(self):
         # Should fail
         with self.assertRaises(UserError):
             donation.action_cancel()
+
+    # ---------- OP#961: lot/serial assignment on action_stock ----------
+
+    def _make_tracked_product(self, tracking, name="Tracked Item"):
+        return self.env["product.product"].create(
+            {
+                "name": name,
+                "type": "consu",
+                "is_storable": True,
+                "tracking": tracking,
+                "standard_price": 50.0,
+            }
+        )
+
+    def _make_donation(self, line_vals):
+        return self.env["spp.drims.donation"].create(
+            {
+                "incident_id": self.incident.id,
+                "warehouse_id": self.warehouse.id,
+                "donor_name": "Test Donor",
+                "line_ids": [(0, 0, vals) for vals in line_vals],
+            }
+        )
+
+    def test_action_stock_creates_lot_for_lot_tracked_product(self):
+        """Lot-tracked product validates and a stock.lot is created from lot_number."""
+        product = self._make_tracked_product("lot", "Rice 25kg (lot)")
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": product.id,
+                    "quantity_pledged": 10,
+                    "uom_id": product.uom_id.id,
+                    "lot_number": "LOT-RICE-001",
+                }
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        donation.action_stock()
+        self.assertEqual(donation.state, "stocked")
+        lot = self.env["stock.lot"].search(
+            [("name", "=", "LOT-RICE-001"), ("product_id", "=", product.id)],
+            limit=1,
+        )
+        self.assertTrue(lot, "expected a stock.lot named LOT-RICE-001 to be created")
+
+    def test_action_stock_sets_expiry_when_provided(self):
+        """expiry_date on the donation line propagates to stock.lot.expiration_date."""
+        if "expiration_date" not in self.env["stock.lot"]._fields:
+            self.skipTest("product_expiry module not installed")
+        product = self._make_tracked_product("lot", "Vaccine (lot)")
+        expiry = date.today() + timedelta(days=180)
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": product.id,
+                    "quantity_pledged": 5,
+                    "uom_id": product.uom_id.id,
+                    "lot_number": "LOT-VAC-2026",
+                    "expiry_date": expiry,
+                }
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        donation.action_stock()
+        lot = self.env["stock.lot"].search(
+            [("name", "=", "LOT-VAC-2026"), ("product_id", "=", product.id)],
+            limit=1,
+        )
+        self.assertTrue(lot)
+        # expiration_date may be Date or Datetime depending on product_expiry version
+        stored = lot.expiration_date
+        if hasattr(stored, "date"):
+            stored = stored.date()
+        self.assertEqual(stored, expiry)
+
+    def test_action_stock_reuses_existing_lot(self):
+        """A stock.lot with the same name + product is reused, not duplicated."""
+        product = self._make_tracked_product("lot", "Rice 25kg (existing lot)")
+        existing = self.env["stock.lot"].create(
+            {
+                "name": "LOT-RICE-EXISTING",
+                "product_id": product.id,
+                "company_id": self.env.company.id,
+            }
+        )
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": product.id,
+                    "quantity_pledged": 3,
+                    "uom_id": product.uom_id.id,
+                    "lot_number": "LOT-RICE-EXISTING",
+                }
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        donation.action_stock()
+        lots = self.env["stock.lot"].search([("name", "=", "LOT-RICE-EXISTING"), ("product_id", "=", product.id)])
+        self.assertEqual(len(lots), 1)
+        self.assertEqual(lots, existing)
+
+    def test_action_stock_serial_qty_one_succeeds(self):
+        """Serial-tracked product with quantity 1 and lot_number validates."""
+        product = self._make_tracked_product("serial", "Generator (serial)")
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": product.id,
+                    "quantity_pledged": 1,
+                    "uom_id": product.uom_id.id,
+                    "lot_number": "SN-GEN-001",
+                }
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        donation.action_stock()
+        self.assertEqual(donation.state, "stocked")
+
+    def test_action_stock_serial_qty_gt_one_raises(self):
+        """Serial product with quantity > 1 raises UserError (one serial per unit)."""
+        product = self._make_tracked_product("serial", "Generator multi")
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": product.id,
+                    "quantity_pledged": 3,
+                    "uom_id": product.uom_id.id,
+                    "lot_number": "SN-GEN-002",
+                }
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        with self.assertRaises(UserError):
+            donation.action_stock()
+
+    def test_action_stock_missing_lot_number_raises(self):
+        """Tracked product without lot_number raises a friendly UserError."""
+        product = self._make_tracked_product("lot", "Rice missing lot")
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": product.id,
+                    "quantity_pledged": 2,
+                    "uom_id": product.uom_id.id,
+                    # lot_number intentionally omitted
+                }
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        with self.assertRaises(UserError):
+            donation.action_stock()
+
+    def test_action_stock_untracked_product_unaffected(self):
+        """Untracked products continue to validate without any lot handling."""
+        # self.product has tracking='none' by default
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": self.product.id,
+                    "quantity_pledged": 25,
+                    "uom_id": self.product.uom_id.id,
+                }
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        donation.action_stock()
+        self.assertEqual(donation.state, "stocked")
diff --git a/spp_drims/tests/test_wizard.py b/spp_drims/tests/test_wizard.py
index cb60da68..361f300d 100644
--- a/spp_drims/tests/test_wizard.py
+++ b/spp_drims/tests/test_wizard.py
@@ -355,28 +355,83 @@ def test_inspection_wizard_validation_uninspected(self):
             wizard.action_confirm_inspection()
         self.assertIn("inspect all items", str(cm.exception))
 
-    def test_inspection_wizard_validation_quantity_mismatch(self):
-        """Test validation fails if quantities don't match."""
+    def test_inspection_wizard_single_line_quantity_overrides_received(self):
+        """OP#964: a single inspection line is treated as the user reporting
+        the final received quantity. Confirming with a different quantity
+        than the wizard's expected hint should succeed and update
+        ``quantity_received`` on the donation line accordingly.
+        """
         if not self.condition_new or not self.disposition_accept:
             self.skipTest("Required vocabulary codes not found")
 
         donation = self._create_received_donation(quantity=1000)
         wizard = self._open_inspection_wizard(donation)
 
-        # Manually change quantity to create mismatch
-        wizard.line_ids[0].write(
+        wizard.line_ids[0].write({"quantity": 800})
+
+        self.assertTrue(wizard.is_valid, "single-line wizard should always be valid")
+        wizard.action_confirm_inspection()
+        self.assertEqual(donation.state, "inspected")
+        self.assertEqual(donation.line_ids[0].quantity_received, 800)
+
+    def test_inspection_wizard_split_mismatch_still_raises(self):
+        """OP#964: when the user splits a product across multiple lines,
+        the totals must still sum to the expected quantity — that
+        safety net is preserved.
+        """
+        if not self.condition_new or not self.condition_damaged:
+            self.skipTest("Required vocabulary codes not found")
+        if not self.disposition_accept or not self.disposition_return:
+            self.skipTest("Required vocabulary codes not found")
+
+        donation = self._create_received_donation(quantity=1000)
+        original_line = donation.line_ids[0]
+        wizard = self._open_inspection_wizard(donation)
+
+        # Two lines that sum to 950 ≠ 1000 received → should raise
+        wizard.line_ids[0].write({"quantity": 800})
+        self.env["spp.drims.inspection.wizard.line"].create(
             {
-                "quantity": 800,  # Less than expected 1000
+                "wizard_id": wizard.id,
+                "donation_line_id": original_line.id,
+                "product_id": self.product.id,
+                "uom_id": self.product.uom_id.id,
+                "quantity_expected": 1000,
+                "quantity": 150,  # 800 + 150 = 950 ≠ 1000
+                "condition_id": self.condition_damaged.id,
+                "disposition_id": self.disposition_return.id,
+                "is_inspected": True,
             }
         )
 
-        # is_valid should be False
         self.assertFalse(wizard.is_valid)
-
-        # Should fail confirmation
         with self.assertRaises(UserError) as cm:
             wizard.action_confirm_inspection()
-        self.assertIn("must equal", str(cm.exception))
+        self.assertIn("Splits must sum", str(cm.exception))
+
+    def test_inspection_wizard_quantity_received_zero_uses_pledged(self):
+        """OP#964: when a donation line has quantity_received = 0 (e.g., it
+        was added after action_mark_received ran, or pledged was 0), the
+        wizard should fall back to quantity_pledged so the user can
+        still finalize inspection. Reproduces the bug from the original
+        screenshot.
+        """
+        if not self.condition_new or not self.disposition_accept:
+            self.skipTest("Required vocabulary codes not found")
+
+        donation = self._create_received_donation(quantity=500)
+        # Simulate the bug: line added with pledged=500 but received=0
+        # (because action_mark_received already ran for the original lines).
+        donation.line_ids[0].quantity_received = 0
+
+        wizard = self._open_inspection_wizard(donation)
+        # Wizard line should pick up pledged (500), not received (0)
+        self.assertEqual(wizard.line_ids[0].quantity_expected, 500)
+        self.assertTrue(wizard.is_valid)
+
+        wizard.action_confirm_inspection()
+        self.assertEqual(donation.state, "inspected")
+        self.assertEqual(donation.line_ids[0].quantity_received, 500)
 
     def test_inspection_wizard_only_received_donations(self):
         """Test that only received donations can be inspected."""
diff --git a/spp_drims/views/donation_views.xml b/spp_drims/views/donation_views.xml
index 3dbfffd1..7f9badb9 100644
--- a/spp_drims/views/donation_views.xml
+++ b/spp_drims/views/donation_views.xml
@@ -49,8 +49,8 @@
                         invisible="state != 'announced'"
                     />
                     <button
-                        name="action_inspect"
-                        string="Mark Inspected"
+                        name="action_open_inspection_wizard"
+                        string="Inspect Items"
                         type="object"
                         class="btn-primary"
                         invisible="state != 'received'"
@@ -181,8 +181,8 @@
                                         optional="hide"
                                         options="{'no_create': True}"
                                     />
-                                    <field name="lot_number" optional="hide" />
-                                    <field name="expiry_date" optional="hide" />
+                                    <field name="lot_number" optional="show" />
+                                    <field name="expiry_date" optional="show" />
                                 </list>
                             </field>
                         </page>
@@ -455,8 +455,8 @@
                 <field name="unit_value" />
                 <field name="value" />
                 <field name="condition_id" optional="show" />
-                <field name="lot_number" optional="hide" />
-                <field name="expiry_date" optional="hide" />
+                <field name="lot_number" optional="show" />
+                <field name="expiry_date" optional="show" />
             </list>
         </field>
     </record>
diff --git a/spp_drims/views/stock_picking_views.xml b/spp_drims/views/stock_picking_views.xml
index a0e7a43e..a443a87a 100644
--- a/spp_drims/views/stock_picking_views.xml
+++ b/spp_drims/views/stock_picking_views.xml
@@ -111,7 +111,10 @@
                                 options="{'no_create': True}"
                                 required="drims_type == 'request_dispatch'"
                             />
-                            <field name="beneficiary_count" />
+                            <field
+                                name="beneficiary_count"
+                                required="drims_type == 'request_dispatch'"
+                            />
                             <field
                                 name="distribution_type_id"
                                 options="{'no_create': True}"
@@ -291,11 +294,44 @@
         </field>
     </record>
 
+    <!--
+        DRIMS Dispatch List View (OP#968): primary-mode inherited list view
+        used only by the DRIMS Dispatches action. Disables Create + Delete on
+        the list so users can't manually spawn a picking that bypasses the
+        approved-request → dispatch pathway (which leaves the DRIMS tab
+        hidden and strands the user). The standard stock.picking list view
+        on Inventory > Operations is unaffected.
+    -->
+    <record id="view_picking_list_drims_dispatch" model="ir.ui.view">
+        <field name="name">stock.picking.list.drims.dispatch</field>
+        <field name="model">stock.picking</field>
+        <field name="mode">primary</field>
+        <field name="inherit_id" ref="stock.vpicktree" />
+        <field name="arch" type="xml">
+            <list position="attributes">
+                <attribute name="create">0</attribute>
+                <attribute name="delete">0</attribute>
+            </list>
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="waybill_number" optional="hide" />
+                <field name="drims_type_id" optional="hide" />
+                <field name="incident_id" optional="hide" />
+            </xpath>
+        </field>
+    </record>
+
     <!-- DRIMS Dispatch Action -->
     <record id="action_drims_dispatch" model="ir.actions.act_window">
         <field name="name">DRIMS Dispatches</field>
         <field name="res_model">stock.picking</field>
         <field name="view_mode">list,pivot,graph,form</field>
+        <field
+            name="view_ids"
+            eval="[(5, 0, 0),
+                   (0, 0, {'view_mode': 'list', 'view_id': ref('view_picking_list_drims_dispatch')}),
+                   (0, 0, {'view_mode': 'pivot', 'view_id': ref('view_picking_pivot_drims')}),
+                   (0, 0, {'view_mode': 'graph', 'view_id': ref('view_picking_graph_drims')})]"
+        />
         <field name="path">drims-dispatches</field>
         <field name="domain">[('drims_type', '=', 'request_dispatch')]</field>
         <field name="context">{
@@ -304,11 +340,12 @@
         }</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
-                Create a DRIMS Dispatch
+                No DRIMS Dispatches yet
             </p>
             <p>
-                DRIMS dispatches are stock transfers that fulfill disaster relief requests.
-                They include waybill tracking, transport details, and proof of delivery.
+                Dispatches are auto-generated when stock is allocated from an approved
+                request. They include waybill tracking, transport details, and proof
+                of delivery.
             </p>
         </field>
     </record>
diff --git a/spp_drims/wizard/inspection_wizard.py b/spp_drims/wizard/inspection_wizard.py
index ebb554d8..468ec063 100644
--- a/spp_drims/wizard/inspection_wizard.py
+++ b/spp_drims/wizard/inspection_wizard.py
@@ -56,7 +56,14 @@ class InspectionWizard(models.TransientModel):
 
     @api.depends("line_ids.is_inspected", "line_ids.quantity", "line_ids.quantity_expected")
     def _compute_is_valid(self):
-        """Check if all items are inspected and quantities match."""
+        """Check if all items are inspected and quantities match.
+
+        OP#964: the expected-equals-total check only applies when the
+        user has split a product into multiple inspection lines. A single
+        line per product is treated as the user reporting the final
+        received quantity (which may differ from the pre-inspection
+        ``quantity_received`` hint), so we don't block them on equality.
+        """
         for wizard in self:
             if not wizard.line_ids:
                 wizard.is_valid = False
@@ -68,7 +75,7 @@ def _compute_is_valid(self):
                 wizard.is_valid = False
                 continue
 
-            # Check quantities match per product
+            # Check split totals match per product (only when actually split)
             products = {}
             for line in wizard.line_ids:
                 product_id = line.product_id.id
@@ -76,11 +83,14 @@ def _compute_is_valid(self):
                     products[product_id] = {
                         "expected": line.quantity_expected,
                         "total": 0.0,
+                        "count": 0,
                     }
                 products[product_id]["total"] += line.quantity
+                products[product_id]["count"] += 1
 
-            quantities_match = all(abs(data["expected"] - data["total"]) < 0.001 for data in products.values())
-            wizard.is_valid = quantities_match
+            wizard.is_valid = all(
+                data["count"] <= 1 or abs(data["expected"] - data["total"]) < 0.001 for data in products.values()
+            )
 
     def action_accept_all(self):
         """Accept all items as New/Accept - one click for simple cases."""
@@ -153,19 +163,26 @@ def action_confirm_inspection(self):
             products[product_id]["total"] += line.quantity
             products[product_id]["lines"].append(line)
 
+        # OP#964: only enforce equality when the user has split a product
+        # into multiple lines. A single line is treated as the user
+        # reporting the final received quantity, and ``quantity_received``
+        # on the donation line will be overwritten to match below.
         for _product_id, data in products.items():
+            if len(data["lines"]) <= 1:
+                continue
             diff = abs(data["expected"] - data["total"])
             if diff > 0.001:
                 raise UserError(
                     _(
-                        "Product %(product)s: Total inspected (%(total)s) must equal "
-                        "expected (%(expected)s). Difference: %(diff)s"
+                        "Product %(product)s: split quantities total %(total)s but "
+                        "received quantity is %(expected)s. Splits must sum to the "
+                        "received quantity. Adjust splits or change the Received "
+                        "quantity on the donation line first."
                     )
                     % {
                         "product": data["name"],
                         "total": data["total"],
                         "expected": data["expected"],
-                        "diff": diff,
                     }
                 )
 

From 4c910b990e2658742391b1c25999c8be27368ad4 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Tue, 19 May 2026 10:28:34 +0800
Subject: [PATCH 02/26] fix(spp_drims): make Priority field editable on Request
 form (#965)

The form view used widget="badge" which rendered priority_id as a
read-only colored pill with no input control. Drop the badge widget
(and the decoration-* attributes that only render under badge) so the
field becomes a normal Many2one dropdown. List + kanban views keep
widget="badge" for compact display.
---
 spp_drims/views/request_views.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/spp_drims/views/request_views.xml b/spp_drims/views/request_views.xml
index 82c5ff47..3855f0a0 100644
--- a/spp_drims/views/request_views.xml
+++ b/spp_drims/views/request_views.xml
@@ -240,10 +240,7 @@
                             <field
                                 name="priority_id"
                                 readonly="approval_state not in ('draft', 'revision')"
-                                widget="badge"
-                                decoration-danger="priority_id.code == 'critical'"
-                                decoration-warning="priority_id.code == 'high'"
-                                decoration-info="priority_id.code == 'medium'"
+                                options="{'no_create': True}"
                             />
                             <field
                                 name="is_life_threatening"

From 1e37e64a979bb797f083c8d330854c9560dbf146 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Tue, 19 May 2026 10:48:10 +0800
Subject: [PATCH 03/26] feat(spp_drims): collect rejection reason via wizard on
 Request reject (#966)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reject button on the request form called action_reject directly with no
parameter, leaving rejection_reason empty — the audit trail lost the
rationale. Adds a single-record reject wizard with a required reason
field; the form button now opens the wizard, which writes the reason
and invokes action_reject. A red banner above the title surfaces the
reason on rejected requests.

- New spp.drims.request.reject.wizard TransientModel + form view
- New action_open_reject_wizard on spp.drims.request (guards approval
  state, raises on non-pending requests)
- Reject button wired to the wizard; confirm dialog removed since the
  wizard handles confirmation
- ACL for approver + manager roles
- 4 new tests cover wizard action, only-pending guard, happy path, and
  blank-reason rejection
---
 spp_drims/__manifest__.py                     |  1 +
 spp_drims/models/request.py                   | 21 ++++++
 spp_drims/security/ir.model.access.csv        |  2 +
 spp_drims/tests/test_wizard.py                | 64 +++++++++++++++++++
 spp_drims/views/request_views.xml             | 13 +++-
 spp_drims/wizard/__init__.py                  |  1 +
 spp_drims/wizard/request_reject_wizard.py     | 35 ++++++++++
 .../wizard/request_reject_wizard_views.xml    | 39 +++++++++++
 8 files changed, 174 insertions(+), 2 deletions(-)
 create mode 100644 spp_drims/wizard/request_reject_wizard.py
 create mode 100644 spp_drims/wizard/request_reject_wizard_views.xml

diff --git a/spp_drims/__manifest__.py b/spp_drims/__manifest__.py
index 403cad6c..3824baa6 100644
--- a/spp_drims/__manifest__.py
+++ b/spp_drims/__manifest__.py
@@ -51,6 +51,7 @@
         "views/menu_structure.xml",
         # Wizards (before views, as views may reference wizard actions)
         "wizard/bulk_approve_wizard.xml",
+        "wizard/request_reject_wizard_views.xml",
         "wizard/report_4w_wizard_views.xml",
         "wizard/stock_adjustment_wizard_views.xml",
         "wizard/inter_warehouse_transfer_wizard_views.xml",
diff --git a/spp_drims/models/request.py b/spp_drims/models/request.py
index 1ed549bc..61d1a097 100644
--- a/spp_drims/models/request.py
+++ b/spp_drims/models/request.py
@@ -443,6 +443,27 @@ def action_reject(self, reason=None):
             rec._on_reject()
         return True
 
+    def action_open_reject_wizard(self):
+        """Open the reject wizard to collect a required rejection reason (OP#966).
+
+        The Reject button on the form previously called ``action_reject``
+        directly and the user had no way to enter a reason, so the audit
+        trail lost the rationale. This action opens a small wizard that
+        collects a required reason text and then invokes ``action_reject``
+        with it.
+        """
+        self.ensure_one()
+        if self.approval_state not in ("pending", "submitted"):
+            raise UserError(_("Only pending requests can be rejected."))
+        return {
+            "type": "ir.actions.act_window",
+            "name": _("Reject Request"),
+            "res_model": "spp.drims.request.reject.wizard",
+            "view_mode": "form",
+            "target": "new",
+            "context": {"default_request_id": self.id},
+        }
+
     def action_request_revision(self, notes=None):
         """Request changes from the requester."""
         revision_state = self.env["spp.vocabulary.code"].search(
diff --git a/spp_drims/security/ir.model.access.csv b/spp_drims/security/ir.model.access.csv
index 789af72a..67b59024 100644
--- a/spp_drims/security/ir.model.access.csv
+++ b/spp_drims/security/ir.model.access.csv
@@ -75,6 +75,8 @@ access_spp_drims_bulk_approve_wizard_approver,DRIMS Bulk Approve Wizard Approver
 access_spp_drims_bulk_reject_wizard_approver,DRIMS Bulk Reject Wizard Approver,model_spp_drims_bulk_reject_wizard,group_drims_approver,1,1,1,1
 access_spp_drims_bulk_approve_wizard_manager,DRIMS Bulk Approve Wizard Manager,model_spp_drims_bulk_approve_wizard,group_drims_manager,1,1,1,1
 access_spp_drims_bulk_reject_wizard_manager,DRIMS Bulk Reject Wizard Manager,model_spp_drims_bulk_reject_wizard,group_drims_manager,1,1,1,1
+access_spp_drims_request_reject_wizard_approver,DRIMS Request Reject Wizard Approver,model_spp_drims_request_reject_wizard,group_drims_approver,1,1,1,1
+access_spp_drims_request_reject_wizard_manager,DRIMS Request Reject Wizard Manager,model_spp_drims_request_reject_wizard,group_drims_manager,1,1,1,1
 access_spp_drims_alert_sysadmin,DRIMS Alert System Admin,model_spp_drims_alert,base.group_system,1,1,1,1
 access_spp_drims_alert_admin,DRIMS Alert Admin,model_spp_drims_alert,spp_security.group_spp_admin,1,1,1,1
 access_spp_drims_alert_manager,DRIMS Alert Manager,model_spp_drims_alert,group_drims_manager,1,1,1,1
diff --git a/spp_drims/tests/test_wizard.py b/spp_drims/tests/test_wizard.py
index 361f300d..174736dd 100644
--- a/spp_drims/tests/test_wizard.py
+++ b/spp_drims/tests/test_wizard.py
@@ -133,6 +133,70 @@ def test_bulk_approve_to_reject_flow(self):
         self.assertEqual(action["target"], "new")
         self.assertIn("default_request_ids", action["context"])
 
+    # ---------- OP#966: single-record reject wizard ----------
+
+    def test_action_open_reject_wizard_returns_act_window(self):
+        """OP#966: action_open_reject_wizard returns the wizard action."""
+        request = self._create_pending_request()
+        action = request.action_open_reject_wizard()
+        self.assertEqual(action["type"], "ir.actions.act_window")
+        self.assertEqual(action["res_model"], "spp.drims.request.reject.wizard")
+        self.assertEqual(action["target"], "new")
+        self.assertEqual(action["context"]["default_request_id"], request.id)
+
+    def test_action_open_reject_wizard_only_pending(self):
+        """OP#966: opening the wizard on a non-pending request raises."""
+        request = self.env["spp.drims.request"].create(
+            {
+                "incident_id": self.incident.id,
+                "destination_area_id": self.area.id,
+                "date_needed": self.future_date,
+                "line_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "product_id": self.product.id,
+                            "quantity_requested": 10,
+                            "uom_id": self.product.uom_id.id,
+                        },
+                    )
+                ],
+            }
+        )
+        # Still in draft, never submitted
+        with self.assertRaises(UserError):
+            request.action_open_reject_wizard()
+
+    def test_request_reject_wizard_writes_reason_and_rejects(self):
+        """OP#966: the wizard writes rejection_reason and rejects the request."""
+        request = self._create_pending_request()
+        wizard = self.env["spp.drims.request.reject.wizard"].create(
+            {
+                "request_id": request.id,
+                "reason": "Out of scope for this funding cycle",
+            }
+        )
+        wizard.action_reject()
+        self.assertEqual(request.approval_state, "rejected")
+        self.assertEqual(
+            request.rejection_reason, "Out of scope for this funding cycle"
+        )
+
+    def test_request_reject_wizard_blank_reason_raises(self):
+        """OP#966: whitespace-only reason raises UserError."""
+        request = self._create_pending_request()
+        wizard = self.env["spp.drims.request.reject.wizard"].create(
+            {
+                "request_id": request.id,
+                "reason": "   ",
+            }
+        )
+        with self.assertRaises(UserError):
+            wizard.action_reject()
+        # Request stays pending
+        self.assertEqual(request.approval_state, "pending")
+
 
 @tagged("post_install", "-at_install")
 class TestInspectionWizard(DrimsTestCommon):
diff --git a/spp_drims/views/request_views.xml b/spp_drims/views/request_views.xml
index 3855f0a0..b9899e05 100644
--- a/spp_drims/views/request_views.xml
+++ b/spp_drims/views/request_views.xml
@@ -107,13 +107,12 @@
                         groups="spp_drims.group_drims_approver"
                     />
                     <button
-                        name="action_reject"
+                        name="action_open_reject_wizard"
                         string="Reject"
                         type="object"
                         class="btn-outline-danger"
                         invisible="approval_state != 'pending'"
                         groups="spp_drims.group_drims_approver"
-                        confirm="Reject this request? This action cannot be undone."
                     />
 
                     <!-- Revision Actions -->
@@ -198,6 +197,16 @@
                         invisible="not is_life_threatening"
                     />
 
+                    <!-- Rejection reason banner (OP#966) -->
+                    <div
+                        class="alert alert-danger"
+                        role="alert"
+                        invisible="approval_state != 'rejected'"
+                    >
+                        <strong>Rejection reason:</strong>
+                        <field name="rejection_reason" readonly="1" nolabel="1" />
+                    </div>
+
                     <!-- Title -->
                     <div class="oe_title">
                         <h1>
diff --git a/spp_drims/wizard/__init__.py b/spp_drims/wizard/__init__.py
index b9257e5f..a6ae1f0d 100644
--- a/spp_drims/wizard/__init__.py
+++ b/spp_drims/wizard/__init__.py
@@ -1,5 +1,6 @@
 # Part of OpenSPP. See LICENSE file for full copyright and licensing details.
 from . import bulk_approve_wizard
+from . import request_reject_wizard
 from . import report_4w_wizard
 from . import stock_adjustment_wizard
 from . import inter_warehouse_transfer_wizard
diff --git a/spp_drims/wizard/request_reject_wizard.py b/spp_drims/wizard/request_reject_wizard.py
new file mode 100644
index 00000000..16879b34
--- /dev/null
+++ b/spp_drims/wizard/request_reject_wizard.py
@@ -0,0 +1,35 @@
+# Part of OpenSPP. See LICENSE file for full copyright and licensing details.
+"""Single-record reject wizard for DRIMS requests (OP#966).
+
+The Reject button on the request form was calling ``action_reject``
+directly and the user had no way to supply a rejection reason — the
+audit trail lost the rationale. This wizard collects a required reason
+before invoking ``action_reject(reason=...)`` on the request.
+"""
+
+from odoo import _, fields, models
+from odoo.exceptions import UserError
+
+
+class DrimsRequestRejectWizard(models.TransientModel):
+    _name = "spp.drims.request.reject.wizard"
+    _description = "DRIMS Request Reject Wizard"
+
+    request_id = fields.Many2one(
+        "spp.drims.request",
+        string="Request",
+        required=True,
+        readonly=True,
+    )
+    reason = fields.Text(
+        string="Rejection Reason",
+        required=True,
+        help="This text is stored on the request and shown in the audit trail.",
+    )
+
+    def action_reject(self):
+        self.ensure_one()
+        if not self.reason or not self.reason.strip():
+            raise UserError(_("Please provide a rejection reason."))
+        self.request_id.action_reject(reason=self.reason)
+        return {"type": "ir.actions.act_window_close"}
diff --git a/spp_drims/wizard/request_reject_wizard_views.xml b/spp_drims/wizard/request_reject_wizard_views.xml
new file mode 100644
index 00000000..1380f971
--- /dev/null
+++ b/spp_drims/wizard/request_reject_wizard_views.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <!-- DRIMS Request Reject Wizard Form (OP#966) -->
+    <record id="view_drims_request_reject_wizard_form" model="ir.ui.view">
+        <field name="name">spp.drims.request.reject.wizard.form</field>
+        <field name="model">spp.drims.request.reject.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Reject Request">
+                <sheet>
+                    <div class="alert alert-warning" role="alert">
+                        You are rejecting request <field
+                        name="request_id"
+                        readonly="1"
+                        class="oe_inline"
+                    />. Please provide a reason — it will be saved on the
+                        request for the audit trail.
+                    </div>
+                    <group>
+                        <field
+                            name="reason"
+                            nolabel="1"
+                            colspan="2"
+                            placeholder="Why is this request being rejected?"
+                        />
+                    </group>
+                </sheet>
+                <footer>
+                    <button
+                        name="action_reject"
+                        string="Reject Request"
+                        type="object"
+                        class="btn-danger"
+                    />
+                    <button string="Cancel" class="btn-secondary" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+</odoo>

From e782c2951f4d165965bc1056c95dcc8ed0ddb312 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Wed, 20 May 2026 11:54:00 +0800
Subject: [PATCH 04/26] fix(spp_base_common,spp_drims): round-2 QA fixes for
 OP#967 + OP#968
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OP#967 — Estimated Beneficiaries Reached field now visually marks itself
as required when value is 0.

  Odoo 19's _checkValidity (record.js:430) explicitly skips
  boolean/float/integer/monetary types from required-empty validation,
  so a required Integer with value 0 never gets the o_field_invalid
  class or the asterisk on its label. The model-side button_validate
  check rejects 0 on save but the form is silent until then.

  Adds a reusable 'integer_positive_required' field widget to
  spp_base_common. It plugs into Odoo's visual-feedback pipeline via
  the field config's isValid hook (fieldVisualFeedback calls
  field.isValid BEFORE record.isFieldInvalid). Returns false when
  value <= 0 AND the required modifier evaluates true, which adds
  o_field_invalid → pink highlight + asterisk on the label.

  Any module can opt in: widget="integer_positive_required".
  spp_drims uses it on beneficiary_count, with the same
  required="drims_type == 'request_dispatch'" modifier as
  beneficiary_area_id.

OP#968 — Form-toolbar New button now hidden when opening a dispatch
picking from the DRIMS Dispatches action.

  The earlier round only set create="0" on the list view; Odoo 19's
  form view ignores list-level create attributes for the toolbar
  button. Action-context 'create': False is also unreliable in Odoo
  19.

  spp_base_common already exposes a hideFormCreateButton flag via its
  custom_list_create_template.xml — set it on a FormController
  instance to skip the New button. New patch in spp_drims sets the
  flag when the form is opened for stock.picking with the dispatch
  action's context key (default_drims_type=request_dispatch). The
  standard stock.picking form on Inventory > Operations is
  unaffected because the discriminator is the context, not the
  model.

Also adds spp_base_common as an explicit dep of spp_drims (was
transitive via other modules).
---
 spp_base_common/__manifest__.py               |  1 +
 .../src/js/integer_positive_required.js       | 57 +++++++++++++++++++
 spp_drims/__manifest__.py                     |  7 ++-
 .../src/js/hide_dispatch_form_create.js       | 34 +++++++++++
 spp_drims/views/stock_picking_views.xml       | 12 ++++
 5 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 spp_base_common/static/src/js/integer_positive_required.js
 create mode 100644 spp_drims/static/src/js/hide_dispatch_form_create.js

diff --git a/spp_base_common/__manifest__.py b/spp_base_common/__manifest__.py
index 6cda488f..ae202f52 100644
--- a/spp_base_common/__manifest__.py
+++ b/spp_base_common/__manifest__.py
@@ -38,6 +38,7 @@
             "spp_base_common/static/src/xml/custom_list_create_template.xml",
             "spp_base_common/static/src/js/filterable_radio_field.js",
             "spp_base_common/static/src/xml/filterable_radio_field.xml",
+            "spp_base_common/static/src/js/integer_positive_required.js",
         ],
         "web._assets_primary_variables": [
             "spp_base_common/static/src/scss/colors.scss",
diff --git a/spp_base_common/static/src/js/integer_positive_required.js b/spp_base_common/static/src/js/integer_positive_required.js
new file mode 100644
index 00000000..13d2d35f
--- /dev/null
+++ b/spp_base_common/static/src/js/integer_positive_required.js
@@ -0,0 +1,57 @@
+/** @odoo-module **/
+/*
+ * `integer_positive_required` field widget — a reusable Integer field that
+ * treats 0 as invalid when the field is required.
+ *
+ * Why: Odoo 19's `_checkValidity` (web/static/src/model/relational_model/
+ * record.js) explicitly skips numeric field types (`boolean`, `float`,
+ * `integer`, `monetary`) from the required-empty validation. That means
+ * a required Integer with value 0 is NEVER added to `_invalidFields`,
+ * the `o_field_invalid` class is NEVER applied, and the user gets no
+ * visual cue (asterisk on label / pink highlight on input) that the
+ * field is unfilled. The model-side validation still rejects 0 on save,
+ * but the form is silent until then.
+ *
+ * `fieldVisualFeedback` calls `field.isValid(record, fieldName, fieldInfo)`
+ * BEFORE falling back to `record.isFieldInvalid(...)`. So a widget can
+ * override `isValid` to plug its own check into the visual-feedback
+ * pipeline. We use that hook to mark the field invalid when value <= 0
+ * AND `required` evaluates true.
+ *
+ * Usage:
+ *   <field name="beneficiary_count"
+ *          widget="integer_positive_required"
+ *          required="..."/>
+ */
+
+import {evaluateBooleanExpr} from "@web/core/py_js/py";
+import {registry} from "@web/core/registry";
+import {integerField} from "@web/views/fields/integer/integer_field";
+
+export const integerPositiveRequiredField = {
+    ...integerField,
+    isEmpty: (record, fieldName) => {
+        const value = record.data[fieldName];
+        return value === false || value === 0;
+    },
+    isValid: (record, fieldName, fieldInfo) => {
+        const value = record.data[fieldName];
+        // Field is valid if value is a positive integer.
+        if (typeof value === "number" && value > 0) {
+            return true;
+        }
+        // 0, false (unset), or non-numeric — only valid when field is not
+        // required. Evaluate the required modifier against the record's
+        // eval context (it may be a dynamic expression like
+        // `drims_type == 'request_dispatch'`).
+        const required = evaluateBooleanExpr(
+            fieldInfo.required,
+            record.evalContextWithVirtualIds
+        );
+        return !required;
+    },
+};
+
+registry
+    .category("fields")
+    .add("integer_positive_required", integerPositiveRequiredField);
diff --git a/spp_drims/__manifest__.py b/spp_drims/__manifest__.py
index 3824baa6..246f11b7 100644
--- a/spp_drims/__manifest__.py
+++ b/spp_drims/__manifest__.py
@@ -17,6 +17,7 @@
         "mail",
         "stock",
         "spp_alerts",
+        "spp_base_common",
         "spp_security",
         "spp_vocabulary",
         "spp_area",
@@ -80,7 +81,11 @@
         # Menus with actions (loaded last, after all views define their actions)
         "views/menus.xml",
     ],
-    "assets": {},
+    "assets": {
+        "web.assets_backend": [
+            "spp_drims/static/src/js/hide_dispatch_form_create.js",
+        ],
+    },
     "application": True,
     "installable": True,
     "auto_install": False,
diff --git a/spp_drims/static/src/js/hide_dispatch_form_create.js b/spp_drims/static/src/js/hide_dispatch_form_create.js
new file mode 100644
index 00000000..4cfc5466
--- /dev/null
+++ b/spp_drims/static/src/js/hide_dispatch_form_create.js
@@ -0,0 +1,34 @@
+/** @odoo-module **/
+/*
+ * OP#968 round-2 — hide the form-level "New" button when the user opens a
+ * DRIMS Dispatch picking from the dedicated action.
+ *
+ * The list view already disables create (via `view_picking_list_drims_dispatch`
+ * with `create="0"`), but Odoo 19's form view renders its own "New" button on
+ * the breadcrumb pager that the list-view attribute doesn't reach. Action
+ * context `'create': False` is unreliable in Odoo 19 too.
+ *
+ * The supported pattern in this repo is the `hideFormCreateButton` flag added
+ * by `spp_base_common/static/src/xml/custom_list_create_template.xml`. Setting
+ * it to `true` in a FormController patch makes the template skip the button.
+ *
+ * We discriminate on the model + the `default_drims_type` context key the
+ * dispatch action sets, so the standard `stock.picking` form on
+ * Inventory > Operations is unaffected.
+ */
+
+import {FormController} from "@web/views/form/form_controller";
+import {patch} from "@web/core/utils/patch";
+
+patch(FormController.prototype, {
+    setup() {
+        super.setup(...arguments);
+        const ctx = this.props.context || {};
+        if (
+            this.props.resModel === "stock.picking" &&
+            ctx.default_drims_type === "request_dispatch"
+        ) {
+            this.hideFormCreateButton = true;
+        }
+    },
+});
diff --git a/spp_drims/views/stock_picking_views.xml b/spp_drims/views/stock_picking_views.xml
index a443a87a..f7414267 100644
--- a/spp_drims/views/stock_picking_views.xml
+++ b/spp_drims/views/stock_picking_views.xml
@@ -111,8 +111,20 @@
                                 options="{'no_create': True}"
                                 required="drims_type == 'request_dispatch'"
                             />
+                            <!--
+                                OP#967 round-3: use spp_base_common's
+                                integer_positive_required widget so the
+                                field reports as empty when value is 0
+                                (standard IntegerField considers any int
+                                "set", which suppresses the required
+                                asterisk + pink-highlight on 0). The
+                                model-side button_validate check still
+                                rejects beneficiary_count <= 0 — the
+                                widget just provides the visual cue.
+                            -->
                             <field
                                 name="beneficiary_count"
+                                widget="integer_positive_required"
                                 required="drims_type == 'request_dispatch'"
                             />
                             <field

From f98eecd37d1072e337d6b6f0ce49c7d5bf90fba1 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Wed, 20 May 2026 12:53:56 +0800
Subject: [PATCH 05/26] fix(spp_drims): hide redundant standard Print + Return
 buttons on DRIMS pickings (#970)

The dispatch form already exposes a DRIMS-specific Print Waybill (via
spp_drims.action_report_drims_waybill) and Create Return (via the DRIMS
return wizard) in the header. The standard stock module's Print +
Return buttons stayed visible alongside them, producing visible
duplicates that confused users.

Added three xpath rules to spp_drims's view_picking_form_drims that
extend the existing 'invisible' clauses on the standard buttons with
`or drims_type_id`, so they hide on any picking carrying a DRIMS
type. Standard buttons stay untouched on non-DRIMS pickings.

The action-button names (e.g. %(action_report_delivery)d) get resolved
to numeric IDs at view-parse time and xpath cannot match them by
name. Used data-hotkey + contains(@invisible, 'done') as the
discriminator instead.
---
 spp_drims/views/stock_picking_views.xml | 30 +++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/spp_drims/views/stock_picking_views.xml b/spp_drims/views/stock_picking_views.xml
index f7414267..ccda5e01 100644
--- a/spp_drims/views/stock_picking_views.xml
+++ b/spp_drims/views/stock_picking_views.xml
@@ -77,6 +77,36 @@
                 />
             </xpath>
 
+            <!--
+                OP#970: hide the standard Print + Return buttons when this is
+                a DRIMS picking. The dispatch already exposes Print Waybill
+                (above) and Create Return (above) which route through the
+                DRIMS-specific report + return wizard; the standard ones
+                produce duplicates that confuse users.
+
+                The action-button names like `%(action_report_delivery)d` get
+                resolved to numeric IDs at view-parse time, so xpath can't
+                match by name. We discriminate by `data-hotkey` + the
+                button's existing `invisible` expression instead.
+            -->
+            <xpath
+                expr="//header/button[@name='do_print_picking']"
+                position="attributes"
+            >
+                <attribute
+                    name="invisible"
+                >state != 'assigned' or drims_type_id</attribute>
+            </xpath>
+            <xpath
+                expr="//header/button[@data-hotkey='o' and contains(@invisible, 'done')]"
+                position="attributes"
+            >
+                <attribute name="invisible">state != 'done' or drims_type_id</attribute>
+            </xpath>
+            <xpath expr="//header/button[@data-hotkey='k']" position="attributes">
+                <attribute name="invisible">state != 'done' or drims_type_id</attribute>
+            </xpath>
+
             <!-- Add DRIMS tab -->
             <xpath expr="//notebook" position="inside">
                 <page string="DRIMS" name="drims" invisible="drims_type_id == False">

From 32f33690503de23ccbfab6d5cac38bd983a24802 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Wed, 20 May 2026 15:34:33 +0800
Subject: [PATCH 06/26] fix(spp_drims): escape xmlid-resolution sigil in
 comment to avoid parse error (#970)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Odoo's view-loader runs the %(xmlid)d resolution regex over the
arch_db string before storing it, and the regex does not skip XML
comments. The previous comment in view_picking_form_drims contained
the literal %(action_report_delivery)d sequence, which Odoo
interpreted as a real reference and tried to resolve as
spp_drims.action_report_delivery — that xmlid lives in the stock
module, not spp_drims, so module upgrade failed with:

  ValueError: External ID not found in the system: spp_drims.action_report_delivery

Rewrote the comment to describe the sigil in prose instead of
including the literal character sequence.
---
 spp_drims/views/stock_picking_views.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/spp_drims/views/stock_picking_views.xml b/spp_drims/views/stock_picking_views.xml
index ccda5e01..1bc282b6 100644
--- a/spp_drims/views/stock_picking_views.xml
+++ b/spp_drims/views/stock_picking_views.xml
@@ -84,10 +84,13 @@
                 DRIMS-specific report + return wizard; the standard ones
                 produce duplicates that confuse users.
 
-                The action-button names like `%(action_report_delivery)d` get
-                resolved to numeric IDs at view-parse time, so xpath can't
-                match by name. We discriminate by `data-hotkey` + the
-                button's existing `invisible` expression instead.
+                The action-button names for the standard Print + Return
+                buttons use the percent-paren xmlid-resolution sigil and
+                get rewritten to numeric IDs at view-parse time, so xpath
+                cannot match them by name. We discriminate by `data-hotkey`
+                + the button's existing `invisible` expression instead.
+                (Avoid writing the literal sigil here — Odoo's parser
+                runs the regex over comments too and tries to resolve.)
             -->
             <xpath
                 expr="//header/button[@name='do_print_picking']"

From 09f872b933097bf9e3b92518f5d33b2b08c1cda5 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Wed, 20 May 2026 15:34:47 +0800
Subject: [PATCH 07/26] feat(spp_drims): add post-approval lanes Ready for
 Allocation / Ready for Dispatch (#969)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Users couldn't sort approved requests by what's needed next — there
was no visual separation between requests waiting for allocation vs.
those waiting for dispatch. The states already existed in the
state-machine (approved → allocated → dispatched) but were exposed
under the same generic labels as the underlying codes.

Changes:

- vocabulary_codes.xml: rename display strings on two existing codes —
  'approved' → 'Ready for Allocation', 'allocated' → 'Ready for
  Dispatch'. Wrapped in <data noupdate="0"> so the rename
  propagates on subsequent module upgrades (the parent element has
  noupdate=1).

- request_views.xml list view: new Fulfillment State badge column
  showing the relabeled state_id, with decoration-info for
  pre-allocation states, decoration-success for post-allocation,
  decoration-danger for rejected/cancelled. Optional='show' so it
  appears by default.

- request_views.xml search view: two new named filters —
  'Ready for Allocation' (approval_state='approved' AND state not
  past allocated) and 'Ready for Dispatch' (state='allocated').
  Also added the fulfillment state to the searchpanel (with counters)
  and a 'Fulfillment State' group-by.
---
 spp_drims/data/vocabulary_codes.xml | 35 ++++++++++++-------
 spp_drims/views/request_views.xml   | 52 +++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/spp_drims/data/vocabulary_codes.xml b/spp_drims/data/vocabulary_codes.xml
index 5358880e..c8ea0a22 100644
--- a/spp_drims/data/vocabulary_codes.xml
+++ b/spp_drims/data/vocabulary_codes.xml
@@ -155,12 +155,20 @@
         <field name="display">Submitted</field>
         <field name="sequence">20</field>
     </record>
-    <record id="code_drims_request_approved" model="spp.vocabulary.code">
-        <field name="vocabulary_id" ref="vocab_drims_request_state" />
-        <field name="code">approved</field>
-        <field name="display">Approved</field>
-        <field name="sequence">30</field>
-    </record>
+    <!--
+        OP#969: relabel `approved` so the post-approval queue is obvious.
+        Wrapped in noupdate=0 so the renamed `display` propagates on every
+        module upgrade (the outer odoo element has noupdate=1, which would
+        otherwise skip the rewrite on already-installed databases).
+    -->
+    <data noupdate="0">
+        <record id="code_drims_request_approved" model="spp.vocabulary.code">
+            <field name="vocabulary_id" ref="vocab_drims_request_state" />
+            <field name="code">approved</field>
+            <field name="display">Ready for Allocation</field>
+            <field name="sequence">30</field>
+        </record>
+    </data>
     <record id="code_drims_request_rejected" model="spp.vocabulary.code">
         <field name="vocabulary_id" ref="vocab_drims_request_state" />
         <field name="code">rejected</field>
@@ -173,12 +181,15 @@
         <field name="display">Fulfilled</field>
         <field name="sequence">50</field>
     </record>
-    <record id="code_drims_request_allocated" model="spp.vocabulary.code">
-        <field name="vocabulary_id" ref="vocab_drims_request_state" />
-        <field name="code">allocated</field>
-        <field name="display">Allocated</field>
-        <field name="sequence">35</field>
-    </record>
+    <!-- OP#969: relabel `allocated` — see note on `approved` above. -->
+    <data noupdate="0">
+        <record id="code_drims_request_allocated" model="spp.vocabulary.code">
+            <field name="vocabulary_id" ref="vocab_drims_request_state" />
+            <field name="code">allocated</field>
+            <field name="display">Ready for Dispatch</field>
+            <field name="sequence">35</field>
+        </record>
+    </data>
     <record id="code_drims_request_dispatched" model="spp.vocabulary.code">
         <field name="vocabulary_id" ref="vocab_drims_request_state" />
         <field name="code">dispatched</field>
diff --git a/spp_drims/views/request_views.xml b/spp_drims/views/request_views.xml
index b9899e05..de5d4d08 100644
--- a/spp_drims/views/request_views.xml
+++ b/spp_drims/views/request_views.xml
@@ -44,6 +44,24 @@
                     decoration-success="approval_state == 'approved'"
                     decoration-danger="approval_state == 'rejected'"
                 />
+                <!--
+                    OP#969: Fulfillment State column (post-approval lanes).
+                    Displays the relabeled vocab codes ("Approved · Ready
+                    for Allocation", "Allocated · Ready for Dispatch", etc.)
+                    so the list-level filter results are self-explanatory
+                    and the lane progression is visible at a glance.
+                    Optional="show" so it appears by default but users can
+                    hide it via the column-toggle if they don't need it.
+                -->
+                <field
+                    name="state_id"
+                    string="Fulfillment State"
+                    widget="badge"
+                    optional="show"
+                    decoration-info="state in ('draft', 'submitted', 'approved')"
+                    decoration-success="state in ('allocated', 'dispatched', 'delivered', 'fulfilled')"
+                    decoration-danger="state in ('rejected', 'cancelled')"
+                />
                 <field
                     name="sla_status"
                     widget="badge"
@@ -457,6 +475,15 @@
                         icon="fa-tasks"
                         enable_counters="1"
                     />
+                    <!-- OP#969: surface the fulfillment-state lanes so users
+                         can pivot between approval state and post-approval
+                         progress without re-filtering. -->
+                    <field
+                        name="state_id"
+                        select="multi"
+                        icon="fa-truck"
+                        enable_counters="1"
+                    />
                     <field
                         name="priority_id"
                         select="multi"
@@ -517,6 +544,23 @@
                     string="Rejected"
                     domain="[('approval_state', '=', 'rejected')]"
                 />
+                <!--
+                    OP#969: post-approval queue filters so warehouse staff
+                    can pull "what's next for me?" without scanning the
+                    list. Ready for Allocation = approved but not yet
+                    moved into allocated state. Ready for Dispatch =
+                    allocated but not yet dispatched.
+                -->
+                <filter
+                    name="ready_for_allocation"
+                    string="Ready for Allocation"
+                    domain="[('approval_state', '=', 'approved'), ('state', 'not in', ['allocated', 'dispatched', 'delivered', 'fulfilled'])]"
+                />
+                <filter
+                    name="ready_for_dispatch"
+                    string="Ready for Dispatch"
+                    domain="[('state', '=', 'allocated')]"
+                />
                 <separator />
 
                 <!-- Date Filters - Needed By -->
@@ -591,6 +635,14 @@
                         string="Approval Status"
                         context="{'group_by': 'approval_state'}"
                     />
+                    <!-- OP#969: also group by fulfillment state so post-approval
+                         lanes (Approved → Allocated → Dispatched → Delivered)
+                         are visible at a glance. -->
+                    <filter
+                        name="group_fulfillment_state"
+                        string="Fulfillment State"
+                        context="{'group_by': 'state_id'}"
+                    />
                     <filter
                         name="group_date_needed"
                         string="Date Needed"

From d7e9c7bf88745c90ddc8f1d8d2ee42ca193d274f Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Fri, 22 May 2026 11:55:22 +0800
Subject: [PATCH 08/26] fix(spp_drims): lock quantity_received editing to the
 received state only (#962)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Donation lines' 'Received' quantity was editable during BOTH 'announced'
and 'received' states. That allowed users to enter a received quantity
at pledge/announcement time, which then silently flowed through
action_mark_received (the auto-copy only fills zero values) and drove
the stock picking with pre-entered values the user hadn't necessarily
confirmed.

Tightens the view-level readonly to permit edits only in the 'received'
state. The auto-copy of pledged → received during the announced→received
transition is unaffected because that path writes the line via Python,
not via the field.

Out of scope: edits in the 'received' state after the stock picking
exists still don't update the picking — that picking-sync question
needs a separate decision and should be tracked as a follow-up.
---
 spp_drims/views/donation_views.xml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/spp_drims/views/donation_views.xml b/spp_drims/views/donation_views.xml
index 7f9badb9..dc147923 100644
--- a/spp_drims/views/donation_views.xml
+++ b/spp_drims/views/donation_views.xml
@@ -152,10 +152,28 @@
                                         string="Pledged"
                                         readonly="parent.state != 'announced'"
                                     />
+                                    <!--
+                                        OP#962: `quantity_received` is editable
+                                        only in the `received` state — never
+                                        during `announced`. Allowing edits at
+                                        announce-time let pre-entered values
+                                        silently flow through
+                                        `action_mark_received()` (which only
+                                        auto-copies pledged→received for lines
+                                        where quantity_received == 0), driving
+                                        the stock picking with values the user
+                                        hadn't necessarily confirmed.
+
+                                        Note: edits in the `received` state
+                                        after the picking exists still don't
+                                        update the picking — that picking-sync
+                                        question is out of scope here and
+                                        should be tracked separately.
+                                    -->
                                     <field
                                         name="quantity_received"
                                         string="Received"
-                                        readonly="parent.state not in ('announced', 'received')"
+                                        readonly="parent.state != 'received'"
                                     />
                                     <field
                                         name="receipt_variance"

From 724a838af615c565969fa0303fb4d8896ed3d1e9 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Fri, 22 May 2026 12:29:10 +0800
Subject: [PATCH 09/26] feat(spp_drims): add warehouse tier + surface GIS
 location field on warehouse form (#959)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The DRIMS warehouse form was missing the documented tier field
(docs/DATA_MODEL.md:185-195 specifies Selection central/regional/mobile)
and never actually showed the gis_location point even though the model
field existed.

- models/stock_warehouse.py: new tier Selection(central/regional/mobile),
  indexed for filter performance.

- views/stock_warehouse_views.xml form: replace the existing
  position='inside' xpath on the standard notebook with a new un-gated
  notebook anchored before it. The standard <notebook> on
  stock.view_warehouse is groups='stock.group_adv_location,
  stock.group_stock_multi_warehouses', so attaching the DRIMS
  Configuration page inside it hides the entire page for admins who
  don't hold those advanced inventory roles — which was exactly what
  was happening here (existing capacity / area / emergency contact
  fields were also invisible).

  Page layout: Active Response at the top, full-width (field carries
  colspan=2 to span both sub-columns of the group; colspan on the group
  itself would be a no-op at page level). Below that, two-column row of
  Disaster Response Configuration (incl. tier + drims_capacity +
  area_id + gis_location with the geo_point widget) and Emergency
  Contact.

- views/stock_warehouse_views.xml list: surfaces tier as an optional
  badge column.

- views/stock_warehouse_views.xml search: tier search field, three
  preset filters (Central / Regional / Mobile), and a Tier group-by.

- views/stock_warehouse_views.xml GIS: new <gis> view for
  stock.warehouse — the geo_point widget on the form requires one
  (without it the form errors with 'No GIS view defined for the model
  stock.warehouse'). Plus the matching spp.gis.data.layer (warehouse
  location point) and spp.gis.raster.layer (OSM tile base) records —
  without the raster layer the GIS view errors with 'No raster layer
  for view stock.warehouse.gis.drims'.

228 spp_drims tests pass.
---
 spp_drims/models/stock_warehouse.py       |  17 +++
 spp_drims/views/stock_warehouse_views.xml | 174 +++++++++++++++++-----
 2 files changed, 156 insertions(+), 35 deletions(-)

diff --git a/spp_drims/models/stock_warehouse.py b/spp_drims/models/stock_warehouse.py
index 7f1c8513..0553f165 100644
--- a/spp_drims/models/stock_warehouse.py
+++ b/spp_drims/models/stock_warehouse.py
@@ -31,6 +31,23 @@ class StockWarehouse(models.Model):
         string="GPS Location",
         help="Geographic location of the warehouse for GIS mapping",
     )
+    # OP#959: warehouse tier per docs/DATA_MODEL.md:185-195
+    # central — strategic stockpile (national / regional hub)
+    # regional — provincial / district distribution centre
+    # mobile — temporary / field-deployed warehouse near the incident
+    tier = fields.Selection(
+        selection=[
+            ("central", "Central"),
+            ("regional", "Regional"),
+            ("mobile", "Mobile"),
+        ],
+        string="Warehouse Tier",
+        help=(
+            "Operational tier of this warehouse: Central (strategic stockpile), "
+            "Regional (provincial / district hub), or Mobile (field-deployed)."
+        ),
+        index=True,
+    )
 
     # Contact
     emergency_contact = fields.Char(string="Emergency Contact")
diff --git a/spp_drims/views/stock_warehouse_views.xml b/spp_drims/views/stock_warehouse_views.xml
index 9dbff1da..28f73ad2 100644
--- a/spp_drims/views/stock_warehouse_views.xml
+++ b/spp_drims/views/stock_warehouse_views.xml
@@ -73,46 +73,77 @@
                 </button>
             </xpath>
 
-            <!-- Add DRIMS configuration tab -->
-            <xpath expr="//notebook" position="inside">
-                <page
-                    string="DRIMS Configuration"
-                    name="drims_config"
-                    invisible="not is_drims_warehouse"
-                >
-                    <group>
-                        <group
-                            string="Disaster Response Configuration"
-                            name="drims_settings"
-                        >
-                            <field name="is_drims_warehouse" />
+            <!--
+                OP#959 round-2: the standard `stock.view_warehouse` notebook
+                is gated by `groups="stock.group_adv_location,
+                stock.group_stock_multi_warehouses"` (advanced inventory
+                roles), so attaching the DRIMS Configuration page inside
+                that notebook hides it for admins that don't carry those
+                groups. Wrap it in our own un-gated notebook anchored
+                just before the standard one — page is always reachable
+                when is_drims_warehouse is on, regardless of inventory
+                role membership.
+            -->
+            <xpath expr="//sheet/notebook" position="before">
+                <notebook>
+                    <page
+                        string="DRIMS Configuration"
+                        name="drims_config"
+                        invisible="not is_drims_warehouse"
+                    >
+                        <!--
+                            Active Response at the top, full-width, so the
+                            incidents this warehouse is responding to are
+                            the first thing the user sees on the tab. The
+                            field carries colspan="2" so it spans both
+                            sub-columns of the group (default col=2);
+                            colspan on the group itself is a no-op here
+                            since the parent <page> has no column grid.
+                        -->
+                        <group string="Active Response" name="active_response">
                             <field
-                                name="drims_capacity"
+                                name="incident_ids"
+                                widget="many2many_tags"
+                                nolabel="1"
+                                colspan="2"
                                 invisible="not is_drims_warehouse"
                             />
-                            <field name="area_id" invisible="not is_drims_warehouse" />
                         </group>
-                        <group string="Emergency Contact" name="emergency_contact">
-                            <field
-                                name="emergency_contact"
-                                invisible="not is_drims_warehouse"
-                            />
-                            <field
-                                name="emergency_phone"
-                                invisible="not is_drims_warehouse"
-                            />
-                        </group>
-                    </group>
 
-                    <group string="Active Response" name="active_response">
-                        <field
-                            name="incident_ids"
-                            widget="many2many_tags"
-                            nolabel="1"
-                            invisible="not is_drims_warehouse"
-                        />
-                    </group>
-                </page>
+                        <group>
+                            <group
+                                string="Disaster Response Configuration"
+                                name="drims_settings"
+                            >
+                                <field name="is_drims_warehouse" />
+                                <field name="tier" invisible="not is_drims_warehouse" />
+                                <field
+                                    name="drims_capacity"
+                                    invisible="not is_drims_warehouse"
+                                />
+                                <field
+                                    name="area_id"
+                                    invisible="not is_drims_warehouse"
+                                />
+                                <field
+                                    name="gis_location"
+                                    widget="geo_point"
+                                    invisible="not is_drims_warehouse"
+                                />
+                            </group>
+                            <group string="Emergency Contact" name="emergency_contact">
+                                <field
+                                    name="emergency_contact"
+                                    invisible="not is_drims_warehouse"
+                                />
+                                <field
+                                    name="emergency_phone"
+                                    invisible="not is_drims_warehouse"
+                                />
+                            </group>
+                        </group>
+                    </page>
+                </notebook>
             </xpath>
 
             <!-- Add DRIMS checkbox in general info -->
@@ -130,6 +161,8 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='name']" position="after">
                 <field name="is_drims_warehouse" optional="show" />
+                <!-- OP#959: surface tier on the list, optional by default -->
+                <field name="tier" optional="show" widget="badge" />
                 <field
                     name="drims_stock_health"
                     widget="badge"
@@ -155,6 +188,7 @@
                 <field name="name" />
                 <field name="code" />
                 <field name="area_id" />
+                <field name="tier" />
                 <separator />
                 <filter
                     string="DRIMS Warehouses"
@@ -162,17 +196,87 @@
                     domain="[('is_drims_warehouse', '=', True)]"
                 />
                 <separator />
+                <!-- OP#959: tier filters for quick triage of central / regional / mobile -->
+                <filter
+                    string="Central"
+                    name="tier_central"
+                    domain="[('tier', '=', 'central')]"
+                />
+                <filter
+                    string="Regional"
+                    name="tier_regional"
+                    domain="[('tier', '=', 'regional')]"
+                />
+                <filter
+                    string="Mobile"
+                    name="tier_mobile"
+                    domain="[('tier', '=', 'mobile')]"
+                />
+                <separator />
                 <group>
                     <filter
                         string="Coverage Area"
                         name="group_area"
                         context="{'group_by': 'area_id'}"
                     />
+                    <filter
+                        string="Tier"
+                        name="group_tier"
+                        context="{'group_by': 'tier'}"
+                    />
                 </group>
             </search>
         </field>
     </record>
 
+    <!--
+        OP#959: GIS view for stock.warehouse. The `geo_point` widget on
+        the form's gis_location field requires a `<gis>` view to exist
+        for the model — without one, opening a warehouse throws "No GIS
+        view defined for the model stock.warehouse".
+    -->
+    <record id="view_warehouse_gis_drims" model="ir.ui.view">
+        <field name="name">stock.warehouse.gis.drims</field>
+        <field name="model">stock.warehouse</field>
+        <field eval="16" name="priority" />
+        <field name="arch" type="xml">
+            <gis editable="1">
+                <field name="id" />
+                <field name="name" select="1" />
+                <field name="code" />
+                <field name="tier" />
+                <field name="is_drims_warehouse" />
+                <field name="gis_location" />
+            </gis>
+        </field>
+    </record>
+
+    <!--
+        Vector + raster layers for the warehouse GIS view. The data
+        layer renders each warehouse's gis_location point; the OSM
+        raster layer provides the base map (without it the GIS view
+        crashes with "No raster layer for view stock.warehouse.gis.drims").
+    -->
+    <record id="gis_data_layer_warehouse_location" model="spp.gis.data.layer">
+        <field
+            name="geo_field_id"
+            ref="spp_drims.field_stock_warehouse__gis_location"
+        />
+        <field name="name">Warehouse Location</field>
+        <field eval="1" name="sequence" />
+        <field name="view_id" ref="view_warehouse_gis_drims" />
+        <field name="geo_repr">basic</field>
+        <field name="active_on_startup" eval="True" />
+        <field name="layer_opacity">0.9</field>
+        <field name="begin_color">#1F78B4</field>
+    </record>
+
+    <record id="gis_raster_layer_warehouse_osm" model="spp.gis.raster.layer">
+        <field name="raster_type">osm</field>
+        <field name="name">Default</field>
+        <field name="view_id" ref="view_warehouse_gis_drims" />
+    </record>
+
     <!-- DRIMS Warehouse Action -->
     <record id="action_drims_warehouse" model="ir.actions.act_window">
         <field name="name">DRIMS Warehouses</field>

From 93753a49f60154835b825620a97f537e812d9f85 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Fri, 22 May 2026 12:33:48 +0800
Subject: [PATCH 10/26] fix(spp_drims): donation statusbar is read-only
 display, not clickable (#960)

The statusbar widget was configured with options="{'clickable': '1'}"
which let users click a state badge to fire the corresponding write to
state_id directly. That bypasses the header buttons (Mark Received /
Inspect Items / Stock Items / Reject / Cancel) which run validation,
trigger side-effects (auto-create stock picking on receive, open the
inspection wizard, etc.), and enforce the state-machine transitions.

Dropping the clickable option turns the statusbar into a read-only
display indicator and forces state changes through the proper actions.
---
 spp_drims/views/donation_views.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/spp_drims/views/donation_views.xml b/spp_drims/views/donation_views.xml
index dc147923..608167e7 100644
--- a/spp_drims/views/donation_views.xml
+++ b/spp_drims/views/donation_views.xml
@@ -79,11 +79,14 @@
                         invisible="state in ('stocked', 'rejected', 'cancelled')"
                         confirm="Cancel this donation? Any pending transfers will be cancelled."
                     />
-                    <field
-                        name="state_id"
-                        widget="statusbar"
-                        options="{'clickable': '1'}"
-                    />
+                    <!--
+                        OP#960: render state as a read-only indicator.
+                        All transitions go through the header buttons
+                        (Mark Received / Inspect Items / Stock Items /
+                        Reject / Cancel) which run the proper validation;
+                        a clickable statusbar would let users bypass that.
+                    -->
+                    <field name="state_id" widget="statusbar" />
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">

From 3546fdf047c68822e1275f2ed850f0cf7162b2f9 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Fri, 22 May 2026 15:42:56 +0800
Subject: [PATCH 11/26] fix(spp_drims): block empty allocation and keep request
 at Ready for Allocation (#1032)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a user allocated an approved request against a warehouse with
zero available stock, _allocate_stock_fifo was a no-op (0 across all
lines) but action_allocate still advanced the request to allocated
(Ready for Dispatch). The Create Dispatch button then became
available against a request with nothing allocated, allowing an
empty / invalid stock picking to be created.

Same path through the allocation-preview wizard: action_confirm_allocation
would write 0 across all request lines and still advance state.

Both paths now raise a UserError with the message:
  "No stock available in the selected warehouse. Please ensure the
   source warehouse has sufficient items before allocating."
when the total allocation is 0. The request state stays at approved
(Ready for Allocation) so the user can pick a different warehouse.

Partial allocation (some lines have stock, others don't) is still
allowed — the check is total <= 0.

Updated test_allocate_with_warehouse to seed stock first (otherwise it
would now fail). Added test_allocate_blocked_when_warehouse_has_no_stock
and test_confirm_blocked_when_zero_stock for the negative cases. 230
spp_drims tests pass.
---
 spp_drims/models/request.py                   | 16 ++++++
 .../tests/test_allocation_preview_wizard.py   | 23 +++++++++
 spp_drims/tests/test_request.py               | 50 ++++++++++++++++++-
 spp_drims/wizard/allocation_preview_wizard.py | 14 ++++++
 4 files changed, 101 insertions(+), 2 deletions(-)

diff --git a/spp_drims/models/request.py b/spp_drims/models/request.py
index 61d1a097..8e15dc9e 100644
--- a/spp_drims/models/request.py
+++ b/spp_drims/models/request.py
@@ -511,6 +511,13 @@ def action_allocate(self):
         """Allocate stock to fulfill this request using FEFO.
 
         For UI, use action_open_allocation_wizard() to preview before allocating.
+
+        OP#1032: if the source warehouse has zero available stock for every
+        requested item, the FIFO loop is a no-op and the request would
+        silently advance to Ready for Dispatch with 0 allocated. Instead,
+        check the total allocated quantity after the run; if it's still 0
+        across all lines, raise so the state stays at Ready for Allocation
+        and the user is forced to pick a warehouse that actually has stock.
         """
         for rec in self:
             if rec.approval_state != "approved":
@@ -518,6 +525,15 @@ def action_allocate(self):
             if not rec.source_warehouse_id:
                 raise UserError(_("Please select a source warehouse before allocation."))
             rec._allocate_stock_fifo()
+            total_allocated = sum(rec.line_ids.mapped("quantity_allocated"))
+            if total_allocated <= 0:
+                raise UserError(
+                    _(
+                        "No stock available in the selected warehouse. "
+                        "Please ensure the source warehouse has sufficient items "
+                        "before allocating."
+                    )
+                )
             # Update state to allocated
             allocated_state = self.env["spp.vocabulary.code"].search(
                 [
diff --git a/spp_drims/tests/test_allocation_preview_wizard.py b/spp_drims/tests/test_allocation_preview_wizard.py
index 6dfff6f8..ef1c8af7 100644
--- a/spp_drims/tests/test_allocation_preview_wizard.py
+++ b/spp_drims/tests/test_allocation_preview_wizard.py
@@ -225,6 +225,29 @@ def test_zero_stock_handling(self):
         self.assertEqual(line.shortfall, 100.0)
         self.assertEqual(line.allocation_status, "none")
 
+    def test_confirm_blocked_when_zero_stock(self):
+        """OP#1032: action_confirm_allocation refuses to advance the
+        request to allocated when the wizard's total quantity_to_allocate
+        is 0. Previously the wizard would silently confirm, set
+        quantity_allocated to 0 across all lines, and still advance the
+        request to Ready for Dispatch.
+        """
+        request = self._create_request_with_lines([(self.product, 100)])
+        initial_state = request.state
+
+        wizard = self.env["spp.drims.allocation.preview.wizard"].create(
+            {
+                "request_id": request.id,
+                "warehouse_id": self.warehouse.id,
+            }
+        )
+        wizard._populate_lines()
+        # No stock seeded — every line's quantity_to_allocate is 0.
+        with self.assertRaises(UserError):
+            wizard.action_confirm_allocation()
+        self.assertEqual(request.line_ids[0].quantity_allocated, 0)
+        self.assertEqual(request.state, initial_state)
+
     def test_partial_allocation(self):
         """Test partial allocation when stock is less than requested."""
         # Add partial stock
diff --git a/spp_drims/tests/test_request.py b/spp_drims/tests/test_request.py
index 7bc5de45..e10eb8c7 100644
--- a/spp_drims/tests/test_request.py
+++ b/spp_drims/tests/test_request.py
@@ -368,7 +368,11 @@ def test_allocate_without_warehouse(self):
             request.action_allocate()
 
     def test_allocate_with_warehouse(self):
-        """Test allocation workflow with source warehouse (GAP-REQ-001/002)."""
+        """Test allocation workflow with source warehouse (GAP-REQ-001/002).
+
+        OP#1032: the warehouse must also have stock — without stock,
+        `action_allocate` now refuses to advance the request state.
+        """
         request = self.env["spp.drims.request"].create(
             {
                 "incident_id": self.incident.id,
@@ -390,9 +394,51 @@ def test_allocate_with_warehouse(self):
         )
         request.action_submit()
         request.action_approve()
-        # Now allocation should work
+        # Seed stock so the allocation actually has something to grab.
+        self.env["stock.quant"].create(
+            {
+                "product_id": self.product.id,
+                "location_id": self.warehouse.lot_stock_id.id,
+                "quantity": 25.0,
+            }
+        )
         request.action_allocate()
         self.assertEqual(request.state, "allocated")
+        self.assertGreater(request.total_allocated, 0)
+
+    def test_allocate_blocked_when_warehouse_has_no_stock(self):
+        """OP#1032: action_allocate refuses to advance the request state
+        when the source warehouse has zero available stock for every
+        requested line. Previously the request silently advanced to
+        Ready for Dispatch with 0 allocated.
+        """
+        request = self.env["spp.drims.request"].create(
+            {
+                "incident_id": self.incident.id,
+                "destination_area_id": self.area.id,
+                "date_needed": self.future_date,
+                "source_warehouse_id": self.warehouse.id,
+                "line_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "product_id": self.product.id,
+                            "quantity_requested": 10,
+                            "uom_id": self.product.uom_id.id,
+                        },
+                    )
+                ],
+            }
+        )
+        request.action_submit()
+        request.action_approve()
+        # No stock seeded — allocation should raise and the state should
+        # stay at approved (Ready for Allocation).
+        with self.assertRaises(UserError):
+            request.action_allocate()
+        self.assertEqual(request.state, "approved")
+        self.assertEqual(request.total_allocated, 0)
 
     def test_create_dispatch_not_allocated(self):
         """Test that dispatch requires allocated state (GAP-REQ-003)."""
diff --git a/spp_drims/wizard/allocation_preview_wizard.py b/spp_drims/wizard/allocation_preview_wizard.py
index a5c30422..ec13fc47 100644
--- a/spp_drims/wizard/allocation_preview_wizard.py
+++ b/spp_drims/wizard/allocation_preview_wizard.py
@@ -182,6 +182,20 @@ def action_confirm_allocation(self):
         if not self.line_ids:
             raise UserError(_("No items to allocate."))
 
+        # OP#1032: refuse to confirm an empty allocation. Without this guard
+        # a user could pick a warehouse with zero available stock, the
+        # wizard would show 0 across all lines, and confirming would still
+        # advance the request to Ready for Dispatch with 0 allocated.
+        total_to_allocate = sum(self.line_ids.mapped("quantity_to_allocate"))
+        if total_to_allocate <= 0:
+            raise UserError(
+                _(
+                    "No stock available in the selected warehouse. "
+                    "Please ensure the source warehouse has sufficient items "
+                    "before allocating."
+                )
+            )
+
         _logger.info(
             "Applying allocation for request %s from warehouse %s with %d lines",
             self.request_id.reference,

From ce555c229a9a037400f9a79b7f447d5c8a82496e Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Mon, 25 May 2026 10:54:07 +0800
Subject: [PATCH 12/26] feat(drims): redesign inspection wizard with inline
 editing and splits (#963)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace the read-only-list + per-item popup flow with a single inline-editable list.
Condition and Action are picked directly on each row; "+ Add split" creates an
indented child row for products with mixed conditions. The parent row of a split
carries no decision — its qty mirrors the running sum of its children — and the
old InspectionItemWizard / popup view are removed entirely.
---
 spp_drims/__manifest__.py                     |   2 +
 spp_drims/models/donation.py                  |  34 +-
 spp_drims/security/ir.model.access.csv        |   3 -
 .../static/src/css/inspection_wizard.css      |  11 +
 .../static/src/js/inspection_list_renderer.js |  16 +
 spp_drims/tests/test_wizard.py                | 370 +++++++++--------
 spp_drims/wizard/inspection_wizard.py         | 384 ++++++------------
 spp_drims/wizard/inspection_wizard_views.xml  | 192 ++++-----
 8 files changed, 453 insertions(+), 559 deletions(-)
 create mode 100644 spp_drims/static/src/css/inspection_wizard.css
 create mode 100644 spp_drims/static/src/js/inspection_list_renderer.js

diff --git a/spp_drims/__manifest__.py b/spp_drims/__manifest__.py
index 246f11b7..9f2715b3 100644
--- a/spp_drims/__manifest__.py
+++ b/spp_drims/__manifest__.py
@@ -84,6 +84,8 @@
     "assets": {
         "web.assets_backend": [
             "spp_drims/static/src/js/hide_dispatch_form_create.js",
+            "spp_drims/static/src/js/inspection_list_renderer.js",
+            "spp_drims/static/src/css/inspection_wizard.css",
         ],
     },
     "application": True,
diff --git a/spp_drims/models/donation.py b/spp_drims/models/donation.py
index 8476afb4..ab069076 100644
--- a/spp_drims/models/donation.py
+++ b/spp_drims/models/donation.py
@@ -15,8 +15,6 @@
     VOCAB_DONATION_STATES,
     VOCAB_DONOR_TYPES,
     VOCAB_DRIMS_TYPES,
-    VOCAB_ITEM_CONDITIONS,
-    VOCAB_ITEM_DISPOSITIONS,
     VOCAB_RESTRICTIONS,
 )
 
@@ -362,13 +360,10 @@ def action_inspect(self):
     def action_open_inspection_wizard(self):
         """Open the inspection wizard with pre-created records.
 
-        This method creates the wizard and all line records BEFORE opening
-        the wizard form. This is the standard Odoo pattern for wizards with
-        interactive One2many fields - it ensures all records have database IDs
-        so that buttons on lines work properly.
-
-        All items default to 'New/Accept' status. Users can click 'Edit' on
-        any row to modify condition/disposition for exceptions.
+        Wizard and line records are created before the form opens so each row
+        has a real database id (needed for inline buttons like "+ Add split").
+        Lines are created with no condition / no action — the operator must
+        explicitly set both per row (OP#963).
 
         Returns:
             dict: Action to open the wizard form.
@@ -381,30 +376,12 @@ def action_open_inspection_wizard(self):
         if self.state != DONATION_STATE_RECEIVED:
             raise UserError(_("Only received donations can be inspected."))
 
-        # Get default condition (new) and disposition (accept)
-        condition_new = self.env["spp.vocabulary.code"].search(
-            [
-                ("vocabulary_id.namespace_uri", "=", VOCAB_ITEM_CONDITIONS),
-                ("code", "=", "new"),
-            ],
-            limit=1,
-        )
-        disposition_accept = self.env["spp.vocabulary.code"].search(
-            [
-                ("vocabulary_id.namespace_uri", "=", VOCAB_ITEM_DISPOSITIONS),
-                ("code", "=", "accept"),
-            ],
-            limit=1,
-        )
-
-        # Create the wizard record first
         wizard = self.env["spp.drims.inspection.wizard"].create(
             {
                 "donation_id": self.id,
             }
         )
 
-        # Create all line records with default values (New/Accept).
         # OP#964: fall back to quantity_pledged when quantity_received is 0
         # so wizard lines never open with an expected of 0 — that happens
         # when a donation line is added after the donation was marked
@@ -422,9 +399,6 @@ def action_open_inspection_wizard(self):
                     "uom_id": donation_line.uom_id.id,
                     "quantity_expected": expected_qty,
                     "quantity": expected_qty,
-                    "condition_id": condition_new.id if condition_new else False,
-                    "disposition_id": disposition_accept.id if disposition_accept else False,
-                    "is_inspected": True,  # Default to inspected (New/Accept)
                 }
             )
 
diff --git a/spp_drims/security/ir.model.access.csv b/spp_drims/security/ir.model.access.csv
index 67b59024..d657ce6e 100644
--- a/spp_drims/security/ir.model.access.csv
+++ b/spp_drims/security/ir.model.access.csv
@@ -161,6 +161,3 @@ access_spp_drims_inspection_wizard_officer,DRIMS Inspection Wizard Officer,model
 access_spp_drims_inspection_wizard_line_officer,DRIMS Inspection Wizard Line Officer,model_spp_drims_inspection_wizard_line,group_drims_officer,1,1,1,0
 access_spp_drims_inspection_wizard_warehouse_staff,DRIMS Inspection Wizard Warehouse Staff,model_spp_drims_inspection_wizard,group_drims_warehouse_worker,1,1,1,0
 access_spp_drims_inspection_wizard_line_warehouse_staff,DRIMS Inspection Wizard Line Warehouse Staff,model_spp_drims_inspection_wizard_line,group_drims_warehouse_worker,1,1,1,0
-access_spp_drims_inspection_item_wizard_manager,DRIMS Inspection Item Wizard Manager,model_spp_drims_inspection_item_wizard,group_drims_manager,1,1,1,1
-access_spp_drims_inspection_item_wizard_officer,DRIMS Inspection Item Wizard Officer,model_spp_drims_inspection_item_wizard,group_drims_officer,1,1,1,0
-access_spp_drims_inspection_item_wizard_warehouse_staff,DRIMS Inspection Item Wizard Warehouse Staff,model_spp_drims_inspection_item_wizard,group_drims_warehouse_worker,1,1,1,0
diff --git a/spp_drims/static/src/css/inspection_wizard.css b/spp_drims/static/src/css/inspection_wizard.css
new file mode 100644
index 00000000..4261c354
--- /dev/null
+++ b/spp_drims/static/src/css/inspection_wizard.css
@@ -0,0 +1,11 @@
+/* Disabled-looking "All units" badge in the inspection wizard list */
+.o_drims_btn_disabled {
+    opacity: 0.38 !important;
+    cursor: not-allowed !important;
+    pointer-events: none !important;
+}
+
+/* Indent split sub-rows so the parent/child relationship is obvious. */
+.o_drims_inspection_list .o_data_row.o_is_split td:first-child {
+    padding-left: 2rem;
+}
diff --git a/spp_drims/static/src/js/inspection_list_renderer.js b/spp_drims/static/src/js/inspection_list_renderer.js
new file mode 100644
index 00000000..8b7c9ccf
--- /dev/null
+++ b/spp_drims/static/src/js/inspection_list_renderer.js
@@ -0,0 +1,16 @@
+/** @odoo-module **/
+import {ListRenderer} from "@web/views/list/list_renderer";
+import {patch} from "@web/core/utils/patch";
+
+patch(ListRenderer.prototype, {
+    getRowClass(record) {
+        const base = super.getRowClass(record);
+        if (
+            record.resModel === "spp.drims.inspection.wizard.line" &&
+            record.data.is_split
+        ) {
+            return `${base} o_is_split`;
+        }
+        return base;
+    },
+});
diff --git a/spp_drims/tests/test_wizard.py b/spp_drims/tests/test_wizard.py
index 174736dd..9d3e41a6 100644
--- a/spp_drims/tests/test_wizard.py
+++ b/spp_drims/tests/test_wizard.py
@@ -179,9 +179,7 @@ def test_request_reject_wizard_writes_reason_and_rejects(self):
         )
         wizard.action_reject()
         self.assertEqual(request.approval_state, "rejected")
-        self.assertEqual(
-            request.rejection_reason, "Out of scope for this funding cycle"
-        )
+        self.assertEqual(request.rejection_reason, "Out of scope for this funding cycle")
 
     def test_request_reject_wizard_blank_reason_raises(self):
         """OP#966: whitespace-only reason raises UserError."""
@@ -290,208 +288,153 @@ def _open_inspection_wizard(self, donation):
         wizard_id = action["res_id"]
         return self.env["spp.drims.inspection.wizard"].browse(wizard_id)
 
-    def test_inspection_wizard_defaults_to_accepted(self):
-        """Test wizard pre-creates lines with New/Accept defaults."""
-        if not self.condition_new or not self.disposition_accept:
-            self.skipTest("Required vocabulary codes not found")
-
+    def _set_inspection(self, line, condition=None, disposition=None):
+        """Helper: write Condition + Action; ``is_inspected`` is computed."""
+        vals = {}
+        if condition is not None:
+            vals["condition_id"] = condition.id
+        if disposition is not None:
+            vals["disposition_id"] = disposition.id
+        line.write(vals)
+
+    def test_inspection_wizard_no_pre_fill(self):
+        """OP#963: wizard lines open blank — operator must set both fields."""
         donation = self._create_received_donation(quantity=1000)
         wizard = self._open_inspection_wizard(donation)
 
-        # Lines should be pre-created with defaults (New/Accept, already inspected)
         self.assertEqual(len(wizard.line_ids), 1)
-        self.assertTrue(wizard.line_ids[0].is_inspected)
-        self.assertEqual(wizard.line_ids[0].condition_id, self.condition_new)
-        self.assertEqual(wizard.line_ids[0].disposition_id, self.disposition_accept)
-        self.assertTrue(wizard.is_valid)
-
-        # Can confirm immediately without any additional action
-        wizard.action_confirm_inspection()
-        self.assertEqual(donation.state, "inspected")
-        self.assertEqual(donation.line_ids[0].condition_id, self.condition_new)
-
-    def test_inspection_wizard_edit_item(self):
-        """Test Edit button opens popup wizard for individual item."""
-        donation = self._create_received_donation(quantity=500)
-        wizard = self._open_inspection_wizard(donation)
-
-        # Click Edit on first line
         line = wizard.line_ids[0]
-        action = line.action_edit_item()
-
-        self.assertEqual(action["res_model"], "spp.drims.inspection.item.wizard")
-        self.assertEqual(action["target"], "new")
-        self.assertEqual(action["context"]["default_quantity"], 500)
-        self.assertEqual(action["context"]["default_quantity_expected"], 500)
+        self.assertFalse(line.condition_id)
+        self.assertFalse(line.disposition_id)
+        self.assertFalse(line.is_inspected)
+        with self.assertRaises(UserError):
+            wizard.action_confirm_inspection()
 
-    def test_inspection_item_wizard_save(self):
-        """Test item popup Save action updates the main wizard line."""
-        if not self.condition_damaged or not self.disposition_return:
+    def test_is_inspected_tracks_both_fields(self):
+        """OP#963: is_inspected is True only when both Condition and Action are set."""
+        if not self.condition_new or not self.disposition_accept:
             self.skipTest("Required vocabulary codes not found")
 
         donation = self._create_received_donation(quantity=100)
         wizard = self._open_inspection_wizard(donation)
-
         line = wizard.line_ids[0]
-        # Line starts inspected with defaults, we change it to damaged
-        self.assertTrue(line.is_inspected)
 
-        # Create item wizard and save with different condition
-        item_wizard = self.env["spp.drims.inspection.item.wizard"].create(
-            {
-                "inspection_line_id": line.id,
-                "wizard_id": wizard.id,
-                "product_id": self.product.id,
-                "uom_id": self.product.uom_id.id,
-                "quantity_expected": 100,
-                "quantity": 100,
-                "condition_id": self.condition_damaged.id,
-                "disposition_id": self.disposition_return.id,
-                "notes": "All items damaged",
-            }
-        )
-        item_wizard.action_save()
+        line.condition_id = self.condition_new
+        self.assertFalse(line.is_inspected, "needs both fields")
 
-        # Line should be updated with new condition
+        line.disposition_id = self.disposition_accept
         self.assertTrue(line.is_inspected)
-        self.assertEqual(line.condition_id, self.condition_damaged)
-        self.assertEqual(line.disposition_id, self.disposition_return)
-        self.assertEqual(line.notes, "All items damaged")
 
-    def test_inspection_item_wizard_split(self):
-        """Test Save & Add Split creates a new line for remaining quantity."""
+    def test_can_mark_all_units_toggles_with_both_fields(self):
+        """OP#963: badge enable/disable mirrors condition+action presence."""
         if not self.condition_new or not self.disposition_accept:
             self.skipTest("Required vocabulary codes not found")
 
-        donation = self._create_received_donation(quantity=1000)
+        donation = self._create_received_donation(quantity=100)
         wizard = self._open_inspection_wizard(donation)
-
         line = wizard.line_ids[0]
-        self.assertEqual(len(wizard.line_ids), 1)
 
-        # Create item wizard with reduced quantity and split
-        item_wizard = self.env["spp.drims.inspection.item.wizard"].create(
-            {
-                "inspection_line_id": line.id,
-                "wizard_id": wizard.id,
-                "product_id": self.product.id,
-                "uom_id": self.product.uom_id.id,
-                "quantity_expected": 1000,
-                "quantity": 800,  # Only 800, remaining 200
-                "condition_id": self.condition_new.id,
-                "disposition_id": self.disposition_accept.id,
-            }
-        )
+        self.assertFalse(line.can_mark_all_units)
+        line.condition_id = self.condition_new
+        self.assertFalse(line.can_mark_all_units)
+        line.disposition_id = self.disposition_accept
+        self.assertTrue(line.can_mark_all_units)
 
-        # Should show remaining qty
-        self.assertEqual(item_wizard.remaining_qty, 200)
-        self.assertTrue(item_wizard.show_split_warning)
+    def test_inspection_confirm_full_acceptance(self):
+        """OP#963: filling Condition + Action on every row makes the wizard
+        valid and confirming writes the chosen values to the donation lines.
+        """
+        if not self.condition_new or not self.disposition_accept:
+            self.skipTest("Required vocabulary codes not found")
 
-        # Save and split
-        action = item_wizard.action_save_and_split()
+        donation = self._create_received_donation(quantity=1000)
+        wizard = self._open_inspection_wizard(donation)
+        line = wizard.line_ids[0]
 
-        # Should have 2 lines now
-        self.assertEqual(len(wizard.line_ids), 2)
-        # First line is inspected with 800
-        self.assertTrue(line.is_inspected)
-        self.assertEqual(line.quantity, 800)
-        # New line has remaining 200, not yet inspected
-        new_line = wizard.line_ids.filtered(lambda ln: ln.id != line.id)
-        self.assertEqual(new_line.quantity, 200)
-        self.assertFalse(new_line.is_inspected)
+        self._set_inspection(line, self.condition_new, self.disposition_accept)
 
-        # Action should open popup for new line
-        self.assertEqual(action["res_model"], "spp.drims.inspection.item.wizard")
+        wizard.action_confirm_inspection()
+        self.assertEqual(donation.state, "inspected")
+        self.assertEqual(donation.line_ids[0].condition_id, self.condition_new)
+        self.assertEqual(donation.line_ids[0].disposition_id, self.disposition_accept)
 
     def test_inspection_wizard_validation_uninspected(self):
-        """Test validation fails if items are not inspected."""
+        """Confirm refuses to advance when any row is missing its decision."""
         donation = self._create_received_donation(quantity=100)
         wizard = self._open_inspection_wizard(donation)
 
-        # Lines start as inspected, manually mark as not inspected
-        wizard.line_ids[0].write({"is_inspected": False})
-
-        # Not inspected
-        self.assertFalse(wizard.is_valid)
-
-        # Should fail confirmation
         with self.assertRaises(UserError) as cm:
             wizard.action_confirm_inspection()
         self.assertIn("inspect all items", str(cm.exception))
 
     def test_inspection_wizard_single_line_quantity_overrides_received(self):
         """OP#964: a single inspection line is treated as the user reporting
-        the final received quantity. Confirming with a different quantity
-        than the wizard's expected hint should succeed and update
-        ``quantity_received`` on the donation line accordingly.
+        the final received quantity.
         """
         if not self.condition_new or not self.disposition_accept:
             self.skipTest("Required vocabulary codes not found")
 
         donation = self._create_received_donation(quantity=1000)
         wizard = self._open_inspection_wizard(donation)
+        line = wizard.line_ids[0]
+        self._set_inspection(line, self.condition_new, self.disposition_accept)
+        line.quantity = 800
 
-        wizard.line_ids[0].write({"quantity": 800})
-
-        self.assertTrue(wizard.is_valid, "single-line wizard should always be valid")
         wizard.action_confirm_inspection()
         self.assertEqual(donation.state, "inspected")
         self.assertEqual(donation.line_ids[0].quantity_received, 800)
 
     def test_inspection_wizard_split_mismatch_still_raises(self):
-        """OP#964: when the user splits a product across multiple lines,
-        the totals must still sum to the expected quantity — that
-        safety net is preserved.
-        """
+        """OP#964: split quantities must still sum to expected."""
         if not self.condition_new or not self.condition_damaged:
             self.skipTest("Required vocabulary codes not found")
         if not self.disposition_accept or not self.disposition_return:
             self.skipTest("Required vocabulary codes not found")
 
         donation = self._create_received_donation(quantity=1000)
-        original_line = donation.line_ids[0]
         wizard = self._open_inspection_wizard(donation)
-
-        # Two lines that sum to 950 ≠ 1000 received → should raise
-        wizard.line_ids[0].write({"quantity": 800})
-        self.env["spp.drims.inspection.wizard.line"].create(
+        parent = wizard.line_ids[0]
+
+        # Create a split via the real button so parent/child wiring is correct.
+        parent.action_add_split()
+        children = wizard.line_ids.filtered("is_split")
+        self.assertEqual(len(children), 1)
+        child_a = children[0]
+
+        # Deliberately make the totals not match expected.
+        child_a.quantity = 800
+        InspectionLine = self.env["spp.drims.inspection.wizard.line"]
+        child_b = InspectionLine.create(
             {
                 "wizard_id": wizard.id,
-                "donation_line_id": original_line.id,
-                "product_id": self.product.id,
-                "uom_id": self.product.uom_id.id,
-                "quantity_expected": 1000,
+                "donation_line_id": parent.donation_line_id.id,
+                "product_id": parent.product_id.id,
+                "uom_id": parent.uom_id.id,
+                "quantity_expected": parent.quantity_expected,
                 "quantity": 150,  # 800 + 150 = 950 ≠ 1000
-                "condition_id": self.condition_damaged.id,
-                "disposition_id": self.disposition_return.id,
-                "is_inspected": True,
+                "parent_line_id": parent.id,
             }
         )
+        self._set_inspection(child_a, self.condition_new, self.disposition_accept)
+        self._set_inspection(child_b, self.condition_damaged, self.disposition_return)
 
-        self.assertFalse(wizard.is_valid)
         with self.assertRaises(UserError) as cm:
             wizard.action_confirm_inspection()
         self.assertIn("Splits must sum", str(cm.exception))
 
     def test_inspection_wizard_quantity_received_zero_uses_pledged(self):
-        """OP#964: when a donation line has quantity_received = 0 (e.g., it
-        was added after action_mark_received ran, or pledged was 0), the
-        wizard should fall back to quantity_pledged so the user can
-        still finalize inspection. Reproduces the bug from the original
-        screenshot.
-        """
+        """OP#964: fall back to quantity_pledged when quantity_received is 0."""
         if not self.condition_new or not self.disposition_accept:
             self.skipTest("Required vocabulary codes not found")
 
         donation = self._create_received_donation(quantity=500)
-        # Simulate the bug: line added with pledged=500 but received=0
-        # (because action_mark_received already ran for the original lines).
         donation.line_ids[0].quantity_received = 0
 
         wizard = self._open_inspection_wizard(donation)
-        # Wizard line should pick up pledged (500), not received (0)
-        self.assertEqual(wizard.line_ids[0].quantity_expected, 500)
-        self.assertTrue(wizard.is_valid)
+        line = wizard.line_ids[0]
+        self.assertEqual(line.quantity_expected, 500)
+
+        self._set_inspection(line, self.condition_new, self.disposition_accept)
 
         wizard.action_confirm_inspection()
         self.assertEqual(donation.state, "inspected")
@@ -499,7 +442,6 @@ def test_inspection_wizard_quantity_received_zero_uses_pledged(self):
 
     def test_inspection_wizard_only_received_donations(self):
         """Test that only received donations can be inspected."""
-        # Create a donation without marking as received
         donation = self.env["spp.drims.donation"].create(
             {
                 "incident_id": self.incident.id,
@@ -517,73 +459,157 @@ def test_inspection_wizard_only_received_donations(self):
                 ],
             }
         )
-
-        # Should raise error when trying to open inspection wizard
         with self.assertRaises(UserError):
             donation.action_open_inspection_wizard()
 
-    def test_inspection_wizard_condition_display(self):
-        """Test condition_display computed field."""
-        if not self.condition_new or not self.disposition_accept:
-            self.skipTest("Required vocabulary codes not found")
+    def test_add_split_creates_child_line(self):
+        """OP#963: action_add_split creates a child with parent_line_id set
+        and resets the parent qty to mirror the children."""
+        donation = self._create_received_donation(quantity=1000)
+        wizard = self._open_inspection_wizard(donation)
+        parent = wizard.line_ids[0]
 
-        donation = self._create_received_donation(quantity=100)
+        parent.action_add_split()
+        self.assertEqual(len(wizard.line_ids), 2)
+
+        children = wizard.line_ids.filtered("is_split")
+        self.assertEqual(len(children), 1)
+        child = children[0]
+        self.assertEqual(child.parent_line_id, parent)
+        # First child gets the full remaining (= expected on first split).
+        self.assertEqual(child.quantity, 1000)
+        # Parent qty mirrors the child running total.
+        self.assertEqual(parent.quantity, 1000)
+        self.assertTrue(parent.has_splits)
+
+    def test_add_split_remaining_quantity(self):
+        """OP#963: subsequent splits get expected - already-allocated."""
+        donation = self._create_received_donation(quantity=1000)
         wizard = self._open_inspection_wizard(donation)
+        parent = wizard.line_ids[0]
 
-        line = wizard.line_ids[0]
+        parent.action_add_split()
+        children = wizard.line_ids.filtered("is_split")
+        children[0].quantity = 700  # leaves 300 remaining
+
+        parent.action_add_split()
+        children = wizard.line_ids.filtered("is_split")
+        self.assertEqual(len(children), 2)
+        new_child = children.sorted(key=lambda line: line.id)[-1]
+        self.assertEqual(new_child.quantity, 300)
 
-        # Starts inspected with defaults
-        self.assertIn(self.condition_new.display, line.condition_display)
-        self.assertIn(self.disposition_accept.display, line.condition_display)
+    def test_add_split_blocks_when_nothing_remaining(self):
+        """OP#963: splitting again with no remaining qty raises."""
+        donation = self._create_received_donation(quantity=1000)
+        wizard = self._open_inspection_wizard(donation)
+        parent = wizard.line_ids[0]
 
-        # After marking as not inspected
-        line.write({"is_inspected": False})
-        self.assertEqual(line.condition_display, "Not inspected")
+        parent.action_add_split()
+        # The single child already covers the full expected qty.
+        with self.assertRaises(UserError) as cm:
+            parent.action_add_split()
+        self.assertIn("No remaining quantity to split", str(cm.exception))
 
-    def test_inspection_confirms_and_creates_splits(self):
-        """Test full flow: inspect with splits and confirm."""
+    def test_remove_split_resets_parent_qty(self):
+        """OP#963: removing the last child resets parent.quantity to expected."""
+        donation = self._create_received_donation(quantity=1000)
+        wizard = self._open_inspection_wizard(donation)
+        parent = wizard.line_ids[0]
+
+        parent.action_add_split()
+        children = wizard.line_ids.filtered("is_split")
+        self.assertEqual(len(children), 1)
+        children[0].action_remove_split()
+
+        # Parent is the only line left, back to expected qty.
+        self.assertEqual(len(wizard.line_ids), 1)
+        self.assertEqual(parent.quantity, 1000)
+        self.assertFalse(parent.has_splits)
+
+    def test_has_splits_true_when_child_exists(self):
+        """OP#963: ``has_splits`` flips True on the parent once a child exists."""
+        donation = self._create_received_donation(quantity=500)
+        wizard = self._open_inspection_wizard(donation)
+        parent = wizard.line_ids[0]
+
+        self.assertFalse(parent.has_splits)
+        parent.action_add_split()
+        self.assertTrue(parent.has_splits)
+
+    def test_confirm_ignores_parent_row_when_splits_exist(self):
+        """OP#963: the parent row carries no condition/action — Confirm must
+        still gate on the children, not on the parent.
+        """
         if not self.condition_new or not self.condition_damaged:
             self.skipTest("Required vocabulary codes not found")
         if not self.disposition_accept or not self.disposition_return:
             self.skipTest("Required vocabulary codes not found")
 
         donation = self._create_received_donation(quantity=1000)
-        original_line = donation.line_ids[0]
-
         wizard = self._open_inspection_wizard(donation)
+        parent = wizard.line_ids[0]
 
-        # Change first line: 800 good (already defaults to New/Accept)
-        wizard.line_ids[0].write(
+        parent.action_add_split()
+        children = wizard.line_ids.filtered("is_split")
+        child_a = children[0]
+        child_a.quantity = 700
+
+        InspectionLine = self.env["spp.drims.inspection.wizard.line"]
+        child_b = InspectionLine.create(
             {
-                "quantity": 800,
+                "wizard_id": wizard.id,
+                "donation_line_id": parent.donation_line_id.id,
+                "product_id": parent.product_id.id,
+                "uom_id": parent.uom_id.id,
+                "quantity_expected": parent.quantity_expected,
+                "quantity": 300,
+                "parent_line_id": parent.id,
             }
         )
 
-        # Add second line: 200 damaged
-        self.env["spp.drims.inspection.wizard.line"].create(
+        # Parent has no condition/action; children do — Confirm must succeed.
+        self._set_inspection(child_a, self.condition_new, self.disposition_accept)
+        self._set_inspection(child_b, self.condition_damaged, self.disposition_return)
+        self.assertFalse(parent.is_inspected)
+        wizard.action_confirm_inspection()
+        self.assertEqual(donation.state, "inspected")
+
+    def test_inspection_confirms_and_creates_splits(self):
+        """OP#963: full split flow via action_add_split produces both donation
+        lines downstream of confirm.
+        """
+        if not self.condition_new or not self.condition_damaged:
+            self.skipTest("Required vocabulary codes not found")
+        if not self.disposition_accept or not self.disposition_return:
+            self.skipTest("Required vocabulary codes not found")
+
+        donation = self._create_received_donation(quantity=1000)
+        wizard = self._open_inspection_wizard(donation)
+        parent = wizard.line_ids[0]
+
+        parent.action_add_split()
+        children = wizard.line_ids.filtered("is_split")
+        child_a = children[0]
+        child_a.quantity = 800
+
+        InspectionLine = self.env["spp.drims.inspection.wizard.line"]
+        child_b = InspectionLine.create(
             {
                 "wizard_id": wizard.id,
-                "donation_line_id": original_line.id,
-                "product_id": self.product.id,
-                "uom_id": self.product.uom_id.id,
-                "quantity_expected": 1000,
+                "donation_line_id": parent.donation_line_id.id,
+                "product_id": parent.product_id.id,
+                "uom_id": parent.uom_id.id,
+                "quantity_expected": parent.quantity_expected,
                 "quantity": 200,
-                "condition_id": self.condition_damaged.id,
-                "disposition_id": self.disposition_return.id,
-                "is_inspected": True,
+                "parent_line_id": parent.id,
             }
         )
+        self._set_inspection(child_a, self.condition_new, self.disposition_accept)
+        self._set_inspection(child_b, self.condition_damaged, self.disposition_return)
 
-        # Validation should pass
-        self.assertTrue(wizard.is_valid)
-
-        # Confirm
         wizard.action_confirm_inspection()
-
-        # Donation should be inspected
         self.assertEqual(donation.state, "inspected")
 
-        # Should have 2 lines now
         self.assertEqual(len(donation.line_ids), 2)
         lines = donation.line_ids.sorted("quantity_received", reverse=True)
         self.assertEqual(lines[0].quantity_received, 800)
@@ -592,7 +618,7 @@ def test_inspection_confirms_and_creates_splits(self):
         self.assertEqual(lines[1].condition_id, self.condition_damaged)
 
     def test_inspection_notes_appended(self):
-        """Test that inspection notes are appended to donation notes."""
+        """Inspection notes are appended to donation notes."""
         if not self.condition_new or not self.disposition_accept:
             self.skipTest("Required vocabulary codes not found")
 
@@ -600,7 +626,7 @@ def test_inspection_notes_appended(self):
         donation.notes = "Original notes"
 
         wizard = self._open_inspection_wizard(donation)
-        # Lines already default to inspected/accepted
+        self._set_inspection(wizard.line_ids[0], self.condition_new, self.disposition_accept)
         wizard.notes = "Inspection completed successfully"
 
         wizard.action_confirm_inspection()
diff --git a/spp_drims/wizard/inspection_wizard.py b/spp_drims/wizard/inspection_wizard.py
index 468ec063..d579682f 100644
--- a/spp_drims/wizard/inspection_wizard.py
+++ b/spp_drims/wizard/inspection_wizard.py
@@ -2,11 +2,11 @@
 """
 DRIMS Donation Inspection Wizard (DON-002)
 
-Batch Accept with Exceptions design:
-- Main wizard shows readonly list of items
-- "Accept All as New" button for 90% of cases (one-click)
-- "Edit" button per row opens popup to modify individual items
-- Supports splitting items with mixed conditions
+Inline-editable single-screen flow:
+- Operator sets Condition and Action directly on each row.
+- "+ Add split" creates a child row under the parent product for mixed conditions.
+- Parent qty mirrors the running sum of child rows; the parent itself carries no
+  condition / action — those live on the children.
 """
 
 import logging
@@ -25,7 +25,7 @@
 
 
 class InspectionWizard(models.TransientModel):
-    """Main inspection wizard - shows items and allows batch accept or per-item edit."""
+    """Main inspection wizard - inline editing on every row."""
 
     _name = "spp.drims.inspection.wizard"
     _description = "Donation Inspection Wizard"
@@ -49,90 +49,6 @@ class InspectionWizard(models.TransientModel):
         string="Inspection Notes",
         help="General notes about the inspection",
     )
-    is_valid = fields.Boolean(
-        string="Is Valid",
-        compute="_compute_is_valid",
-    )
-
-    @api.depends("line_ids.is_inspected", "line_ids.quantity", "line_ids.quantity_expected")
-    def _compute_is_valid(self):
-        """Check if all items are inspected and quantities match.
-
-        OP#964: the expected-equals-total check only applies when the
-        user has split a product into multiple inspection lines. A single
-        line per product is treated as the user reporting the final
-        received quantity (which may differ from the pre-inspection
-        ``quantity_received`` hint), so we don't block them on equality.
-        """
-        for wizard in self:
-            if not wizard.line_ids:
-                wizard.is_valid = False
-                continue
-
-            # Check all lines are inspected
-            all_inspected = all(line.is_inspected for line in wizard.line_ids)
-            if not all_inspected:
-                wizard.is_valid = False
-                continue
-
-            # Check split totals match per product (only when actually split)
-            products = {}
-            for line in wizard.line_ids:
-                product_id = line.product_id.id
-                if product_id not in products:
-                    products[product_id] = {
-                        "expected": line.quantity_expected,
-                        "total": 0.0,
-                        "count": 0,
-                    }
-                products[product_id]["total"] += line.quantity
-                products[product_id]["count"] += 1
-
-            wizard.is_valid = all(
-                data["count"] <= 1 or abs(data["expected"] - data["total"]) < 0.001 for data in products.values()
-            )
-
-    def action_accept_all(self):
-        """Accept all items as New/Accept - one click for simple cases."""
-        self.ensure_one()
-
-        # Get default condition (new) and disposition (accept)
-        condition_new = self.env["spp.vocabulary.code"].search(
-            [
-                ("vocabulary_id.namespace_uri", "=", VOCAB_ITEM_CONDITIONS),
-                ("code", "=", "new"),
-            ],
-            limit=1,
-        )
-        disposition_accept = self.env["spp.vocabulary.code"].search(
-            [
-                ("vocabulary_id.namespace_uri", "=", VOCAB_ITEM_DISPOSITIONS),
-                ("code", "=", "accept"),
-            ],
-            limit=1,
-        )
-
-        if not condition_new or not disposition_accept:
-            raise UserError(_("Vocabulary codes for 'new' condition or 'accept' disposition not found."))
-
-        # Mark all lines as inspected with default values
-        for line in self.line_ids:
-            line.write(
-                {
-                    "condition_id": condition_new.id,
-                    "disposition_id": disposition_accept.id,
-                    "is_inspected": True,
-                }
-            )
-
-        # Return to same wizard (refreshed)
-        return {
-            "type": "ir.actions.act_window",
-            "res_model": self._name,
-            "res_id": self.id,
-            "view_mode": "form",
-            "target": "new",
-        }
 
     def action_confirm_inspection(self):
         """Confirm inspection and create/update donation lines."""
@@ -141,17 +57,23 @@ def action_confirm_inspection(self):
         if not self.line_ids:
             raise UserError(_("No items to inspect."))
 
-        # Validate all items are inspected
-        uninspected = self.line_ids.filtered(lambda line: not line.is_inspected)
+        # Parent rows carry no condition/action; only validate the rows
+        # the operator actually filled in.
+        lines_to_check = self.line_ids.filtered(lambda line: not line.has_splits)
+        uninspected = lines_to_check.filtered(lambda line: not line.is_inspected)
         if uninspected:
             raise UserError(
                 _("Please inspect all items first. Uninspected: %s")
                 % ", ".join(uninspected.mapped("product_id.display_name"))
             )
 
-        # Validate quantities per product
+        # Group lines per product for the equality safety net + downstream writes.
+        # Parent rows are skipped here because their qty mirrors their children's
+        # running total — including them would double-count.
         products = {}
         for line in self.line_ids:
+            if line.has_splits:
+                continue
             product_id = line.product_id.id
             if product_id not in products:
                 products[product_id] = {
@@ -192,12 +114,10 @@ def action_confirm_inspection(self):
             len(self.line_ids),
         )
 
-        # Process each product group
         DonationLine = self.env["spp.drims.donation.line"]
         for _product_id, data in products.items():
             lines = data["lines"]
 
-            # First line updates the original donation line
             first_line = lines[0]
             original_donation_line = first_line.donation_line_id
             original_donation_line.write(
@@ -209,7 +129,6 @@ def action_confirm_inspection(self):
                 }
             )
 
-            # Additional lines create new donation lines (splits)
             for line in lines[1:]:
                 if line.quantity <= 0:
                     continue
@@ -229,7 +148,6 @@ def action_confirm_inspection(self):
                     }
                 )
 
-        # Transition donation to inspected state
         inspected_state = self.env["spp.vocabulary.code"].search(
             [
                 ("vocabulary_id.namespace_uri", "=", VOCAB_DONATION_STATES),
@@ -249,7 +167,7 @@ def action_confirm_inspection(self):
 
 
 class InspectionWizardLine(models.TransientModel):
-    """Line in the inspection wizard - one per item/condition combination."""
+    """Line in the inspection wizard."""
 
     _name = "spp.drims.inspection.wizard.line"
     _description = "Inspection Wizard Line"
@@ -265,6 +183,11 @@ class InspectionWizardLine(models.TransientModel):
         string="Donation Line",
         required=True,
     )
+    parent_line_id = fields.Many2one(
+        "spp.drims.inspection.wizard.line",
+        string="Parent Line",
+        ondelete="cascade",
+    )
     product_id = fields.Many2one(
         "product.product",
         string="Product",
@@ -298,141 +221,111 @@ class InspectionWizardLine(models.TransientModel):
     )
     is_inspected = fields.Boolean(
         string="Inspected",
-        default=False,
-        help="Whether this item has been inspected",
+        compute="_compute_is_inspected",
+        help="True once both Condition and Action are filled.",
+    )
+    is_split = fields.Boolean(
+        string="Is Split Line",
+        compute="_compute_split_flags",
+    )
+    has_splits = fields.Boolean(
+        string="Has Split Lines",
+        compute="_compute_split_flags",
     )
-    condition_display = fields.Char(
-        string="Status",
-        compute="_compute_condition_display",
+    can_mark_all_units = fields.Boolean(
+        string="Can Mark All Units",
+        compute="_compute_can_mark_all_units",
     )
 
-    @api.depends("is_inspected", "condition_id", "disposition_id")
-    def _compute_condition_display(self):
-        """Compute display string for condition/disposition."""
+    @api.depends("parent_line_id", "wizard_id.line_ids", "wizard_id.line_ids.parent_line_id")
+    def _compute_split_flags(self):
+        for line in self:
+            line.is_split = bool(line.parent_line_id)
+            line.has_splits = any(sibling.parent_line_id == line for sibling in line.wizard_id.line_ids)
+
+    @api.depends("condition_id", "disposition_id")
+    def _compute_can_mark_all_units(self):
+        for line in self:
+            line.can_mark_all_units = bool(line.condition_id and line.disposition_id)
+
+    @api.depends("condition_id", "disposition_id")
+    def _compute_is_inspected(self):
+        """A row is inspected once both Condition and Action are filled."""
         for line in self:
-            if not line.is_inspected:
-                line.condition_display = _("Not inspected")
-            elif line.condition_id and line.disposition_id:
-                line.condition_display = f"{line.condition_id.display} / {line.disposition_id.display}"
-            else:
-                line.condition_display = _("Incomplete")
-
-    def action_edit_item(self):
-        """Open popup to edit this item."""
+            line.is_inspected = bool(line.condition_id and line.disposition_id)
+
+    @api.onchange("quantity")
+    def _onchange_quantity_update_parent(self):
+        """Keep the parent row qty in sync with the running sum of its children."""
+        if not self.parent_line_id:
+            return
+        siblings = self.wizard_id.line_ids.filtered(
+            lambda line: line.parent_line_id == self.parent_line_id and line != self
+        )
+        total = sum(siblings.mapped("quantity")) + (self.quantity or 0.0)
+        self.parent_line_id.quantity = total
+
+    def action_all_units(self):
+        """No-op handler for the visual "All units" badge in the list view.
+
+        The button is a visual indicator that Condition and Action are set —
+        clicking it just refreshes the wizard so any pending onchange values
+        are persisted. ``is_inspected`` is already flipped automatically via
+        ``_onchange_mark_inspected``.
+        """
         self.ensure_one()
         return {
             "type": "ir.actions.act_window",
-            "name": _("Inspect Item: %s") % self.product_id.display_name,
-            "res_model": "spp.drims.inspection.item.wizard",
+            "res_model": "spp.drims.inspection.wizard",
+            "res_id": self.wizard_id.id,
             "view_mode": "form",
             "target": "new",
-            "context": {
-                "default_inspection_line_id": self.id,
-                "default_wizard_id": self.wizard_id.id,
-                "default_product_id": self.product_id.id,
-                "default_uom_id": self.uom_id.id,
-                "default_quantity_expected": self.quantity_expected,
-                "default_quantity": self.quantity,
-                "default_condition_id": self.condition_id.id if self.condition_id else False,
-                "default_disposition_id": self.disposition_id.id if self.disposition_id else False,
-                "default_notes": self.notes or "",
-            },
         }
 
-
-class InspectionItemWizard(models.TransientModel):
-    """Popup wizard to edit a single inspection item."""
-
-    _name = "spp.drims.inspection.item.wizard"
-    _description = "Inspect Item Wizard"
-
-    inspection_line_id = fields.Many2one(
-        "spp.drims.inspection.wizard.line",
-        string="Inspection Line",
-        required=True,
-    )
-    wizard_id = fields.Many2one(
-        "spp.drims.inspection.wizard",
-        string="Main Wizard",
-        required=True,
-    )
-    product_id = fields.Many2one(
-        "product.product",
-        string="Product",
-        readonly=True,
-    )
-    uom_id = fields.Many2one(
-        "uom.uom",
-        string="Unit",
-        readonly=True,
-    )
-    quantity_expected = fields.Float(
-        string="Expected Quantity",
-        readonly=True,
-    )
-    quantity = fields.Float(
-        string="Quantity",
-        required=True,
-        help="Quantity in this condition. Reduce if splitting.",
-    )
-    condition_id = fields.Many2one(
-        "spp.vocabulary.code",
-        string="Condition",
-        required=True,
-        domain=f"[('vocabulary_id.namespace_uri', '=', '{VOCAB_ITEM_CONDITIONS}')]",
-    )
-    disposition_id = fields.Many2one(
-        "spp.vocabulary.code",
-        string="Disposition",
-        required=True,
-        domain=f"[('vocabulary_id.namespace_uri', '=', '{VOCAB_ITEM_DISPOSITIONS}')]",
-    )
-    notes = fields.Char(
-        string="Notes",
-        help="Notes about this item (e.g., 'water damaged', 'expired batch')",
-    )
-    remaining_qty = fields.Float(
-        string="Remaining to Allocate",
-        compute="_compute_remaining_qty",
-        help="Quantity not yet allocated (for splitting)",
-    )
-    show_split_warning = fields.Boolean(
-        compute="_compute_remaining_qty",
-    )
-
-    @api.depends("quantity", "quantity_expected")
-    def _compute_remaining_qty(self):
-        """Compute remaining quantity for this product."""
-        InspectionLine = self.env["spp.drims.inspection.wizard.line"]
-        for item in self:
-            # Sum all lines for this product in the main wizard
-            other_lines = InspectionLine.browse()
-            for line in item.wizard_id.line_ids:
-                if line.product_id == item.product_id and line.id != item.inspection_line_id.id:
-                    other_lines |= line
-            other_total = sum(other_lines.mapped("quantity"))
-            item.remaining_qty = item.quantity_expected - item.quantity - other_total
-            item.show_split_warning = item.remaining_qty > 0.001
-
-    def action_save(self):
-        """Save changes and return to main wizard."""
+    def action_add_split(self):
+        """Create a new split child line under this row and reopen the wizard."""
         self.ensure_one()
 
-        if self.quantity < 0:
-            raise UserError(_("Quantity cannot be negative."))
-
-        # Update the inspection line
-        self.inspection_line_id.write(
+        # If the operator clicks "+ Add split" on a line that is itself a child,
+        # treat the parent as the root for the new split.
+        root_line = self.parent_line_id or self
+
+        # Sum only the existing children — never the parent. On the very first
+        # split the parent's qty still mirrors the full expected qty, so adding
+        # it would double-count and leave 0 remaining.
+        child_lines = self.wizard_id.line_ids.filtered(lambda line: line.parent_line_id == root_line)
+        total_in_splits = sum(child_lines.mapped("quantity"))
+        remaining = root_line.quantity_expected - total_in_splits
+
+        if remaining <= 0:
+            raise UserError(_("No remaining quantity to split. Reduce one of the existing split quantities first."))
+
+        # First split: reset the parent qty to 0 (it will be kept in sync as
+        # the running sum of children) and clear any Condition / Action the
+        # operator may have set before deciding to split — the parent row
+        # carries no decision; the children do.
+        if not child_lines:
+            root_line.quantity = 0
+            root_line.condition_id = False
+            root_line.disposition_id = False
+
+        self.env["spp.drims.inspection.wizard.line"].create(
             {
-                "quantity": self.quantity,
-                "condition_id": self.condition_id.id,
-                "disposition_id": self.disposition_id.id,
-                "notes": self.notes,
-                "is_inspected": True,
+                "wizard_id": self.wizard_id.id,
+                "donation_line_id": root_line.donation_line_id.id,
+                "product_id": root_line.product_id.id,
+                "uom_id": root_line.uom_id.id,
+                "quantity_expected": root_line.quantity_expected,
+                "quantity": remaining,
+                "parent_line_id": root_line.id,
             }
         )
 
-        # Return to main wizard
+        # Keep the parent row's stored qty in sync after creating the child.
+        # Without this the parent row keeps the value it had before the child
+        # was added (0 on the first split, or the previous running total).
+        self._refresh_parent_quantity(root_line)
+
         return {
             "type": "ir.actions.act_window",
             "res_model": "spp.drims.inspection.wizard",
@@ -441,39 +334,32 @@ def action_save(self):
             "target": "new",
         }
 
-    def action_save_and_split(self):
-        """Save changes and create a new line for remaining quantity."""
+    def action_remove_split(self):
+        """Remove a split child line and refresh the wizard."""
         self.ensure_one()
+        if not self.is_split:
+            raise UserError(_("Only split lines can be removed this way."))
+        wizard_id = self.wizard_id.id
+        root_line = self.parent_line_id
+        self.unlink()
+
+        remaining_children = root_line.wizard_id.line_ids.filtered(lambda line: line.parent_line_id == root_line)
+        if not remaining_children:
+            # Reset parent back to the full expected quantity.
+            root_line.quantity = root_line.quantity_expected
+        else:
+            self._refresh_parent_quantity(root_line)
 
-        if self.quantity < 0:
-            raise UserError(_("Quantity cannot be negative."))
-
-        if self.remaining_qty <= 0:
-            raise UserError(_("No remaining quantity to split. Adjust the quantity first."))
-
-        # Update current line
-        self.inspection_line_id.write(
-            {
-                "quantity": self.quantity,
-                "condition_id": self.condition_id.id,
-                "disposition_id": self.disposition_id.id,
-                "notes": self.notes,
-                "is_inspected": True,
-            }
-        )
-
-        # Create new line for remaining quantity
-        new_line = self.env["spp.drims.inspection.wizard.line"].create(
-            {
-                "wizard_id": self.wizard_id.id,
-                "donation_line_id": self.inspection_line_id.donation_line_id.id,
-                "product_id": self.product_id.id,
-                "uom_id": self.uom_id.id,
-                "quantity_expected": self.quantity_expected,
-                "quantity": self.remaining_qty,
-                "is_inspected": False,  # New split needs to be inspected
-            }
-        )
+        return {
+            "type": "ir.actions.act_window",
+            "res_model": "spp.drims.inspection.wizard",
+            "res_id": wizard_id,
+            "view_mode": "form",
+            "target": "new",
+        }
 
-        # Open edit popup for the new split
-        return new_line.action_edit_item()
+    @staticmethod
+    def _refresh_parent_quantity(parent):
+        """Recompute the parent qty as the sum of its child rows."""
+        children = parent.wizard_id.line_ids.filtered(lambda line: line.parent_line_id == parent)
+        parent.quantity = sum(children.mapped("quantity"))
diff --git a/spp_drims/wizard/inspection_wizard_views.xml b/spp_drims/wizard/inspection_wizard_views.xml
index 553f18db..424a9a2e 100644
--- a/spp_drims/wizard/inspection_wizard_views.xml
+++ b/spp_drims/wizard/inspection_wizard_views.xml
@@ -16,44 +16,105 @@
                     </div>
 
                     <field name="donation_id" invisible="1" />
-                    <field name="is_valid" invisible="1" />
 
-                    <!-- Info Banner -->
-                    <div class="alert alert-info" role="alert" invisible="not is_valid">
-                        All items are set to <strong>New / Accept</strong>.
-                        Click <strong>Confirm Inspection</strong> to proceed, or <strong
-                    >Edit</strong> any row to change.
-                    </div>
-                    <div class="alert alert-warning" role="alert" invisible="is_valid">
-                        Some items need attention. Please review and edit as needed.
+                    <div class="alert alert-info" role="alert">
+                        Set <strong>Condition</strong> and <strong
+                    >Action</strong> on each row, then click <strong
+                    >Confirm Inspection</strong>. Use <strong
+                    >+ Add split</strong> when a single product needs to be split
+                        across multiple conditions.
                     </div>
 
-                    <!-- Items List (readonly) -->
+                    <!-- Items List (inline-editable) -->
                     <group string="Items to Inspect">
-                        <field name="line_ids" nolabel="1" readonly="1">
-                            <list create="false" delete="false">
-                                <field name="product_id" string="Product" />
-                                <field name="uom_id" string="Unit" optional="show" />
-                                <field name="quantity_expected" string="Expected" />
-                                <field name="quantity" string="Qty" />
+                        <field name="line_ids" nolabel="1">
+                            <list
+                                create="false"
+                                delete="false"
+                                editable="bottom"
+                                class="o_drims_inspection_list"
+                            >
                                 <field
-                                    name="condition_display"
-                                    string="Status"
-                                    decoration-warning="not is_inspected"
-                                    decoration-success="is_inspected"
+                                    name="product_id"
+                                    string="Product"
+                                    readonly="1"
+                                    decoration-muted="is_split"
                                 />
-                                <button
-                                    name="action_edit_item"
-                                    string="Edit"
-                                    type="object"
-                                    class="btn-secondary btn-sm"
-                                    icon="fa-pencil"
+                                <field
+                                    name="uom_id"
+                                    string="Unit"
+                                    optional="show"
+                                    readonly="1"
+                                />
+                                <field
+                                    name="quantity_expected"
+                                    string="Expected"
+                                    readonly="1"
+                                />
+                                <field
+                                    name="quantity"
+                                    string="Qty"
+                                    readonly="not is_split"
+                                />
+                                <field
+                                    name="condition_id"
+                                    string="Condition"
+                                    options="{'no_create': True}"
+                                    invisible="has_splits"
+                                />
+                                <field
+                                    name="disposition_id"
+                                    string="Action"
+                                    options="{'no_create': True}"
+                                    invisible="has_splits"
+                                />
+                                <field
+                                    name="can_mark_all_units"
+                                    column_invisible="True"
                                 />
                                 <field name="is_inspected" column_invisible="True" />
+                                <field name="is_split" column_invisible="True" />
+                                <field name="has_splits" column_invisible="True" />
+                                <field name="parent_line_id" column_invisible="True" />
                                 <field
                                     name="donation_line_id"
                                     column_invisible="True"
                                 />
+                                <!-- "All units" — visual badge only.
+                                     Active when both Condition and Action are
+                                     set; greyed otherwise. Hidden on split
+                                     parent rows. -->
+                                <button
+                                    string="All units"
+                                    type="object"
+                                    name="action_all_units"
+                                    class="btn btn-secondary btn-sm"
+                                    invisible="not can_mark_all_units or has_splits"
+                                />
+                                <button
+                                    string="All units"
+                                    type="object"
+                                    name="action_all_units"
+                                    class="btn btn-secondary btn-sm o_drims_btn_disabled"
+                                    invisible="can_mark_all_units or has_splits"
+                                />
+                                <!-- "+ Add split" — hidden on split children. -->
+                                <button
+                                    name="action_add_split"
+                                    string="+ Add split"
+                                    type="object"
+                                    class="btn btn-secondary btn-sm"
+                                    invisible="is_split"
+                                />
+                                <!-- Remove split — only on split children. -->
+                                <button
+                                    name="action_remove_split"
+                                    string="✕"
+                                    type="object"
+                                    class="btn btn-sm text-danger"
+                                    invisible="not is_split"
+                                    confirm="Remove this split?"
+                                />
                             </list>
                         </field>
                     </group>
@@ -74,87 +135,8 @@
                         string="Confirm Inspection"
                         type="object"
                         class="btn-primary"
-                        invisible="not is_valid"
                         confirm="This will update the donation and mark it as inspected. Continue?"
                     />
-                    <button
-                        name="action_confirm_inspection"
-                        string="Confirm Inspection"
-                        type="object"
-                        class="btn-secondary"
-                        invisible="is_valid"
-                        disabled="1"
-                        help="Please ensure all quantities match before confirming"
-                    />
-                    <button string="Cancel" class="btn-secondary" special="cancel" />
-                </footer>
-            </form>
-        </field>
-    </record>
-
-    <!-- Item Edit Popup Form -->
-    <record id="spp_drims_inspection_item_wizard_form" model="ir.ui.view">
-        <field name="name">spp.drims.inspection.item.wizard.form</field>
-        <field name="model">spp.drims.inspection.item.wizard</field>
-        <field name="arch" type="xml">
-            <form string="Inspect Item">
-                <sheet>
-                    <group>
-                        <group string="Item Details">
-                            <field name="product_id" readonly="1" />
-                            <field name="uom_id" readonly="1" />
-                            <field name="quantity_expected" readonly="1" />
-                        </group>
-                        <group string="Inspection">
-                            <field name="quantity" />
-                            <field name="condition_id" options="{'no_create': True}" />
-                            <field
-                                name="disposition_id"
-                                options="{'no_create': True}"
-                            />
-                            <field
-                                name="notes"
-                                placeholder="e.g., water damaged, expired batch"
-                            />
-                        </group>
-                    </group>
-
-                    <!-- Split Warning -->
-                    <field name="show_split_warning" invisible="1" />
-                    <field name="remaining_qty" invisible="1" />
-                    <div
-                        class="alert alert-warning"
-                        role="alert"
-                        invisible="not show_split_warning"
-                    >
-                        <strong>Remaining quantity:</strong>
-                        <field name="remaining_qty" readonly="1" class="oe_inline" />
-                        <br />
-                        <span class="text-muted">
-                            If some items have a different condition, click "Save &amp; Add Split"
-                            to create another line for the remaining quantity.
-                        </span>
-                    </div>
-
-                    <field name="inspection_line_id" invisible="1" />
-                    <field name="wizard_id" invisible="1" />
-                </sheet>
-
-                <footer>
-                    <button
-                        name="action_save"
-                        string="Save"
-                        type="object"
-                        class="btn-primary"
-                    />
-                    <button
-                        name="action_save_and_split"
-                        string="Save &amp; Add Split"
-                        type="object"
-                        class="btn-secondary"
-                        invisible="not show_split_warning"
-                        help="Save this item and create a new line for remaining quantity"
-                    />
                     <button string="Cancel" class="btn-secondary" special="cancel" />
                 </footer>
             </form>

From 21b50b73de06b1bb582c3d45910f955558d30ee3 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Mon, 25 May 2026 11:31:47 +0800
Subject: [PATCH 13/26] feat(drims): support multiple partial dispatches per
 request (#1033)

Each Create Dispatch call now creates a picking covering only the not-yet-dispatched
allocated balance (quantity_allocated - quantity_dispatched) per line. The request
stays in Ready for Dispatch until every line reaches quantity_dispatched >=
quantity_requested, at which point it advances to Dispatched.

The Allocate Stock button stays available while the request is allocated so the
operator can top up the allocation between dispatches as more stock arrives.
---
 spp_drims/models/request.py       | 74 ++++++++++++++-----------
 spp_drims/tests/test_request.py   | 89 +++++++++++++++++++++++++++++++
 spp_drims/views/request_views.xml |  2 +-
 3 files changed, 133 insertions(+), 32 deletions(-)

diff --git a/spp_drims/models/request.py b/spp_drims/models/request.py
index 8e15dc9e..05725f58 100644
--- a/spp_drims/models/request.py
+++ b/spp_drims/models/request.py
@@ -616,22 +616,23 @@ def _allocate_stock_fifo(self):
         return True
 
     def action_create_dispatch(self):
-        """Create a dispatch picking for this allocated request (GAP-REQ-003).
+        """Create a dispatch picking for the not-yet-dispatched balance of this
+        request (GAP-REQ-003, OP#1033 — partial dispatches).
 
-        This method:
-        1. Validates the request is allocated and has a source warehouse
-        2. Creates a stock.picking for outgoing delivery
-        3. Creates stock.move for each allocated line item
-        4. Confirms the picking
-        5. Updates request state to 'dispatched'
-        6. Opens the picking form
+        Each call creates a picking covering only the **remaining** allocated
+        quantity per line (``quantity_allocated - quantity_dispatched``). The
+        request state only advances to ``dispatched`` once every line has
+        ``quantity_dispatched >= quantity_requested`` — until then it stays at
+        ``allocated`` (Ready for Dispatch) so the button can be clicked again
+        when more stock is allocated.
 
         Returns:
             dict: Action to view the created picking.
 
         Raises:
-            UserError: If request is not allocated, no source warehouse, or
-                       no outgoing picking type found.
+            UserError: If request is not allocated, source warehouse missing,
+                       outgoing picking type missing, or nothing remains to
+                       dispatch on the current allocation.
         """
         self.ensure_one()
         if self.state != "allocated":
@@ -639,10 +640,15 @@ def action_create_dispatch(self):
         if not self.source_warehouse_id:
             raise UserError(_("Please select a source warehouse."))
 
-        # Check for allocated lines
-        allocated_lines = self.line_ids.filtered(lambda line: line.quantity_allocated > 0)
-        if not allocated_lines:
-            raise UserError(_("No items have been allocated for dispatch."))
+        # Lines that still have allocated stock not yet committed to a picking.
+        lines_to_dispatch = self.line_ids.filtered(lambda line: line.quantity_allocated - line.quantity_dispatched > 0)
+        if not lines_to_dispatch:
+            raise UserError(
+                _(
+                    "Nothing left to dispatch on this request. Allocate additional "
+                    "stock first before creating another dispatch."
+                )
+            )
 
         # Get picking type for outgoing deliveries
         picking_type = self.env["stock.picking.type"].search(
@@ -689,13 +695,15 @@ def action_create_dispatch(self):
         }
         picking = self.env["stock.picking"].create(picking_vals)
 
-        # Create moves for each allocated line
+        # Create moves for each line's not-yet-dispatched balance, and track
+        # the running total on the request line.
         Move = self.env["stock.move"]
-        for line in allocated_lines:
+        for line in lines_to_dispatch:
+            qty_remaining = line.quantity_allocated - line.quantity_dispatched
             Move.create(
                 {
                     "product_id": line.product_id.id,
-                    "product_uom_qty": line.quantity_allocated,
+                    "product_uom_qty": qty_remaining,
                     "product_uom": line.uom_id.id,
                     "picking_id": picking.id,
                     "location_id": picking.location_id.id,
@@ -703,24 +711,28 @@ def action_create_dispatch(self):
                     "drims_request_line_id": line.id,
                 }
             )
+            line.quantity_dispatched = line.quantity_dispatched + qty_remaining
 
         # Confirm the picking
         picking.action_confirm()
 
-        # Update request state to dispatched
-        dispatched_state = self.env["spp.vocabulary.code"].search(
-            [
-                (
-                    "vocabulary_id.namespace_uri",
-                    "=",
-                    "urn:openspp:vocab:drims:request-states",
-                ),
-                ("code", "=", "dispatched"),
-            ],
-            limit=1,
-        )
-        if dispatched_state:
-            self.state_id = dispatched_state
+        # Only advance to ``dispatched`` once every line is fully dispatched
+        # against its requested quantity. Otherwise the request stays at
+        # ``allocated`` so the user can allocate more and dispatch again.
+        if all(line.quantity_dispatched >= line.quantity_requested for line in self.line_ids):
+            dispatched_state = self.env["spp.vocabulary.code"].search(
+                [
+                    (
+                        "vocabulary_id.namespace_uri",
+                        "=",
+                        "urn:openspp:vocab:drims:request-states",
+                    ),
+                    ("code", "=", "dispatched"),
+                ],
+                limit=1,
+            )
+            if dispatched_state:
+                self.state_id = dispatched_state
 
         # Open the picking form
         return {
diff --git a/spp_drims/tests/test_request.py b/spp_drims/tests/test_request.py
index e10eb8c7..859c763c 100644
--- a/spp_drims/tests/test_request.py
+++ b/spp_drims/tests/test_request.py
@@ -562,3 +562,92 @@ def test_create_dispatch_no_allocated_lines(self):
         # No lines allocated - should fail
         with self.assertRaises(UserError):
             request.action_create_dispatch()
+
+    # ---------- OP#1033: partial dispatches ----------
+
+    def _setup_allocated_request(self, requested=5000, allocated=2000):
+        """Build a request in ``allocated`` state with the given line numbers."""
+        request = self.env["spp.drims.request"].create(
+            {
+                "incident_id": self.incident.id,
+                "destination_area_id": self.area.id,
+                "date_needed": self.future_date,
+                "source_warehouse_id": self.warehouse.id,
+                "line_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "product_id": self.product.id,
+                            "quantity_requested": requested,
+                            "uom_id": self.product.uom_id.id,
+                        },
+                    )
+                ],
+            }
+        )
+        request.action_submit()
+        request.action_approve()
+        request.line_ids[0].quantity_allocated = allocated
+        allocated_state = self.env["spp.vocabulary.code"].search(
+            [
+                ("vocabulary_id.namespace_uri", "=", "urn:openspp:vocab:drims:request-states"),
+                ("code", "=", "allocated"),
+            ],
+            limit=1,
+        )
+        if allocated_state:
+            request.state_id = allocated_state
+        return request
+
+    def test_partial_dispatch_keeps_state_allocated(self):
+        """OP#1033: dispatching less than requested stays at allocated."""
+        request = self._setup_allocated_request(requested=5000, allocated=2000)
+
+        request.action_create_dispatch()
+
+        self.assertEqual(request.state, "allocated")
+        self.assertEqual(request.line_ids[0].quantity_dispatched, 2000)
+        self.assertEqual(request.picking_count, 1)
+
+    def test_second_dispatch_after_top_up_advances_to_dispatched(self):
+        """OP#1033: a second Create Dispatch after extra allocation
+        creates a new picking and flips the state to dispatched.
+        """
+        request = self._setup_allocated_request(requested=5000, allocated=2000)
+        request.action_create_dispatch()
+        self.assertEqual(request.state, "allocated")
+
+        # Operator allocates the remaining 3000 and dispatches again.
+        request.line_ids[0].quantity_allocated = 5000
+        request.action_create_dispatch()
+
+        self.assertEqual(request.state, "dispatched")
+        self.assertEqual(request.line_ids[0].quantity_dispatched, 5000)
+        self.assertEqual(request.picking_count, 2)
+        # Both pickings remain linked to the request.
+        for picking in request.picking_ids:
+            self.assertEqual(picking.drims_request_id, request)
+
+    def test_second_dispatch_picking_only_covers_remainder(self):
+        """OP#1033: the second picking moves only the newly-allocated qty."""
+        request = self._setup_allocated_request(requested=5000, allocated=2000)
+        request.action_create_dispatch()
+        first_picking = request.picking_ids[0]
+        self.assertEqual(first_picking.move_ids[0].product_uom_qty, 2000)
+
+        request.line_ids[0].quantity_allocated = 5000
+        request.action_create_dispatch()
+        second_picking = request.picking_ids - first_picking
+        self.assertEqual(len(second_picking), 1)
+        self.assertEqual(second_picking.move_ids[0].product_uom_qty, 3000)
+
+    def test_dispatch_blocked_when_nothing_remaining(self):
+        """OP#1033: clicking Create Dispatch with no remainder raises."""
+        request = self._setup_allocated_request(requested=5000, allocated=2000)
+        request.action_create_dispatch()
+
+        # No further allocation happened — the second call has nothing to do.
+        with self.assertRaises(UserError) as cm:
+            request.action_create_dispatch()
+        self.assertIn("Nothing left to dispatch", str(cm.exception))
diff --git a/spp_drims/views/request_views.xml b/spp_drims/views/request_views.xml
index de5d4d08..32b99908 100644
--- a/spp_drims/views/request_views.xml
+++ b/spp_drims/views/request_views.xml
@@ -158,7 +158,7 @@
                         string="Allocate Stock"
                         type="object"
                         class="btn-primary"
-                        invisible="approval_state != 'approved' or state == 'allocated'"
+                        invisible="approval_state != 'approved' or state in ('dispatched', 'delivered', 'fulfilled')"
                         data-hotkey="l"
                     />
                     <button

From 030b9deb16fcd61cd480fd497ad3ca048e5ec998 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Tue, 26 May 2026 09:28:36 +0800
Subject: [PATCH 14/26] fix(drims): exclude non-accept dispositions from
 donation stocking (#1030)

action_stock now cancels moves whose donation line carries a disposition of
return / dispose / quarantine before validating the receipt picking, so
damaged or returnable units never enter usable inventory. A sticky warning
notification lists the excluded units. If every move on a picking is
excluded, the picking is cancelled outright instead of validated empty.

stock.move._prepare_merge_moves_distinct_fields now keeps drims_donation_line_id
and drims_request_line_id distinct so Odoo's automatic move-merge does not
collapse multi-line donations of the same product into one move (which would
have lost the per-disposition link).

Also fixes a related grouping bug in the inspection wizard's confirm step:
two separate donation lines for the same product were being treated as
splits of each other. Confirm now groups wizard lines by donation_line_id,
so independent donation lines aren't subject to the split-totals safety net.
---
 spp_drims/models/donation.py          |  67 ++++++++++++-
 spp_drims/models/stock_move.py        |  15 ++-
 spp_drims/tests/test_donation.py      | 133 ++++++++++++++++++++++++++
 spp_drims/wizard/inspection_wizard.py |  37 +++----
 4 files changed, 231 insertions(+), 21 deletions(-)

diff --git a/spp_drims/models/donation.py b/spp_drims/models/donation.py
index ab069076..b79d6b66 100644
--- a/spp_drims/models/donation.py
+++ b/spp_drims/models/donation.py
@@ -420,12 +420,20 @@ def action_stock(self):
 
         This action:
         1. Transitions the donation from 'inspected' to 'stocked' state
-        2. Validates all pending stock pickings (assigns and confirms moves)
-        3. For lot/serial-tracked products, creates stock.lot records from
+        2. **Cancels moves for non-accept dispositions** (OP#1030) so units
+           marked ``return``, ``dispose``, or ``quarantine`` during inspection
+           never enter usable inventory. Those donation lines must be handled
+           through a separate return / disposal flow.
+        3. Validates the remaining moves on the pending pickings
+        4. For lot/serial-tracked products, creates stock.lot records from
            the donation line's ``lot_number`` (+ ``expiry_date`` if the
            ``product_expiry`` module is installed) and attaches them to
            the picking's move lines so ``button_validate()`` succeeds
-        4. Items become available in warehouse inventory
+        5. Items become available in warehouse inventory
+
+        Returns:
+            dict | None: a display_notification action summarising excluded
+            non-accept units, or ``None`` when everything was accepted.
 
         Raises:
             UserError: If donation is not in 'inspected' state.
@@ -443,18 +451,69 @@ def action_stock(self):
         )
         Lot = self.env["stock.lot"]
         has_expiration = "expiration_date" in Lot._fields
+        excluded_summary = []
         for rec in self:
             if rec.state != DONATION_STATE_INSPECTED:
                 raise UserError(_("Only inspected donations can be marked as stocked."))
             rec.state_id = stocked_state
             # Validate the picking to complete the receipt
             for picking in rec.picking_ids.filtered(lambda p: p.state not in ("done", "cancel")):
+                excluded_summary.extend(rec._exclude_non_accept_moves(picking))
+                # If every move was excluded, just cancel the picking — there
+                # is nothing left to validate.
+                remaining = picking.move_ids.filtered(lambda m: m.state != "cancel")
+                if not remaining:
+                    picking.action_cancel()
+                    continue
                 picking.action_assign()
                 rec._assign_lots_to_picking(picking, Lot, has_expiration)
-                for move in picking.move_ids:
+                for move in remaining:
                     move.quantity = move.product_uom_qty
                 picking.button_validate()
 
+        if excluded_summary:
+            return {
+                "type": "ir.actions.client",
+                "tag": "display_notification",
+                "params": {
+                    "title": _("Damaged / non-accept units excluded"),
+                    "message": "\n".join(excluded_summary),
+                    "type": "warning",
+                    "sticky": True,
+                },
+            }
+        return None
+
+    def _exclude_non_accept_moves(self, picking):
+        """Cancel moves whose donation line is not marked Accept (OP#1030).
+
+        Returns a list of human-readable summary lines for each excluded move
+        so the caller can roll them into a single notification.
+        """
+        self.ensure_one()
+        excluded = []
+        for move in picking.move_ids:
+            line = move.drims_donation_line_id
+            if not line:
+                continue
+            disposition_code = line.disposition_id.code or ""
+            if disposition_code in ("return", "dispose", "quarantine"):
+                excluded.append(
+                    _(
+                        "%(qty)s %(uom)s of %(product)s — disposition %(disposition)s "
+                        "(excluded from usable stock; handle via the appropriate "
+                        "return / disposal flow)."
+                    )
+                    % {
+                        "qty": move.product_uom_qty,
+                        "uom": move.product_uom.name,
+                        "product": move.product_id.display_name,
+                        "disposition": line.disposition_id.display,
+                    }
+                )
+                move._action_cancel()
+        return excluded
+
     def _assign_lots_to_picking(self, picking, Lot, has_expiration):
         """Create + attach stock.lot for tracked-product moves on the picking.
 
diff --git a/spp_drims/models/stock_move.py b/spp_drims/models/stock_move.py
index 61d367cc..e5dffbaf 100644
--- a/spp_drims/models/stock_move.py
+++ b/spp_drims/models/stock_move.py
@@ -1,5 +1,5 @@
 # Part of OpenSPP. See LICENSE file for full copyright and licensing details.
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class StockMove(models.Model):
@@ -16,3 +16,16 @@ class StockMove(models.Model):
         string="Donation Line",
         help="Link to the donation line this move receives",
     )
+
+    @api.model
+    def _prepare_merge_moves_distinct_fields(self):
+        """Keep DRIMS donation/request lines distinct when Odoo merges moves.
+
+        Without this, a multi-line donation for the same product collapses
+        into a single move on the receipt picking and the per-line
+        ``drims_donation_line_id`` link is lost — which OP#1030's stocking
+        logic relies on to exclude non-accept dispositions.
+        """
+        fields_list = super()._prepare_merge_moves_distinct_fields()
+        fields_list += ["drims_donation_line_id", "drims_request_line_id"]
+        return fields_list
diff --git a/spp_drims/tests/test_donation.py b/spp_drims/tests/test_donation.py
index d567c5bd..3ccdb1d2 100644
--- a/spp_drims/tests/test_donation.py
+++ b/spp_drims/tests/test_donation.py
@@ -843,3 +843,136 @@ def test_action_stock_untracked_product_unaffected(self):
         donation.action_inspect()
         donation.action_stock()
         self.assertEqual(donation.state, "stocked")
+
+    # ---------- OP#1030: non-accept dispositions excluded from stocking ----------
+
+    def _disposition(self, code):
+        return self.env["spp.vocabulary.code"].search(
+            [
+                ("vocabulary_id.namespace_uri", "=", "urn:openspp:vocab:drims:item-dispositions"),
+                ("code", "=", code),
+            ],
+            limit=1,
+        )
+
+    def _qty_in_warehouse(self, product, warehouse):
+        return sum(
+            self.env["stock.quant"]
+            .search(
+                [
+                    ("product_id", "=", product.id),
+                    ("location_id", "child_of", warehouse.lot_stock_id.id),
+                ]
+            )
+            .mapped("quantity")
+        )
+
+    def test_action_stock_excludes_return_disposition(self):
+        """OP#1030: lines with disposition=return are cancelled, not stocked."""
+        disposition_return = self._disposition("return")
+        if not disposition_return:
+            self.skipTest("return disposition vocab code missing")
+
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": self.product.id,
+                    "quantity_pledged": 200,
+                    "uom_id": self.product.uom_id.id,
+                }
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        donation.line_ids[0].disposition_id = disposition_return
+
+        result = donation.action_stock()
+        self.assertEqual(donation.state, "stocked")
+        # Nothing should land in the warehouse.
+        self.assertEqual(self._qty_in_warehouse(self.product, self.warehouse), 0.0)
+        # The picking should end up cancelled because every move was excluded.
+        for picking in donation.picking_ids:
+            self.assertEqual(picking.state, "cancel")
+        # A user-visible warning is returned.
+        self.assertEqual(result["type"], "ir.actions.client")
+        self.assertEqual(result["tag"], "display_notification")
+        self.assertIn("excluded", result["params"]["message"].lower())
+
+    def test_action_stock_excludes_dispose_disposition(self):
+        """OP#1030: lines with disposition=dispose are cancelled too."""
+        disposition_dispose = self._disposition("dispose")
+        if not disposition_dispose:
+            self.skipTest("dispose disposition vocab code missing")
+
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": self.product.id,
+                    "quantity_pledged": 100,
+                    "uom_id": self.product.uom_id.id,
+                }
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        donation.line_ids[0].disposition_id = disposition_dispose
+
+        donation.action_stock()
+        self.assertEqual(self._qty_in_warehouse(self.product, self.warehouse), 0.0)
+
+    def test_action_stock_mixed_dispositions_only_accepted_stocks(self):
+        """OP#1030: in a mixed donation, only accepted lines reach the warehouse."""
+        disposition_accept = self._disposition("accept")
+        disposition_return = self._disposition("return")
+        if not (disposition_accept and disposition_return):
+            self.skipTest("required disposition codes missing")
+
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": self.product.id,
+                    "quantity_pledged": 800,
+                    "uom_id": self.product.uom_id.id,
+                },
+                {
+                    "product_id": self.product.id,
+                    "quantity_pledged": 200,
+                    "uom_id": self.product.uom_id.id,
+                },
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        donation.line_ids[0].disposition_id = disposition_accept
+        donation.line_ids[1].disposition_id = disposition_return
+
+        result = donation.action_stock()
+        self.assertEqual(donation.state, "stocked")
+        # Only the 800 accepted units land in the warehouse.
+        self.assertEqual(self._qty_in_warehouse(self.product, self.warehouse), 800.0)
+        # Warning lists the 200 excluded units.
+        self.assertIsNotNone(result)
+        self.assertIn("200", result["params"]["message"])
+
+    def test_action_stock_all_accept_unchanged(self):
+        """OP#1030: regression — full-accept flow still stocks everything."""
+        disposition_accept = self._disposition("accept")
+        if not disposition_accept:
+            self.skipTest("accept disposition vocab code missing")
+
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": self.product.id,
+                    "quantity_pledged": 500,
+                    "uom_id": self.product.uom_id.id,
+                }
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        donation.line_ids[0].disposition_id = disposition_accept
+
+        result = donation.action_stock()
+        self.assertIsNone(result, "no excluded units → no notification")
+        self.assertEqual(self._qty_in_warehouse(self.product, self.warehouse), 500.0)
diff --git a/spp_drims/wizard/inspection_wizard.py b/spp_drims/wizard/inspection_wizard.py
index d579682f..0fa6eb70 100644
--- a/spp_drims/wizard/inspection_wizard.py
+++ b/spp_drims/wizard/inspection_wizard.py
@@ -67,29 +67,34 @@ def action_confirm_inspection(self):
                 % ", ".join(uninspected.mapped("product_id.display_name"))
             )
 
-        # Group lines per product for the equality safety net + downstream writes.
-        # Parent rows are skipped here because their qty mirrors their children's
-        # running total — including them would double-count.
-        products = {}
+        # Group by the original donation line. Two separate donation lines for
+        # the same product are independent (each has its own donation_line_id),
+        # so they must not be lumped together as if they were splits of each
+        # other. Splits of a single donation line share the same
+        # ``donation_line_id`` via ``action_add_split``.
+        # Parent rows are skipped here — their qty mirrors their children's
+        # running total and including them would double-count.
+        lines_by_donation = {}
         for line in self.line_ids:
             if line.has_splits:
                 continue
-            product_id = line.product_id.id
-            if product_id not in products:
-                products[product_id] = {
+            key = line.donation_line_id.id
+            if key not in lines_by_donation:
+                lines_by_donation[key] = {
                     "name": line.product_id.display_name,
                     "expected": line.quantity_expected,
                     "total": 0.0,
                     "lines": [],
                 }
-            products[product_id]["total"] += line.quantity
-            products[product_id]["lines"].append(line)
-
-        # OP#964: only enforce equality when the user has split a product
-        # into multiple lines. A single line is treated as the user
-        # reporting the final received quantity, and ``quantity_received``
-        # on the donation line will be overwritten to match below.
-        for _product_id, data in products.items():
+            lines_by_donation[key]["total"] += line.quantity
+            lines_by_donation[key]["lines"].append(line)
+
+        # OP#964: only enforce equality when the user has split a donation
+        # line into multiple wizard lines. A single line is treated as the
+        # user reporting the final received quantity, and
+        # ``quantity_received`` on the donation line will be overwritten to
+        # match below.
+        for data in lines_by_donation.values():
             if len(data["lines"]) <= 1:
                 continue
             diff = abs(data["expected"] - data["total"])
@@ -115,7 +120,7 @@ def action_confirm_inspection(self):
         )
 
         DonationLine = self.env["spp.drims.donation.line"]
-        for _product_id, data in products.items():
+        for data in lines_by_donation.values():
             lines = data["lines"]
 
             first_line = lines[0]

From 5d6b9ce7eb1db4fa545ba78250a66707709fc88c Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Tue, 26 May 2026 11:20:13 +0800
Subject: [PATCH 15/26] feat(drims): polish inspection wizard list per QA
 feedback (#963 r2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QA round 2 feedback addressed:
- Custom OWL Float widget (qty_split_progress) renders parent rows as
  "X / Y" inside a single Qty column — X green when matched, red otherwise —
  driven by a live read of children from the wizard's One2many. Child rows
  keep the standard editable float; a useEffect mirrors the running sum
  onto the parent record via record.update so the parent's display
  reactively refreshes on every child qty edit.
- Condition/Action become read-only on split parents; the dropdown caret
  + "Select" affordance are now always visible on editable cells and
  hidden on read-only split parents.
- Children quantities are clamped so the running total never exceeds the
  donation line's received quantity.
- _order on the wizard line model groups parent + children together with
  parent first; child rows get an indent + "↳" arrow prefix.
- Expected column value hidden on child rows (parent already shows it).
- "+ Add split" hidden when the running split matches expected (uses
  CSS :has() against the widget's own .text-success render so the gate
  reacts live without depending on Odoo's editable-list cross-record
  reactivity).
- Group/field colspan tweaks so the table and notes fill the form width.

All ListRenderer / widget / view changes are scoped to the inspection
wizard list via the o_drims_inspection_list class.
---
 spp_drims/__manifest__.py                     |   2 +
 .../static/src/css/inspection_wizard.css      |  91 ++++++++-
 .../static/src/js/inspection_list_renderer.js |  11 +-
 .../static/src/js/qty_split_progress_field.js | 179 ++++++++++++++++++
 .../src/xml/qty_split_progress_field.xml      |  27 +++
 spp_drims/wizard/inspection_wizard.py         |  68 +++++--
 spp_drims/wizard/inspection_wizard_views.xml  |  36 ++--
 7 files changed, 382 insertions(+), 32 deletions(-)
 create mode 100644 spp_drims/static/src/js/qty_split_progress_field.js
 create mode 100644 spp_drims/static/src/xml/qty_split_progress_field.xml

diff --git a/spp_drims/__manifest__.py b/spp_drims/__manifest__.py
index 9f2715b3..5cd7472c 100644
--- a/spp_drims/__manifest__.py
+++ b/spp_drims/__manifest__.py
@@ -85,6 +85,8 @@
         "web.assets_backend": [
             "spp_drims/static/src/js/hide_dispatch_form_create.js",
             "spp_drims/static/src/js/inspection_list_renderer.js",
+            "spp_drims/static/src/js/qty_split_progress_field.js",
+            "spp_drims/static/src/xml/qty_split_progress_field.xml",
             "spp_drims/static/src/css/inspection_wizard.css",
         ],
     },
diff --git a/spp_drims/static/src/css/inspection_wizard.css b/spp_drims/static/src/css/inspection_wizard.css
index 4261c354..c570dd1b 100644
--- a/spp_drims/static/src/css/inspection_wizard.css
+++ b/spp_drims/static/src/css/inspection_wizard.css
@@ -5,7 +5,96 @@
     pointer-events: none !important;
 }
 
-/* Indent split sub-rows so the parent/child relationship is obvious. */
+/* Indent split sub-rows and prefix them with an arrow so the parent/child
+   relationship is obvious. */
 .o_drims_inspection_list .o_data_row.o_is_split td:first-child {
     padding-left: 2rem;
+    position: relative;
+}
+.o_drims_inspection_list .o_data_row.o_is_split td:first-child::before {
+    content: "\21B3"; /* unicode rightwards arrow with hook = ↳ */
+    color: #888;
+    margin-right: 0.4rem;
+    font-weight: bold;
+}
+
+/* Left-align the Expected + Qty columns (default for floats is right-aligned,
+   but the "X / Y" progress display + per-line numbers read more naturally
+   left-aligned). */
+.o_drims_inspection_list th[data-name="quantity_expected"],
+.o_drims_inspection_list th[data-name="quantity_expected"] *,
+.o_drims_inspection_list td.o_data_cell[name="quantity_expected"],
+.o_drims_inspection_list td.o_data_cell[name="quantity_expected"] *,
+.o_drims_inspection_list td[name="quantity_expected"],
+.o_drims_inspection_list td[name="quantity_expected"] *,
+.o_drims_inspection_list th[data-name="quantity"],
+.o_drims_inspection_list th[data-name="quantity"] *,
+.o_drims_inspection_list td.o_data_cell[name="quantity"],
+.o_drims_inspection_list td.o_data_cell[name="quantity"] *,
+.o_drims_inspection_list td[name="quantity"],
+.o_drims_inspection_list td[name="quantity"] * {
+    text-align: left !important;
+    justify-content: flex-start !important;
+}
+
+/* Always show a dropdown caret on the Condition + Action cells so it's
+   obvious they're editable dropdowns even when not focused. */
+.o_drims_inspection_list td.o_data_cell[name="condition_id"]:not(.o_field_empty)::after,
+.o_drims_inspection_list
+    td.o_data_cell[name="disposition_id"]:not(.o_field_empty)::after {
+    content: "\f078"; /* fa-chevron-down */
+    font-family: "FontAwesome";
+    color: #888;
+    margin-left: 0.4rem;
+    font-size: 0.7em;
+    vertical-align: middle;
+}
+.o_drims_inspection_list td.o_data_cell[name="condition_id"],
+.o_drims_inspection_list td.o_data_cell[name="disposition_id"] {
+    padding-right: 0.4rem;
+}
+/* When the cell is empty, render a faint chevron + "Select…" hint so the
+   affordance is visible even before the operator has picked a value. */
+.o_drims_inspection_list td.o_data_cell[name="condition_id"].o_field_empty,
+.o_drims_inspection_list td.o_data_cell[name="disposition_id"].o_field_empty {
+    color: #888;
+}
+.o_drims_inspection_list td.o_data_cell[name="condition_id"].o_field_empty::after,
+.o_drims_inspection_list td.o_data_cell[name="disposition_id"].o_field_empty::after {
+    content: "Select \f078";
+    font-family: sans-serif, "FontAwesome";
+    color: #888;
+    font-size: 0.85em;
+    font-style: italic;
+}
+
+/* On split parent rows the Condition / Action cells are read-only — there's
+   no dropdown to open, so hide the chevron and the "Select" hint. */
+.o_drims_inspection_list
+    .o_data_row.o_split_parent
+    td.o_data_cell[name="condition_id"]::after,
+.o_drims_inspection_list
+    .o_data_row.o_split_parent
+    td.o_data_cell[name="disposition_id"]::after {
+    content: "" !important;
+    display: none !important;
+}
+
+/* Hide the Expected value on split child rows — the parent already shows
+   the expected total, repeating it on every child is noise. Keep the cell
+   itself so column widths don't shift. */
+.o_drims_inspection_list .o_data_row.o_is_split td[name="quantity_expected"],
+.o_drims_inspection_list .o_data_row.o_is_split td[name="quantity_expected"] * {
+    color: transparent !important;
+}
+
+/* Hide the "+ Add split" button on fully-split parent rows.
+   We piggy-back on the widget's own rendering: when the split total matches
+   the expected, the X portion is rendered with class="text-success". Use
+   :has() to select rows where that's true. This bypasses the
+   parent.quantity reactivity issue entirely. */
+.o_drims_inspection_list
+    tr:has(td[name="quantity"] span.text-success)
+    button[name="action_add_split"] {
+    display: none !important;
 }
diff --git a/spp_drims/static/src/js/inspection_list_renderer.js b/spp_drims/static/src/js/inspection_list_renderer.js
index 8b7c9ccf..d667d9b3 100644
--- a/spp_drims/static/src/js/inspection_list_renderer.js
+++ b/spp_drims/static/src/js/inspection_list_renderer.js
@@ -5,12 +5,15 @@ import {patch} from "@web/core/utils/patch";
 patch(ListRenderer.prototype, {
     getRowClass(record) {
         const base = super.getRowClass(record);
-        if (
-            record.resModel === "spp.drims.inspection.wizard.line" &&
-            record.data.is_split
-        ) {
+        if (record.resModel !== "spp.drims.inspection.wizard.line") {
+            return base;
+        }
+        if (record.data.is_split) {
             return `${base} o_is_split`;
         }
+        if (record.data.has_splits) {
+            return `${base} o_split_parent`;
+        }
         return base;
     },
 });
diff --git a/spp_drims/static/src/js/qty_split_progress_field.js b/spp_drims/static/src/js/qty_split_progress_field.js
new file mode 100644
index 00000000..4eb7c4bb
--- /dev/null
+++ b/spp_drims/static/src/js/qty_split_progress_field.js
@@ -0,0 +1,179 @@
+/** @odoo-module **/
+import {useEffect} from "@odoo/owl";
+import {registry} from "@web/core/registry";
+import {FloatField, floatField} from "@web/views/fields/float/float_field";
+import {formatFloat} from "@web/views/fields/formatters";
+
+/**
+ * Float widget for the inspection wizard's Qty column.
+ *
+ * On split **parent rows** (any other line points to this row via
+ * ``parent_line_id``) it renders ``X / Y``, where ``X`` is the running
+ * sum of child quantities (green when equal to the expected total ``Y``,
+ * red otherwise). Children are read live from the wizard's One2many so
+ * the display reacts to in-memory edits without relying on Python
+ * onchange propagation (which is unreliable in Odoo 19's editable-list
+ * cross-record updates).
+ *
+ * On split **child rows** the field behaves like a standard editable
+ * float; a ``useEffect`` mirrors the running sum onto the parent record
+ * via ``record.update`` so the parent's ``X / Y`` display updates
+ * reactively whenever any child's quantity changes.
+ *
+ * On plain rows it falls back to the stock ``FloatField`` behaviour.
+ */
+export class QtySplitProgressField extends FloatField {
+    static template = "spp_drims.QtySplitProgressField";
+
+    setup() {
+        super.setup();
+        useEffect(
+            () => {
+                this._syncParentQuantity();
+            },
+            () => [this.props.record.data.quantity]
+        );
+    }
+
+    _wizardLines() {
+        const record = this.props.record;
+        const candidates = [record._parentRecord, record.model && record.model.root];
+        for (const wizard of candidates) {
+            const lineList = wizard && wizard.data && wizard.data.line_ids;
+            if (
+                lineList &&
+                Array.isArray(lineList.records) &&
+                lineList.records.length > 0
+            ) {
+                return lineList.records;
+            }
+        }
+        return [];
+    }
+
+    _extractM2oId(value) {
+        // Many2one values in Odoo 19 OWL come as { id, ... } objects (often
+        // wrapped in a Proxy). Older code paths use a [id, name] tuple.
+        // Handle both shapes plus the bare-id case.
+        if (value === null || value === undefined) {
+            return null;
+        }
+        if (typeof value === "number" || typeof value === "string") {
+            return value;
+        }
+        if (Array.isArray(value)) {
+            return value[0];
+        }
+        if (typeof value === "object" && "id" in value) {
+            return value.id;
+        }
+        return null;
+    }
+
+    _parentId() {
+        const parentRef = this.props.record.data.parent_line_id;
+        if (!parentRef) {
+            return null;
+        }
+        return this._extractM2oId(parentRef);
+    }
+
+    _myChildren() {
+        const myId = this.props.record.resId;
+        if (!myId) {
+            return [];
+        }
+        return this._wizardLines().filter((line) => {
+            const parentRef = line.data.parent_line_id;
+            if (!parentRef) {
+                return false;
+            }
+            const parentId = this._extractM2oId(parentRef);
+            return parentId === myId;
+        });
+    }
+
+    async _syncParentQuantity() {
+        // Runs after every change to this row's quantity. If the row is a
+        // split child, recompute the parent's running sum and push it onto
+        // the parent record so the parent's "X / Y" display refreshes.
+        const parentId = this._parentId();
+        if (!parentId) {
+            return;
+        }
+        const lines = this._wizardLines();
+        const parentRecord = lines.find(
+            (line) => line.resId === parentId || String(line.resId) === String(parentId)
+        );
+        if (!parentRecord) {
+            return;
+        }
+        const siblings = lines.filter((line) => {
+            const parentRef = line.data.parent_line_id;
+            if (!parentRef) {
+                return false;
+            }
+            const pid = this._extractM2oId(parentRef);
+            return pid === parentId;
+        });
+        const sum = siblings.reduce((acc, line) => acc + (line.data.quantity || 0), 0);
+        const currentParentQty = parentRecord.data.quantity || 0;
+        const expected = parentRecord.data.quantity_expected || 0;
+        const nextFullySplit = sum >= expected - 0.001;
+        const currentFullySplit = Boolean(parentRecord.data.is_fully_split);
+        const qtyChanged = Math.abs(sum - currentParentQty) >= 0.001;
+        const fullyChanged = currentFullySplit !== nextFullySplit;
+        if (!qtyChanged && !fullyChanged) {
+            return;
+        }
+        const updates = {};
+        if (qtyChanged) {
+            updates.quantity = sum;
+        }
+        if (fullyChanged) {
+            updates.is_fully_split = nextFullySplit;
+        }
+        await parentRecord.update(updates);
+    }
+
+    get hasSplits() {
+        return Boolean(this.props.record.data.has_splits);
+    }
+
+    get splitTotal() {
+        const children = this._myChildren();
+        if (children.length === 0) {
+            // Fallback to the stored parent.quantity on initial render
+            // before sibling reactivity has kicked in.
+            return this.props.record.data.quantity || 0;
+        }
+        return children.reduce((sum, line) => sum + (line.data.quantity || 0), 0);
+    }
+
+    get splitTotalFormatted() {
+        return formatFloat(this.splitTotal, {
+            digits: [16, 2],
+            trailingZeros: true,
+        });
+    }
+
+    get splitTotalClass() {
+        const expected = this.props.record.data.quantity_expected || 0;
+        const matches = Math.abs(this.splitTotal - expected) < 0.001;
+        return matches ? "text-success fw-bold" : "text-danger fw-bold";
+    }
+
+    get expectedFormatted() {
+        return formatFloat(this.props.record.data.quantity_expected || 0, {
+            digits: [16, 2],
+            trailingZeros: true,
+        });
+    }
+}
+
+export const qtySplitProgressField = {
+    ...floatField,
+    component: QtySplitProgressField,
+};
+
+registry.category("fields").add("qty_split_progress", qtySplitProgressField);
diff --git a/spp_drims/static/src/xml/qty_split_progress_field.xml b/spp_drims/static/src/xml/qty_split_progress_field.xml
new file mode 100644
index 00000000..70a0d67e
--- /dev/null
+++ b/spp_drims/static/src/xml/qty_split_progress_field.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates id="template" xml:space="preserve">
+
+    <t t-name="spp_drims.QtySplitProgressField">
+        <t t-if="hasSplits">
+            <span t-att-class="splitTotalClass" t-esc="splitTotalFormatted" />
+            <span> / </span>
+            <span t-esc="expectedFormatted" />
+        </t>
+        <t t-elif="props.readonly">
+            <span t-esc="formattedValue" />
+        </t>
+        <input
+            t-else=""
+            t-on-focusin="onFocusIn"
+            t-on-focusout="onFocusOut"
+            t-att-id="props.id"
+            t-ref="numpadDecimal"
+            t-att-type="props.inputType"
+            inputmode="decimal"
+            class="o_input"
+            autocomplete="off"
+            t-att-step="props.step"
+        />
+    </t>
+
+</templates>
diff --git a/spp_drims/wizard/inspection_wizard.py b/spp_drims/wizard/inspection_wizard.py
index 0fa6eb70..5661d8d3 100644
--- a/spp_drims/wizard/inspection_wizard.py
+++ b/spp_drims/wizard/inspection_wizard.py
@@ -176,6 +176,10 @@ class InspectionWizardLine(models.TransientModel):
 
     _name = "spp.drims.inspection.wizard.line"
     _description = "Inspection Wizard Line"
+    # Sort so each donation line's rows stay grouped together, with the
+    # parent row first (parent_line_id IS NULL) and its split children
+    # immediately below it (ordered by creation id).
+    _order = "donation_line_id, parent_line_id NULLS FIRST, id"
 
     wizard_id = fields.Many2one(
         "spp.drims.inspection.wizard",
@@ -231,22 +235,35 @@ class InspectionWizardLine(models.TransientModel):
     )
     is_split = fields.Boolean(
         string="Is Split Line",
-        compute="_compute_split_flags",
+        compute="_compute_is_split",
+        store=True,
     )
+    # ``has_splits`` is a plain Boolean (no compute) because Odoo 19's
+    # editable-One2many reactivity does not reliably propagate cross-record
+    # depends like ``wizard_id.line_ids.parent_line_id``. action_add_split /
+    # action_remove_split write to this field explicitly, which keeps the
+    # readonly + visibility logic in the view reactive without round-tripping
+    # through a slow compute.
     has_splits = fields.Boolean(
         string="Has Split Lines",
-        compute="_compute_split_flags",
+        default=False,
+    )
+    # Set by both ``action_add_split`` and the OWL widget's useEffect after
+    # the running split total catches up to (or exceeds) ``quantity_expected``.
+    # Drives the "+ Add split" button visibility on the parent row.
+    is_fully_split = fields.Boolean(
+        string="Is Fully Split",
+        default=False,
     )
     can_mark_all_units = fields.Boolean(
         string="Can Mark All Units",
         compute="_compute_can_mark_all_units",
     )
 
-    @api.depends("parent_line_id", "wizard_id.line_ids", "wizard_id.line_ids.parent_line_id")
-    def _compute_split_flags(self):
+    @api.depends("parent_line_id")
+    def _compute_is_split(self):
         for line in self:
             line.is_split = bool(line.parent_line_id)
-            line.has_splits = any(sibling.parent_line_id == line for sibling in line.wizard_id.line_ids)
 
     @api.depends("condition_id", "disposition_id")
     def _compute_can_mark_all_units(self):
@@ -261,13 +278,24 @@ def _compute_is_inspected(self):
 
     @api.onchange("quantity")
     def _onchange_quantity_update_parent(self):
-        """Keep the parent row qty in sync with the running sum of its children."""
+        """Keep the parent row qty in sync with the running sum of its children.
+
+        Also clamps the current child's quantity if the new value would push
+        the running total over the parent's ``quantity_expected``: the qty is
+        snapped to ``expected - sum(other_children)`` so the split totals
+        never exceed the donation line's received quantity.
+        """
         if not self.parent_line_id:
             return
         siblings = self.wizard_id.line_ids.filtered(
             lambda line: line.parent_line_id == self.parent_line_id and line != self
         )
-        total = sum(siblings.mapped("quantity")) + (self.quantity or 0.0)
+        others_sum = sum(siblings.mapped("quantity"))
+        expected = self.parent_line_id.quantity_expected
+        max_allowed = expected - others_sum
+        if self.quantity and self.quantity > max_allowed:
+            self.quantity = max(0.0, max_allowed)
+        total = others_sum + (self.quantity or 0.0)
         self.parent_line_id.quantity = total
 
     def action_all_units(self):
@@ -306,13 +334,14 @@ def action_add_split(self):
             raise UserError(_("No remaining quantity to split. Reduce one of the existing split quantities first."))
 
         # First split: reset the parent qty to 0 (it will be kept in sync as
-        # the running sum of children) and clear any Condition / Action the
-        # operator may have set before deciding to split — the parent row
-        # carries no decision; the children do.
+        # the running sum of children), mark the parent as split, and clear
+        # any Condition / Action the operator may have set before deciding
+        # to split — the parent row carries no decision; the children do.
         if not child_lines:
             root_line.quantity = 0
             root_line.condition_id = False
             root_line.disposition_id = False
+            root_line.has_splits = True
 
         self.env["spp.drims.inspection.wizard.line"].create(
             {
@@ -326,10 +355,17 @@ def action_add_split(self):
             }
         )
 
-        # Keep the parent row's stored qty in sync after creating the child.
-        # Without this the parent row keeps the value it had before the child
-        # was added (0 on the first split, or the previous running total).
-        self._refresh_parent_quantity(root_line)
+        # The new child takes the full remaining quantity, so by construction
+        # the running total after this split equals ``total_in_splits +
+        # remaining = quantity_expected``. Set it directly — going through
+        # ``_refresh_parent_quantity`` is unreliable here because Odoo's
+        # One2many inverse cache for ``wizard_id.line_ids`` does not always
+        # surface the just-created child immediately.
+        root_line.quantity = total_in_splits + remaining
+        # After an Add split the running total always equals ``quantity_expected``
+        # (the new child absorbs exactly the remaining capacity), so the
+        # parent is fully split until the operator edits a child down.
+        root_line.is_fully_split = True
 
         return {
             "type": "ir.actions.act_window",
@@ -350,8 +386,10 @@ def action_remove_split(self):
 
         remaining_children = root_line.wizard_id.line_ids.filtered(lambda line: line.parent_line_id == root_line)
         if not remaining_children:
-            # Reset parent back to the full expected quantity.
+            # Reset parent back to the full expected quantity and clear the
+            # split flag so the row reverts to a normal (editable) row.
             root_line.quantity = root_line.quantity_expected
+            root_line.has_splits = False
         else:
             self._refresh_parent_quantity(root_line)
 
diff --git a/spp_drims/wizard/inspection_wizard_views.xml b/spp_drims/wizard/inspection_wizard_views.xml
index 424a9a2e..9e52a8b4 100644
--- a/spp_drims/wizard/inspection_wizard_views.xml
+++ b/spp_drims/wizard/inspection_wizard_views.xml
@@ -26,8 +26,8 @@
                     </div>
 
                     <!-- Items List (inline-editable) -->
-                    <group string="Items to Inspect">
-                        <field name="line_ids" nolabel="1">
+                    <group string="Items to Inspect" col="2">
+                        <field name="line_ids" nolabel="1" colspan="2">
                             <list
                                 create="false"
                                 delete="false"
@@ -54,19 +54,20 @@
                                 <field
                                     name="quantity"
                                     string="Qty"
+                                    widget="qty_split_progress"
                                     readonly="not is_split"
                                 />
                                 <field
                                     name="condition_id"
                                     string="Condition"
                                     options="{'no_create': True}"
-                                    invisible="has_splits"
+                                    readonly="has_splits"
                                 />
                                 <field
                                     name="disposition_id"
                                     string="Action"
                                     options="{'no_create': True}"
-                                    invisible="has_splits"
+                                    readonly="has_splits"
                                 />
                                 <field
                                     name="can_mark_all_units"
@@ -75,30 +76,40 @@
                                 <field name="is_inspected" column_invisible="True" />
                                 <field name="is_split" column_invisible="True" />
                                 <field name="has_splits" column_invisible="True" />
+                                <field name="is_fully_split" column_invisible="True" />
                                 <field name="parent_line_id" column_invisible="True" />
                                 <field
                                     name="donation_line_id"
                                     column_invisible="True"
                                 />
-                                <!-- "All units" — visual badge only.
-                                     Active when both Condition and Action are
-                                     set; greyed otherwise. Hidden on split
-                                     parent rows. -->
+                                <!-- "All units" — visual badge only. Active
+                                     when both Condition and Action are set;
+                                     greyed otherwise. Hidden on every row
+                                     that is part of a split (parent or
+                                     child) because the badge means "apply
+                                     this decision to the full quantity",
+                                     which doesn't apply once split. -->
                                 <button
                                     string="All units"
                                     type="object"
                                     name="action_all_units"
                                     class="btn btn-secondary btn-sm"
-                                    invisible="not can_mark_all_units or has_splits"
+                                    invisible="not can_mark_all_units or has_splits or is_split"
                                 />
                                 <button
                                     string="All units"
                                     type="object"
                                     name="action_all_units"
                                     class="btn btn-secondary btn-sm o_drims_btn_disabled"
-                                    invisible="can_mark_all_units or has_splits"
+                                    invisible="can_mark_all_units or has_splits or is_split"
                                 />
-                                <!-- "+ Add split" — hidden on split children. -->
+                                <!-- "+ Add split" — hidden on split children.
+                                     On fully-split parents, hiding is handled
+                                     by the o_split_parent_full row class
+                                     applied dynamically in the ListRenderer
+                                     patch (Odoo 19's invisible eval doesn't
+                                     reliably react to JS-driven parent.quantity
+                                     updates in editable-list mode). -->
                                 <button
                                     name="action_add_split"
                                     string="+ Add split"
@@ -120,10 +131,11 @@
                     </group>
 
                     <!-- Inspection Notes -->
-                    <group string="Inspection Notes">
+                    <group string="Inspection Notes" col="2">
                         <field
                             name="notes"
                             nolabel="1"
+                            colspan="2"
                             placeholder="General notes about this inspection (optional)..."
                         />
                     </group>

From 84ada72810cd8d160d1e85885f759005500cfea9 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Tue, 26 May 2026 12:31:21 +0800
Subject: [PATCH 16/26] feat(drims): inspection wizard add-split UX polish
 (#963 r3)

- "+ Add split" now creates the new split child with qty=0 instead of
  pre-filling the remaining capacity. The operator has to enter the split
  amount explicitly, which avoids the "added a split but forgot to fill it"
  footgun.
- "+ Add split" is hidden whenever the parent already has a 0-qty child
  pending, via a dynamically-applied o_split_parent_has_zero row class.
  The operator must fill the new split before opening another.
- Condition + Action dropdowns now use options="{'no_create': True,
  'no_open': True}" so the external-link arrow is suppressed (no extra
  affordance to confuse the operator).
---
 .../static/src/css/inspection_wizard.css      |  6 ++++
 .../static/src/js/inspection_list_renderer.js | 26 ++++++++++++++-
 spp_drims/tests/test_wizard.py                | 33 ++++++++++++-------
 spp_drims/wizard/inspection_wizard.py         | 24 +++++++-------
 spp_drims/wizard/inspection_wizard_views.xml  |  4 +--
 5 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/spp_drims/static/src/css/inspection_wizard.css b/spp_drims/static/src/css/inspection_wizard.css
index c570dd1b..bf7fe4a8 100644
--- a/spp_drims/static/src/css/inspection_wizard.css
+++ b/spp_drims/static/src/css/inspection_wizard.css
@@ -98,3 +98,9 @@
     button[name="action_add_split"] {
     display: none !important;
 }
+
+/* Hide "+ Add split" on parent rows that already have a 0-qty child
+   pending — the operator must fill the new split before opening another. */
+.o_drims_inspection_list tr.o_split_parent_has_zero button[name="action_add_split"] {
+    display: none !important;
+}
diff --git a/spp_drims/static/src/js/inspection_list_renderer.js b/spp_drims/static/src/js/inspection_list_renderer.js
index d667d9b3..885e6c73 100644
--- a/spp_drims/static/src/js/inspection_list_renderer.js
+++ b/spp_drims/static/src/js/inspection_list_renderer.js
@@ -12,7 +12,31 @@ patch(ListRenderer.prototype, {
             return `${base} o_is_split`;
         }
         if (record.data.has_splits) {
-            return `${base} o_split_parent`;
+            // Tag the parent row when any of its split children still has
+            // qty == 0. CSS uses this to hide "+ Add split" until the
+            // pending child is filled — prevents operators from stacking
+            // empty split rows.
+            const lines = (this.props.list && this.props.list.records) || [];
+            const myId = record.resId;
+            const hasZeroChild = lines.some((line) => {
+                const parentRef = line.data.parent_line_id;
+                if (!parentRef) {
+                    return false;
+                }
+                const pid =
+                    typeof parentRef === "object" &&
+                    parentRef !== null &&
+                    "id" in parentRef
+                        ? parentRef.id
+                        : parentRef;
+                if (pid !== myId) {
+                    return false;
+                }
+                return !line.data.quantity;
+            });
+            return hasZeroChild
+                ? `${base} o_split_parent o_split_parent_has_zero`
+                : `${base} o_split_parent`;
         }
         return base;
     },
diff --git a/spp_drims/tests/test_wizard.py b/spp_drims/tests/test_wizard.py
index 9d3e41a6..7b9f4f1e 100644
--- a/spp_drims/tests/test_wizard.py
+++ b/spp_drims/tests/test_wizard.py
@@ -464,7 +464,7 @@ def test_inspection_wizard_only_received_donations(self):
 
     def test_add_split_creates_child_line(self):
         """OP#963: action_add_split creates a child with parent_line_id set
-        and resets the parent qty to mirror the children."""
+        and starts the child at qty=0 (the operator must fill it explicitly)."""
         donation = self._create_received_donation(quantity=1000)
         wizard = self._open_inspection_wizard(donation)
         parent = wizard.line_ids[0]
@@ -476,36 +476,47 @@ def test_add_split_creates_child_line(self):
         self.assertEqual(len(children), 1)
         child = children[0]
         self.assertEqual(child.parent_line_id, parent)
-        # First child gets the full remaining (= expected on first split).
-        self.assertEqual(child.quantity, 1000)
-        # Parent qty mirrors the child running total.
-        self.assertEqual(parent.quantity, 1000)
+        # New split children are created with qty 0 — the operator fills
+        # the row themselves.
+        self.assertEqual(child.quantity, 0)
+        # Parent qty mirrors the child running total (also 0).
+        self.assertEqual(parent.quantity, 0)
         self.assertTrue(parent.has_splits)
+        # Parent is not yet "fully split" until the child is filled.
+        self.assertFalse(parent.is_fully_split)
 
-    def test_add_split_remaining_quantity(self):
-        """OP#963: subsequent splits get expected - already-allocated."""
+    def test_add_split_subsequent_splits_are_also_zero(self):
+        """OP#963: every new split starts at qty=0; the running parent total
+        stays at the existing children sum.
+        """
         donation = self._create_received_donation(quantity=1000)
         wizard = self._open_inspection_wizard(donation)
         parent = wizard.line_ids[0]
 
         parent.action_add_split()
         children = wizard.line_ids.filtered("is_split")
-        children[0].quantity = 700  # leaves 300 remaining
+        children[0].quantity = 700
 
         parent.action_add_split()
         children = wizard.line_ids.filtered("is_split")
         self.assertEqual(len(children), 2)
         new_child = children.sorted(key=lambda line: line.id)[-1]
-        self.assertEqual(new_child.quantity, 300)
+        # New child starts at 0; running parent total stays at 700.
+        self.assertEqual(new_child.quantity, 0)
 
     def test_add_split_blocks_when_nothing_remaining(self):
-        """OP#963: splitting again with no remaining qty raises."""
+        """OP#963: once children already cover the full expected qty,
+        further adds raise (defence-in-depth — the UI hides the button
+        whenever the running total matches expected).
+        """
         donation = self._create_received_donation(quantity=1000)
         wizard = self._open_inspection_wizard(donation)
         parent = wizard.line_ids[0]
 
         parent.action_add_split()
-        # The single child already covers the full expected qty.
+        children = wizard.line_ids.filtered("is_split")
+        # Manually fill the child so the running total reaches expected.
+        children[0].quantity = 1000
         with self.assertRaises(UserError) as cm:
             parent.action_add_split()
         self.assertIn("No remaining quantity to split", str(cm.exception))
diff --git a/spp_drims/wizard/inspection_wizard.py b/spp_drims/wizard/inspection_wizard.py
index 5661d8d3..d0a353e5 100644
--- a/spp_drims/wizard/inspection_wizard.py
+++ b/spp_drims/wizard/inspection_wizard.py
@@ -343,6 +343,11 @@ def action_add_split(self):
             root_line.disposition_id = False
             root_line.has_splits = True
 
+        # Create the new split with qty=0 so the operator has to enter the
+        # split amount explicitly. The "+ Add split" button is then hidden
+        # in the UI while any child still has qty=0, forcing the operator
+        # to fill the new row before opening another. This avoids the
+        # "I added a split but forgot to set its quantity" footgun.
         self.env["spp.drims.inspection.wizard.line"].create(
             {
                 "wizard_id": self.wizard_id.id,
@@ -350,22 +355,17 @@ def action_add_split(self):
                 "product_id": root_line.product_id.id,
                 "uom_id": root_line.uom_id.id,
                 "quantity_expected": root_line.quantity_expected,
-                "quantity": remaining,
+                "quantity": 0,
                 "parent_line_id": root_line.id,
             }
         )
 
-        # The new child takes the full remaining quantity, so by construction
-        # the running total after this split equals ``total_in_splits +
-        # remaining = quantity_expected``. Set it directly — going through
-        # ``_refresh_parent_quantity`` is unreliable here because Odoo's
-        # One2many inverse cache for ``wizard_id.line_ids`` does not always
-        # surface the just-created child immediately.
-        root_line.quantity = total_in_splits + remaining
-        # After an Add split the running total always equals ``quantity_expected``
-        # (the new child absorbs exactly the remaining capacity), so the
-        # parent is fully split until the operator edits a child down.
-        root_line.is_fully_split = True
+        # Running total is unchanged because the new child contributes 0;
+        # the parent still mirrors the sum of existing children.
+        root_line.quantity = total_in_splits
+        # The new child has qty 0, so by definition the parent is not yet
+        # fully split.
+        root_line.is_fully_split = False
 
         return {
             "type": "ir.actions.act_window",
diff --git a/spp_drims/wizard/inspection_wizard_views.xml b/spp_drims/wizard/inspection_wizard_views.xml
index 9e52a8b4..98065883 100644
--- a/spp_drims/wizard/inspection_wizard_views.xml
+++ b/spp_drims/wizard/inspection_wizard_views.xml
@@ -60,13 +60,13 @@
                                 <field
                                     name="condition_id"
                                     string="Condition"
-                                    options="{'no_create': True}"
+                                    options="{'no_create': True, 'no_open': True}"
                                     readonly="has_splits"
                                 />
                                 <field
                                     name="disposition_id"
                                     string="Action"
-                                    options="{'no_create': True}"
+                                    options="{'no_create': True, 'no_open': True}"
                                     readonly="has_splits"
                                 />
                                 <field

From 625ebbfca56241ec16adb2985d72fecb6f56f23a Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Tue, 26 May 2026 12:31:31 +0800
Subject: [PATCH 17/26] fix(drims): robust non-accept exclusion when receipt
 moves merge (#1030 r2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The round 1 implementation relied on per-move drims_donation_line_id to
decide which moves to cancel. That fails whenever Odoo's standard move-merge
logic collapses multiple donation lines for the same product into a single
move — the surviving move references only one line, so the others'
dispositions are invisible.

action_stock now computes the accept vs non-accept received quantities per
product directly from the donation lines, then walks the picking's moves
for each affected product, keeping moves up to the per-product accept total
and cancelling/reducing the excess. Works whether the moves got merged or
not.

Adds a regression test covering the bug screenshot scenario: two donation
lines for the same product with partial receive (200 + 300) and mixed
Accept/Return dispositions — only the 200 accepted units should land in
the warehouse.
---
 spp_drims/models/donation.py     | 88 ++++++++++++++++++++++++--------
 spp_drims/tests/test_donation.py | 44 ++++++++++++++++
 2 files changed, 110 insertions(+), 22 deletions(-)

diff --git a/spp_drims/models/donation.py b/spp_drims/models/donation.py
index b79d6b66..8cdd3678 100644
--- a/spp_drims/models/donation.py
+++ b/spp_drims/models/donation.py
@@ -485,35 +485,79 @@ def action_stock(self):
         return None
 
     def _exclude_non_accept_moves(self, picking):
-        """Cancel moves whose donation line is not marked Accept (OP#1030).
-
-        Returns a list of human-readable summary lines for each excluded move
-        so the caller can roll them into a single notification.
+        """Reduce moves to only the accept portion of each product (OP#1030).
+
+        Per-move ``drims_donation_line_id`` is unreliable: when a donation
+        has multiple lines for the same product, Odoo's standard move-merge
+        logic can collapse them into a single move with one line reference,
+        losing the per-line disposition link. Instead, we sum
+        ``quantity_received`` of accept vs non-accept donation lines per
+        product, then walk the picking's moves for that product, keeping
+        them up to the per-product accept total and cancelling/reducing
+        the excess.
+
+        Works whether or not Odoo merged moves: with merge, one move per
+        product gets reduced; without merge, accept moves stay intact and
+        non-accept moves get cancelled.
+
+        Returns a list of human-readable summary lines for each excluded
+        donation line so the caller can roll them into a single
+        notification.
         """
         self.ensure_one()
-        excluded = []
-        for move in picking.move_ids:
-            line = move.drims_donation_line_id
-            if not line:
+        NON_ACCEPT = ("return", "dispose", "quarantine")
+
+        accept_qty_by_product = {}
+        non_accept_by_product = {}
+        for line in self.line_ids:
+            if line.quantity_received <= 0:
                 continue
             disposition_code = line.disposition_id.code or ""
-            if disposition_code in ("return", "dispose", "quarantine"):
-                excluded.append(
-                    _(
-                        "%(qty)s %(uom)s of %(product)s — disposition %(disposition)s "
-                        "(excluded from usable stock; handle via the appropriate "
-                        "return / disposal flow)."
-                    )
-                    % {
-                        "qty": move.product_uom_qty,
-                        "uom": move.product_uom.name,
-                        "product": move.product_id.display_name,
-                        "disposition": line.disposition_id.display,
-                    }
+            if disposition_code in NON_ACCEPT:
+                non_accept_by_product.setdefault(line.product_id.id, []).append(line)
+            else:
+                accept_qty_by_product[line.product_id.id] = (
+                    accept_qty_by_product.get(line.product_id.id, 0.0) + line.quantity_received
                 )
-                move._action_cancel()
+
+        if not non_accept_by_product:
+            return []
+
+        moves_by_product = {}
+        for move in picking.move_ids:
+            if move.state in ("done", "cancel"):
+                continue
+            moves_by_product.setdefault(move.product_id.id, []).append(move)
+
+        excluded = []
+        for product_id, non_accept_lines in non_accept_by_product.items():
+            for line in non_accept_lines:
+                excluded.append(self._format_excluded_line(line))
+
+            accept_qty = accept_qty_by_product.get(product_id, 0.0)
+            remaining_to_keep = accept_qty
+            for move in moves_by_product.get(product_id, []):
+                if remaining_to_keep <= 0:
+                    move._action_cancel()
+                elif move.product_uom_qty <= remaining_to_keep + 0.001:
+                    remaining_to_keep -= move.product_uom_qty
+                else:
+                    move.product_uom_qty = remaining_to_keep
+                    remaining_to_keep = 0.0
         return excluded
 
+    def _format_excluded_line(self, line):
+        return _(
+            "%(qty)s %(uom)s of %(product)s — disposition %(disposition)s "
+            "(excluded from usable stock; handle via the appropriate "
+            "return / disposal flow)."
+        ) % {
+            "qty": line.quantity_received,
+            "uom": line.uom_id.name,
+            "product": line.product_id.display_name,
+            "disposition": line.disposition_id.display,
+        }
+
     def _assign_lots_to_picking(self, picking, Lot, has_expiration):
         """Create + attach stock.lot for tracked-product moves on the picking.
 
diff --git a/spp_drims/tests/test_donation.py b/spp_drims/tests/test_donation.py
index 3ccdb1d2..c32cb9e2 100644
--- a/spp_drims/tests/test_donation.py
+++ b/spp_drims/tests/test_donation.py
@@ -954,6 +954,50 @@ def test_action_stock_mixed_dispositions_only_accepted_stocks(self):
         self.assertIsNotNone(result)
         self.assertIn("200", result["params"]["message"])
 
+    def test_action_stock_mixed_dispositions_partial_receive_only_stocks_accept(self):
+        """OP#1030 regression: even when Odoo merges the receipt moves and
+        when received qty differs from pledged, only the accepted received
+        quantity should land in the warehouse.
+
+        Reproduces the bug screenshot scenario:
+        - Donation has 2 lines of the same product
+        - Line 1: pledged 500, received 200, Accept
+        - Line 2: pledged 300, received 300, Return to Donor
+        - Expected: only 200 (Accept line's received qty) reaches the warehouse.
+        """
+        disposition_accept = self._disposition("accept")
+        disposition_return = self._disposition("return")
+        if not (disposition_accept and disposition_return):
+            self.skipTest("required disposition codes missing")
+
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": self.product.id,
+                    "quantity_pledged": 500,
+                    "uom_id": self.product.uom_id.id,
+                },
+                {
+                    "product_id": self.product.id,
+                    "quantity_pledged": 300,
+                    "uom_id": self.product.uom_id.id,
+                },
+            ]
+        )
+        donation.action_mark_received()
+        # Simulate the OP#964 scenario: line 1's received is reduced after
+        # receipt (e.g. the actual delivery was short of the pledged amount).
+        donation.line_ids[0].quantity_received = 200
+        donation.action_inspect()
+        donation.line_ids[0].disposition_id = disposition_accept
+        donation.line_ids[1].disposition_id = disposition_return
+
+        result = donation.action_stock()
+        self.assertEqual(donation.state, "stocked")
+        self.assertEqual(self._qty_in_warehouse(self.product, self.warehouse), 200.0)
+        self.assertIsNotNone(result)
+        self.assertIn("300", result["params"]["message"])
+
     def test_action_stock_all_accept_unchanged(self):
         """OP#1030: regression — full-accept flow still stocks everything."""
         disposition_accept = self._disposition("accept")

From a3e8d1e978703ec8f0d93833a5faac031f4b266b Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Tue, 26 May 2026 16:21:47 +0800
Subject: [PATCH 18/26] feat(drims): dynamic Confirm gate with stacked reason
 messages (#963 r4)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds two stored fields on the inspection wizard — `can_confirm` (Boolean)
and `confirm_message` (Text) — and wires the qty widget's useEffect to
recompute them from live line data on every row edit.

Three gating conditions are evaluated together and the failed-reason
messages stack, so the operator sees the union of everything still
blocking Confirm:
- C1: Parent rows with splits must have their children sum to the
  expected quantity.
- C2: Every non-parent line must have both Condition and Action set.
- C3: No split child may have qty 0.

When can_confirm is False the form swaps the primary "Confirm Inspection"
button for a disabled-looking placeholder and renders the
confirm_message in a yellow warning alert above the items list. As soon
as the conditions clear, the message hides and the active button comes
back. Server-side validation in action_confirm_inspection stays in place
as a final safety net.
---
 .../static/src/js/qty_split_progress_field.js | 107 +++++++++++++++++-
 spp_drims/wizard/inspection_wizard.py         |  12 ++
 spp_drims/wizard/inspection_wizard_views.xml  |  29 ++++-
 3 files changed, 146 insertions(+), 2 deletions(-)

diff --git a/spp_drims/static/src/js/qty_split_progress_field.js b/spp_drims/static/src/js/qty_split_progress_field.js
index 4eb7c4bb..ee796c05 100644
--- a/spp_drims/static/src/js/qty_split_progress_field.js
+++ b/spp_drims/static/src/js/qty_split_progress_field.js
@@ -30,11 +30,116 @@ export class QtySplitProgressField extends FloatField {
         useEffect(
             () => {
                 this._syncParentQuantity();
+                this._syncWizardCanConfirm();
             },
-            () => [this.props.record.data.quantity]
+            () => [
+                this.props.record.data.quantity,
+                this.props.record.data.condition_id,
+                this.props.record.data.disposition_id,
+            ]
         );
     }
 
+    _wizard() {
+        const record = this.props.record;
+        const candidates = [record._parentRecord, record.model && record.model.root];
+        for (const wizard of candidates) {
+            if (wizard && wizard.data && wizard.data.line_ids) {
+                return wizard;
+            }
+        }
+        return null;
+    }
+
+    async _syncWizardCanConfirm() {
+        // Three gating conditions:
+        //   C1: parents with splits must have their children sum to the
+        //       expected quantity.
+        //   C2: every non-parent line must have both Condition and Action
+        //       set.
+        //   C3: no split child may have qty 0.
+        // The messages stack — if multiple conditions fail, the operator
+        // sees the union.
+        const wizard = this._wizard();
+        if (!wizard) {
+            return;
+        }
+        const lines = (wizard.data.line_ids && wizard.data.line_ids.records) || [];
+        if (lines.length === 0) {
+            return;
+        }
+
+        const childIdsByParent = new Map();
+        for (const line of lines) {
+            const parentRef = line.data.parent_line_id;
+            if (!parentRef) {
+                continue;
+            }
+            const pid = this._extractM2oId(parentRef);
+            if (pid === null) {
+                continue;
+            }
+            if (!childIdsByParent.has(pid)) {
+                childIdsByParent.set(pid, []);
+            }
+            childIdsByParent.get(pid).push(line);
+        }
+
+        let c1Failed = false;
+        let c2Failed = false;
+        let c3Failed = false;
+
+        for (const line of lines) {
+            const isParentOfSplit = Boolean(line.data.has_splits);
+            const isSplitChild = Boolean(line.data.parent_line_id);
+
+            if (isParentOfSplit) {
+                const children = childIdsByParent.get(line.resId) || [];
+                const sum = children.reduce(
+                    (acc, child) => acc + (child.data.quantity || 0),
+                    0
+                );
+                const expected = line.data.quantity_expected || 0;
+                if (Math.abs(sum - expected) > 0.001) {
+                    c1Failed = true;
+                }
+            } else if (!line.data.condition_id || !line.data.disposition_id) {
+                c2Failed = true;
+            }
+
+            if (isSplitChild && !line.data.quantity) {
+                c3Failed = true;
+            }
+        }
+
+        const messages = [];
+        if (c1Failed) {
+            messages.push(
+                "Split totals must match the expected quantity for each product."
+            );
+        }
+        if (c2Failed) {
+            messages.push("Set Condition and Action for every item.");
+        }
+        if (c3Failed) {
+            messages.push(
+                "Fill all split quantities — a 0-qty split is still pending."
+            );
+        }
+
+        const canConfirm = messages.length === 0;
+        const newMessage = messages.join("\n");
+        const currentCanConfirm = Boolean(wizard.data.can_confirm);
+        const currentMessage = wizard.data.confirm_message || "";
+        if (currentCanConfirm === canConfirm && currentMessage === newMessage) {
+            return;
+        }
+        await wizard.update({
+            can_confirm: canConfirm,
+            confirm_message: newMessage,
+        });
+    }
+
     _wizardLines() {
         const record = this.props.record;
         const candidates = [record._parentRecord, record.model && record.model.root];
diff --git a/spp_drims/wizard/inspection_wizard.py b/spp_drims/wizard/inspection_wizard.py
index d0a353e5..78b42aeb 100644
--- a/spp_drims/wizard/inspection_wizard.py
+++ b/spp_drims/wizard/inspection_wizard.py
@@ -49,6 +49,18 @@ class InspectionWizard(models.TransientModel):
         string="Inspection Notes",
         help="General notes about the inspection",
     )
+    # The QtySplitProgressField widget pushes both of these from the
+    # editable list whenever any row's qty / condition / disposition
+    # changes. They drive the Confirm-button gate in the view.
+    # See ``_syncWizardCanConfirm`` in the JS widget.
+    can_confirm = fields.Boolean(
+        string="Can Confirm",
+        default=True,
+    )
+    confirm_message = fields.Text(
+        string="Confirm Blocker",
+        help="Human-readable reason(s) why Confirm Inspection is currently disabled.",
+    )
 
     def action_confirm_inspection(self):
         """Confirm inspection and create/update donation lines."""
diff --git a/spp_drims/wizard/inspection_wizard_views.xml b/spp_drims/wizard/inspection_wizard_views.xml
index 98065883..dfea4c49 100644
--- a/spp_drims/wizard/inspection_wizard_views.xml
+++ b/spp_drims/wizard/inspection_wizard_views.xml
@@ -16,14 +16,33 @@
                     </div>
 
                     <field name="donation_id" invisible="1" />
+                    <field name="can_confirm" invisible="1" />
+                    <field name="confirm_message" invisible="1" />
 
-                    <div class="alert alert-info" role="alert">
+                    <div
+                        class="alert alert-info"
+                        role="alert"
+                        invisible="not can_confirm"
+                    >
                         Set <strong>Condition</strong> and <strong
                     >Action</strong> on each row, then click <strong
                     >Confirm Inspection</strong>. Use <strong
                     >+ Add split</strong> when a single product needs to be split
                         across multiple conditions.
                     </div>
+                    <!-- The qty widget pushes can_confirm + confirm_message
+                         onto the wizard whenever any row changes. This alert
+                         shows the stacked reason(s) why Confirm is gated. -->
+                    <div
+                        class="alert alert-warning"
+                        role="alert"
+                        invisible="can_confirm"
+                        style="white-space: pre-line;"
+                    >
+                        <strong>Confirm Inspection is unavailable:</strong>
+                        <br />
+                        <field name="confirm_message" readonly="1" nolabel="1" />
+                    </div>
 
                     <!-- Items List (inline-editable) -->
                     <group string="Items to Inspect" col="2">
@@ -147,8 +166,16 @@
                         string="Confirm Inspection"
                         type="object"
                         class="btn-primary"
+                        invisible="not can_confirm"
                         confirm="This will update the donation and mark it as inspected. Continue?"
                     />
+                    <button
+                        string="Confirm Inspection"
+                        type="object"
+                        class="btn-secondary o_drims_btn_disabled"
+                        invisible="can_confirm"
+                        help="Resolve the items listed in the warning above before confirming."
+                    />
                     <button string="Cancel" class="btn-secondary" special="cancel" />
                 </footer>
             </form>

From d6bfdf55f2f4c69e8325d953677f278af4d0f0f0 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Tue, 26 May 2026 16:35:17 +0800
Subject: [PATCH 19/26] fix(drims): subtract pending allocations from available
 qty (#1033 r2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Round 1 of the partial-dispatch work let the operator click Allocate
Stock against the same warehouse repeatedly, ratcheting up
quantity_allocated until it matched quantity_requested while the
physical stock hadn't moved. Cause: _get_available_quantity returned the
raw stock.quant on-hand and ignored other DRIMS request lines that had
already been allocated against the same warehouse but not yet
dispatched.

action_confirm_allocation only consumes stock at dispatch time (it sets
quantity_allocated on the request line but doesn't move quants), so the
wizard needs to deduct those in-flight allocations itself.

Net available now equals:
  sum(quant.quantity - quant.reserved_quantity)
  - sum(max(0, line.quantity_allocated - line.quantity_dispatched))
across all request lines pointing to this warehouse for this product.
Floored at 0. Re-opening the wizard after a partial allocation now
correctly shows available=0 / shortfall=remaining, and confirming an
empty allocation raises the existing "No stock available" UserError.

Adds a regression test reproducing the QA repro: 1000 physical units,
request for 5000, first allocation consumes the 1000 → second wizard
open must show available=0, to_allocate=0, and confirming must raise
without bumping quantity_allocated.
---
 .../tests/test_allocation_preview_wizard.py   | 50 +++++++++++++++++++
 spp_drims/wizard/allocation_preview_wizard.py | 25 +++++++++-
 2 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/spp_drims/tests/test_allocation_preview_wizard.py b/spp_drims/tests/test_allocation_preview_wizard.py
index ef1c8af7..2b27c9d4 100644
--- a/spp_drims/tests/test_allocation_preview_wizard.py
+++ b/spp_drims/tests/test_allocation_preview_wizard.py
@@ -303,6 +303,56 @@ def test_full_allocation(self):
         self.assertEqual(line.shortfall, 0.0)
         self.assertFalse(wizard.has_shortfall)
 
+    def test_reallocation_subtracts_already_allocated(self):
+        """OP#1033 r2 regression: re-opening the allocation wizard after a
+        partial allocation should subtract the pending allocation from the
+        available qty — otherwise the operator can keep allocating until
+        ``quantity_allocated == quantity_requested`` while physical stock
+        has not moved.
+        """
+        # Warehouse has 1000 units; request is for 5000.
+        self.env["stock.quant"].create(
+            {
+                "product_id": self.stockable_product.id,
+                "location_id": self.warehouse.lot_stock_id.id,
+                "quantity": 1000.0,
+            }
+        )
+        request = self._create_request_with_lines([(self.stockable_product, 5000)])
+
+        # First allocation — uses up the 1000 physical units.
+        wizard_1 = self.env["spp.drims.allocation.preview.wizard"].create(
+            {
+                "request_id": request.id,
+                "warehouse_id": self.warehouse.id,
+            }
+        )
+        wizard_1._populate_lines()
+        self.assertEqual(wizard_1.line_ids[0].available_qty, 1000.0)
+        self.assertEqual(wizard_1.line_ids[0].quantity_to_allocate, 1000.0)
+        wizard_1.action_confirm_allocation()
+        self.assertEqual(request.line_ids[0].quantity_allocated, 1000.0)
+
+        # Re-open the wizard without any dispatch happening. The shortfall
+        # should remain 4000 and available should now report 0, NOT another
+        # 1000 (the physical stock is still in place but it's already
+        # committed to this request).
+        wizard_2 = self.env["spp.drims.allocation.preview.wizard"].create(
+            {
+                "request_id": request.id,
+                "warehouse_id": self.warehouse.id,
+            }
+        )
+        wizard_2._populate_lines()
+        self.assertEqual(wizard_2.line_ids[0].available_qty, 0.0)
+        self.assertEqual(wizard_2.line_ids[0].quantity_to_allocate, 0.0)
+        self.assertEqual(wizard_2.line_ids[0].shortfall, 4000.0)
+        # Confirming with nothing to allocate must raise.
+        with self.assertRaises(UserError):
+            wizard_2.action_confirm_allocation()
+        # request.quantity_allocated must NOT have been bumped up.
+        self.assertEqual(request.line_ids[0].quantity_allocated, 1000.0)
+
     def test_empty_allocation_error(self):
         """Test that confirming allocation with no items raises error."""
         request = self._create_request_with_lines([(self.stockable_product, 100)])
diff --git a/spp_drims/wizard/allocation_preview_wizard.py b/spp_drims/wizard/allocation_preview_wizard.py
index ec13fc47..966cc434 100644
--- a/spp_drims/wizard/allocation_preview_wizard.py
+++ b/spp_drims/wizard/allocation_preview_wizard.py
@@ -166,14 +166,35 @@ def _populate_lines(self):
         self.line_ids = [Command.clear()] + lines
 
     def _get_available_quantity(self, product, warehouse):
-        """Get available quantity for a product in a warehouse."""
+        """Net available quantity of ``product`` in ``warehouse``.
+
+        Equals physical on-hand (minus stock.quant reservations) minus the
+        DRIMS allocations that have been committed but not yet dispatched.
+        Without this subtraction the wizard would happily over-allocate:
+        physical stock isn't touched at allocation time, only at dispatch,
+        so the same warehouse stock would appear "available" on every
+        wizard re-open even though prior allocations had already consumed
+        it logically (OP#1033 round 2).
+        """
         quants = self.env["stock.quant"].search(
             [
                 ("product_id", "=", product.id),
                 ("location_id", "child_of", warehouse.lot_stock_id.id),
             ]
         )
-        return sum(q.quantity - q.reserved_quantity for q in quants)
+        physical = sum(q.quantity - q.reserved_quantity for q in quants)
+
+        # Pending DRIMS allocations against this warehouse for this product
+        # — anything allocated but not yet dispatched is a logical reservation
+        # we should not promise again.
+        pending_lines = self.env["spp.drims.request.line"].search(
+            [
+                ("product_id", "=", product.id),
+                ("request_id.source_warehouse_id", "=", warehouse.id),
+            ]
+        )
+        pending = sum(max(0.0, line.quantity_allocated - line.quantity_dispatched) for line in pending_lines)
+        return max(0.0, physical - pending)
 
     def action_confirm_allocation(self):
         """Apply the previewed allocation."""

From 28023642a0ff8ac7b4950046d37834d27e7d2447 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Tue, 26 May 2026 16:53:06 +0800
Subject: [PATCH 20/26] chore(drims): point users to the DRIMS tab on dispatch
 validation errors

When validating a dispatch picking without the required beneficiary fields,
the error toast now spells out where to fill them in ("under the DRIMS
tab") so the operator doesn't have to hunt for the field. Same hint added
to both the beneficiary_count and beneficiary_area_id guards.
---
 spp_drims/models/stock_picking.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/spp_drims/models/stock_picking.py b/spp_drims/models/stock_picking.py
index 0f68666b..703c4403 100644
--- a/spp_drims/models/stock_picking.py
+++ b/spp_drims/models/stock_picking.py
@@ -279,16 +279,18 @@ def button_validate(self):
                 if not picking.beneficiary_count or picking.beneficiary_count <= 0:
                     raise UserError(
                         _(
-                            "Please enter the number of beneficiaries served for dispatch %s. "
-                            "This is required for DRIMS distribution tracking."
+                            "Please enter the number of beneficiaries served for "
+                            "dispatch %s under the DRIMS tab. This is required for "
+                            "DRIMS distribution tracking."
                         )
                         % picking.name
                     )
                 if not picking.beneficiary_area_id:
                     raise UserError(
                         _(
-                            "Please select the distribution area for dispatch %s. "
-                            "This is required for DRIMS geographic reporting."
+                            "Please select the distribution area for dispatch %s "
+                            "under the DRIMS tab. This is required for DRIMS "
+                            "geographic reporting."
                         )
                         % picking.name
                     )

From 2a0a872e5c58e6ff05faebabbf408ed1dc7fb530 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Thu, 28 May 2026 09:21:37 +0800
Subject: [PATCH 21/26] fix(drims): refresh donation form after action_stock's
 notification

The Stock Items button on a donation returns a display_notification action
when non-accept dispositions are excluded. Without a `next` step the
Odoo client renders the toast but doesn't re-read the underlying record,
so the operator has to manually refresh to see the state flip to
"Stocked" and the picking smart-button update.

Add `next: ir.actions.act_window_close` to the notification params (same
pattern the allocation preview wizard already uses), which closes the
action chain and lets the donation form re-read once the toast is shown.
---
 spp_drims/models/donation.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spp_drims/models/donation.py b/spp_drims/models/donation.py
index 8cdd3678..0db0f849 100644
--- a/spp_drims/models/donation.py
+++ b/spp_drims/models/donation.py
@@ -480,6 +480,11 @@ def action_stock(self):
                     "message": "\n".join(excluded_summary),
                     "type": "warning",
                     "sticky": True,
+                    # Close the action chain so the underlying donation form
+                    # re-reads (state badge, picking smart button, etc.).
+                    # Without ``next``, display_notification returns without
+                    # refreshing the record.
+                    "next": {"type": "ir.actions.act_window_close"},
                 },
             }
         return None

From 6dd6a074f6244b4af31373b102e6f852c1bd39bd Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Fri, 29 May 2026 10:06:35 +0800
Subject: [PATCH 22/26] feat(drims): hide Stock button when every donation line
 is non-accept (#963)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When inspectors mark every line as Return / Dispose / Quarantine the donation
has nothing left to stock, but the **Stock Items** button still showed in the
header — clicking it just cancelled every move and transitioned to ``stocked``
with no inventory change, which read as a bug to reviewers.

Compute a non-stored Boolean ``has_acceptable_items`` on ``spp.drims.donation``
that returns True when at least one line has ``quantity_received > 0`` and a
disposition outside the ``("return", "dispose", "quarantine")`` set (factored
out as the module-level constant ``NON_ACCEPT_DISPOSITIONS`` and reused by the
existing ``_exclude_non_accept_moves``). A line with no disposition yet is
treated as acceptable so Stock stays available mid-inspection.

In the donation form:
- ``Stock Items`` is now ``invisible="state != 'inspected' or not has_acceptable_items"``.
- A new info alert above the sheet ("Nothing to Stock. … Click Reject to close
  this donation.") shows on the inverse condition so the user knows why Stock
  disappeared and what action to take instead.
- ``Reject`` is unchanged — visible whenever ``state == 'inspected'``.

Two unit tests lock the field's behaviour (all non-accept → False, one accept
mixed with non-accept → True).
---
 spp_drims/models/donation.py       | 25 +++++++++++-
 spp_drims/tests/test_donation.py   | 61 ++++++++++++++++++++++++++++++
 spp_drims/views/donation_views.xml | 13 ++++++-
 3 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/spp_drims/models/donation.py b/spp_drims/models/donation.py
index 0db0f849..5938145f 100644
--- a/spp_drims/models/donation.py
+++ b/spp_drims/models/donation.py
@@ -20,6 +20,12 @@
 
 _logger = logging.getLogger(__name__)
 
+# Donation-line disposition codes that should NOT be stocked. Moves for these
+# get cancelled by `_exclude_non_accept_moves`, and if every line lands in
+# this set the donation has nothing left to stock — only Reject makes sense.
+NON_ACCEPT_DISPOSITIONS = ("return", "dispose", "quarantine")
+
+
 # Valid state transitions: {from_state: [allowed_to_states]}
 DONATION_STATE_TRANSITIONS = {
     DONATION_STATE_ANNOUNCED: [DONATION_STATE_RECEIVED, DONATION_STATE_CANCELLED],
@@ -136,6 +142,9 @@ class DrimsDonation(models.Model):
         compute="_compute_totals",
         store=True,
     )
+    has_acceptable_items = fields.Boolean(
+        compute="_compute_has_acceptable_items",
+    )
 
     # Stock
     picking_ids = fields.One2many(
@@ -223,6 +232,19 @@ def _compute_totals(self):
             rec.total_value = sum(rec.line_ids.mapped("value"))
             rec.line_count = len(rec.line_ids)
 
+    @api.depends("line_ids.disposition_id", "line_ids.quantity_received")
+    def _compute_has_acceptable_items(self):
+        # A line counts as "acceptable" (i.e. something the warehouse would
+        # stock) when it has a received qty > 0 and its disposition isn't one
+        # of the non-accept dispositions cancelled by `_exclude_non_accept_moves`.
+        # Lines with no disposition yet are treated as acceptable so the
+        # Stock button stays available while inspection is still in progress.
+        for rec in self:
+            rec.has_acceptable_items = any(
+                line.quantity_received > 0 and (line.disposition_id.code or "") not in NON_ACCEPT_DISPOSITIONS
+                for line in rec.line_ids
+            )
+
     @api.depends("picking_ids")
     def _compute_picking_count(self):
         for rec in self:
@@ -510,7 +532,6 @@ def _exclude_non_accept_moves(self, picking):
         notification.
         """
         self.ensure_one()
-        NON_ACCEPT = ("return", "dispose", "quarantine")
 
         accept_qty_by_product = {}
         non_accept_by_product = {}
@@ -518,7 +539,7 @@ def _exclude_non_accept_moves(self, picking):
             if line.quantity_received <= 0:
                 continue
             disposition_code = line.disposition_id.code or ""
-            if disposition_code in NON_ACCEPT:
+            if disposition_code in NON_ACCEPT_DISPOSITIONS:
                 non_accept_by_product.setdefault(line.product_id.id, []).append(line)
             else:
                 accept_qty_by_product[line.product_id.id] = (
diff --git a/spp_drims/tests/test_donation.py b/spp_drims/tests/test_donation.py
index c32cb9e2..1dd4b7a5 100644
--- a/spp_drims/tests/test_donation.py
+++ b/spp_drims/tests/test_donation.py
@@ -998,6 +998,67 @@ def test_action_stock_mixed_dispositions_partial_receive_only_stocks_accept(self
         self.assertIsNotNone(result)
         self.assertIn("300", result["params"]["message"])
 
+    def test_has_acceptable_items_all_non_accept(self):
+        """When every line is non-accept (return / dispose / quarantine) the
+        ``has_acceptable_items`` flag drops to False so the form hides the
+        Stock button and surfaces the "Nothing to Stock" info alert."""
+        disposition_return = self._disposition("return")
+        disposition_dispose = self._disposition("dispose")
+        if not (disposition_return and disposition_dispose):
+            self.skipTest("non-accept disposition vocab codes missing")
+
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": self.product.id,
+                    "quantity_pledged": 100,
+                    "uom_id": self.product.uom_id.id,
+                },
+                {
+                    "product_id": self.product.id,
+                    "quantity_pledged": 100,
+                    "uom_id": self.product.uom_id.id,
+                },
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        donation.line_ids[0].disposition_id = disposition_return
+        donation.line_ids[1].disposition_id = disposition_dispose
+
+        self.assertFalse(
+            donation.has_acceptable_items,
+            "every line is non-accept — Stock button should be hidden",
+        )
+
+    def test_has_acceptable_items_mixed(self):
+        """One accept line is enough to keep Stock available."""
+        disposition_accept = self._disposition("accept")
+        disposition_return = self._disposition("return")
+        if not (disposition_accept and disposition_return):
+            self.skipTest("required disposition codes missing")
+
+        donation = self._make_donation(
+            [
+                {
+                    "product_id": self.product.id,
+                    "quantity_pledged": 100,
+                    "uom_id": self.product.uom_id.id,
+                },
+                {
+                    "product_id": self.product.id,
+                    "quantity_pledged": 50,
+                    "uom_id": self.product.uom_id.id,
+                },
+            ]
+        )
+        donation.action_mark_received()
+        donation.action_inspect()
+        donation.line_ids[0].disposition_id = disposition_accept
+        donation.line_ids[1].disposition_id = disposition_return
+
+        self.assertTrue(donation.has_acceptable_items)
+
     def test_action_stock_all_accept_unchanged(self):
         """OP#1030: regression — full-accept flow still stocks everything."""
         disposition_accept = self._disposition("accept")
diff --git a/spp_drims/views/donation_views.xml b/spp_drims/views/donation_views.xml
index 608167e7..b419fe08 100644
--- a/spp_drims/views/donation_views.xml
+++ b/spp_drims/views/donation_views.xml
@@ -60,7 +60,7 @@
                         string="Stock Items"
                         type="object"
                         class="btn-success"
-                        invisible="state != 'inspected'"
+                        invisible="state != 'inspected' or not has_acceptable_items"
                         confirm="This will add items to warehouse inventory. Continue?"
                     />
                     <button
@@ -71,6 +71,7 @@
                         invisible="state != 'inspected'"
                         confirm="Reject this donation? Items will not be added to inventory."
                     />
+                    <field name="has_acceptable_items" invisible="1" />
                     <button
                         name="action_cancel"
                         string="Cancel"
@@ -89,6 +90,16 @@
                     <field name="state_id" widget="statusbar" />
                 </header>
                 <sheet>
+                    <div
+                        class="alert alert-info"
+                        role="alert"
+                        invisible="state != 'inspected' or has_acceptable_items"
+                    >
+                        <strong>Nothing to Stock.</strong>
+                        Every line on this donation was marked for return, disposal, or quarantine
+                        during inspection, so no items will enter inventory.
+                        Click <strong>Reject</strong> to close this donation.
+                    </div>
                     <div class="oe_button_box" name="button_box">
                         <button
                             name="action_view_pickings"

From 8540644384188271583a3c0a44c876d496c080e0 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Wed, 3 Jun 2026 08:28:23 +0800
Subject: [PATCH 23/26] fix(drims): give GPS map its own full-width section on
 warehouse form (#1038)

---
 spp_drims/views/stock_warehouse_views.xml | 25 ++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/spp_drims/views/stock_warehouse_views.xml b/spp_drims/views/stock_warehouse_views.xml
index 28f73ad2..7a27b9fa 100644
--- a/spp_drims/views/stock_warehouse_views.xml
+++ b/spp_drims/views/stock_warehouse_views.xml
@@ -125,11 +125,6 @@
                                     name="area_id"
                                     invisible="not is_drims_warehouse"
                                 />
-                                <field
-                                    name="gis_location"
-                                    widget="geo_point"
-                                    invisible="not is_drims_warehouse"
-                                />
                             </group>
                             <group string="Emergency Contact" name="emergency_contact">
                                 <field
@@ -142,6 +137,26 @@
                                 />
                             </group>
                         </group>
+
+                        <!--
+                            OP#1038: GPS map gets its own full-width section
+                            below the two settings sub-groups. Inside the
+                            nested 2-column group above, the geo_point
+                            canvas was constrained to ~1/4 of the form
+                            width and felt unusable.
+                        -->
+                        <group
+                            string="GPS Location"
+                            name="drims_gps"
+                            invisible="not is_drims_warehouse"
+                        >
+                            <field
+                                name="gis_location"
+                                widget="geo_point"
+                                nolabel="1"
+                                colspan="2"
+                            />
+                        </group>
                     </page>
                 </notebook>
             </xpath>

From 06bebc4a362fe42037f730069756ecc89226ac9c Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Mon, 8 Jun 2026 11:03:02 +0800
Subject: [PATCH 24/26] chore: regenerate addon READMEs to satisfy pre-commit

The oca-gen-addon-readme hook was failing (also red on 19.0) because the
committed README.rst / static/description/index.html for several modules
were stale vs the generator. Regenerated via the CI toolchain so the
hook passes.
---
 spp_api_v2_gis/README.rst                     |  34 ++---
 spp_api_v2_gis/static/description/index.html  |   4 +-
 spp_change_request_v2/README.rst              |  32 ++--
 .../static/description/index.html             |   4 +-
 spp_drims_sl/README.rst                       |  26 ++--
 spp_drims_sl/static/description/index.html    |   4 +-
 spp_gis_indicators/README.rst                 |  32 ++--
 .../static/description/index.html             |  20 ++-
 spp_hazard/README.rst                         | 143 +++++++++---------
 spp_hazard/static/description/index.html      |  35 +++--
 spp_security/README.rst                       |  22 +--
 spp_security/static/description/index.html    |   5 +-
 12 files changed, 178 insertions(+), 183 deletions(-)

diff --git a/spp_api_v2_gis/README.rst b/spp_api_v2_gis/README.rst
index 53db8bb7..961e531d 100644
--- a/spp_api_v2_gis/README.rst
+++ b/spp_api_v2_gis/README.rst
@@ -53,23 +53,23 @@ API Endpoints
 
 **OGC API - Features (primary interface)**
 
-+-------------------------------------------+--------+------------------------------+
-| Endpoint                                  | Method | Description                  |
-+===========================================+========+==============================+
-| ``/gis/ogc/``                             | GET    | OGC API landing page         |
-+-------------------------------------------+--------+------------------------------+
-| ``/gis/ogc/conformance``                  | GET    | OGC conformance classes      |
-+-------------------------------------------+--------+------------------------------+
-| ``/gis/ogc/collections``                  | GET    | List feature collections     |
-+-------------------------------------------+--------+------------------------------+
-| ``/gis/ogc/collections/{id}``             | GET    | Collection metadata          |
-+-------------------------------------------+--------+------------------------------+
-| ``/gis/ogc/collections/{id}/items``       | GET    | Feature items (GeoJSON)      |
-+-------------------------------------------+--------+------------------------------+
-| ``/gis/ogc/collections/{id}/items/{fid}`` | GET    | Single feature               |
-+-------------------------------------------+--------+------------------------------+
-| ``/gis/ogc/collections/{id}/qml``         | GET    | QGIS style file (extension)  |
-+-------------------------------------------+--------+------------------------------+
++-------------------------------------------+--------+-----------------------------+
+| Endpoint                                  | Method | Description                 |
++===========================================+========+=============================+
+| ``/gis/ogc/``                             | GET    | OGC API landing page        |
++-------------------------------------------+--------+-----------------------------+
+| ``/gis/ogc/conformance``                  | GET    | OGC conformance classes     |
++-------------------------------------------+--------+-----------------------------+
+| ``/gis/ogc/collections``                  | GET    | List feature collections    |
++-------------------------------------------+--------+-----------------------------+
+| ``/gis/ogc/collections/{id}``             | GET    | Collection metadata         |
++-------------------------------------------+--------+-----------------------------+
+| ``/gis/ogc/collections/{id}/items``       | GET    | Feature items (GeoJSON)     |
++-------------------------------------------+--------+-----------------------------+
+| ``/gis/ogc/collections/{id}/items/{fid}`` | GET    | Single feature              |
++-------------------------------------------+--------+-----------------------------+
+| ``/gis/ogc/collections/{id}/qml``         | GET    | QGIS style file (extension) |
++-------------------------------------------+--------+-----------------------------+
 
 **Additional endpoints**
 
diff --git a/spp_api_v2_gis/static/description/index.html b/spp_api_v2_gis/static/description/index.html
index e822f80a..b7c6f7e2 100644
--- a/spp_api_v2_gis/static/description/index.html
+++ b/spp_api_v2_gis/static/description/index.html
@@ -401,9 +401,9 @@ <h1>API Endpoints</h1>
 <p><strong>OGC API - Features (primary interface)</strong></p>
 <table border="1" class="docutils">
 <colgroup>
-<col width="53%" />
+<col width="54%" />
 <col width="10%" />
-<col width="37%" />
+<col width="36%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th class="head">Endpoint</th>
diff --git a/spp_change_request_v2/README.rst b/spp_change_request_v2/README.rst
index 9abb93a6..97adb511 100644
--- a/spp_change_request_v2/README.rst
+++ b/spp_change_request_v2/README.rst
@@ -752,22 +752,22 @@ Methods available for override on detail models (all inherited from
 Related fields available on all detail models (from
 ``spp.cr.detail.base``):
 
-+----------------------------+-----------+------------------------------------------------------------+
-| Field                      | Type      | Source                                                     |
-+============================+===========+============================================================+
-| ``change_request_id``      | Many2one  | Direct link to parent CR                                   |
-+----------------------------+-----------+------------------------------------------------------------+
-| ``registrant_id``          | Many2one  | ``change_request_id.registrant_id``                        |
-+----------------------------+-----------+------------------------------------------------------------+
-| ``approval_state``         | Selection | ``change_request_id.approval_state``                       |
-+----------------------------+-----------+------------------------------------------------------------+
-| ``is_applied``             | Boolean   | ``change_request_id.is_applied``                           |
-+----------------------------+-----------+------------------------------------------------------------+
-| ``use_dynamic_approval``   | Boolean   | ``change_request_id.request_type_id.use_dynamic_approval`` |
-+----------------------------+-----------+------------------------------------------------------------+
-| ``field_to_modify``        | Selection | Dynamic field selector (populated by                       |
-|                            |           | ``_get_field_to_modify_selection``)                        |
-+----------------------------+-----------+------------------------------------------------------------+
++--------------------------+-----------+------------------------------------------------------------+
+| Field                    | Type      | Source                                                     |
++==========================+===========+============================================================+
+| ``change_request_id``    | Many2one  | Direct link to parent CR                                   |
++--------------------------+-----------+------------------------------------------------------------+
+| ``registrant_id``        | Many2one  | ``change_request_id.registrant_id``                        |
++--------------------------+-----------+------------------------------------------------------------+
+| ``approval_state``       | Selection | ``change_request_id.approval_state``                       |
++--------------------------+-----------+------------------------------------------------------------+
+| ``is_applied``           | Boolean   | ``change_request_id.is_applied``                           |
++--------------------------+-----------+------------------------------------------------------------+
+| ``use_dynamic_approval`` | Boolean   | ``change_request_id.request_type_id.use_dynamic_approval`` |
++--------------------------+-----------+------------------------------------------------------------+
+| ``field_to_modify``      | Selection | Dynamic field selector (populated by                       |
+|                          |           | ``_get_field_to_modify_selection``)                        |
++--------------------------+-----------+------------------------------------------------------------+
 
 CR Type Fields Reference
 ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/spp_change_request_v2/static/description/index.html b/spp_change_request_v2/static/description/index.html
index 8165437b..ef26ac45 100644
--- a/spp_change_request_v2/static/description/index.html
+++ b/spp_change_request_v2/static/description/index.html
@@ -1160,9 +1160,9 @@ <h1>Methods Reference</h1>
 <tt class="docutils literal">spp.cr.detail.base</tt>):</p>
 <table border="1" class="docutils">
 <colgroup>
-<col width="28%" />
+<col width="27%" />
 <col width="11%" />
-<col width="61%" />
+<col width="62%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th class="head">Field</th>
diff --git a/spp_drims_sl/README.rst b/spp_drims_sl/README.rst
index 203e19ef..adb1b9b1 100644
--- a/spp_drims_sl/README.rst
+++ b/spp_drims_sl/README.rst
@@ -61,19 +61,19 @@ Key Configuration Data
 Approval Workflow Tiers
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-+------------------------------+------------------------------+--------+
-| Condition                    | Approvers                    | SLA    |
-+==============================+==============================+========+
-| Priority = Life-Threatening  | Single manager (fast-track)  | 0 days |
-+------------------------------+------------------------------+--------+
-| Value < 100,000 LKR          | District approver            | 1 day  |
-+------------------------------+------------------------------+--------+
-| Value 100,000 - 500,000 LKR  | District → Provincial        | 2 days |
-|                              | (2-tier)                     |        |
-+------------------------------+------------------------------+--------+
-| Value > 500,000 LKR          | District → Provincial →      | 3 days |
-|                              | National DMC (3-tier)        |        |
-+------------------------------+------------------------------+--------+
++-----------------------------+-------------------------------+--------+
+| Condition                   | Approvers                     | SLA    |
++=============================+===============================+========+
+| Priority = Life-Threatening | Single manager (fast-track)   | 0 days |
++-----------------------------+-------------------------------+--------+
+| Value < 100,000 LKR         | District approver             | 1 day  |
++-----------------------------+-------------------------------+--------+
+| Value 100,000 - 500,000 LKR | District → Provincial         | 2 days |
+|                             | (2-tier)                      |        |
++-----------------------------+-------------------------------+--------+
+| Value > 500,000 LKR         | District → Provincial →       | 3 days |
+|                             | National DMC (3-tier)         |        |
++-----------------------------+-------------------------------+--------+
 
 Configuration
 ~~~~~~~~~~~~~
diff --git a/spp_drims_sl/static/description/index.html b/spp_drims_sl/static/description/index.html
index ab35417d..bc3c7f64 100644
--- a/spp_drims_sl/static/description/index.html
+++ b/spp_drims_sl/static/description/index.html
@@ -410,8 +410,8 @@ <h1>Key Configuration Data</h1>
 <h1>Approval Workflow Tiers</h1>
 <table border="1" class="docutils">
 <colgroup>
-<col width="44%" />
-<col width="44%" />
+<col width="43%" />
+<col width="46%" />
 <col width="12%" />
 </colgroup>
 <thead valign="bottom">
diff --git a/spp_gis_indicators/README.rst b/spp_gis_indicators/README.rst
index 01121aa4..8ee6f229 100644
--- a/spp_gis_indicators/README.rst
+++ b/spp_gis_indicators/README.rst
@@ -214,23 +214,21 @@ Preview**.
 
 The **Data Source** tab contains:
 
-+-----------------------------+-----------------------------+----------+
-| Field                       | Description                 | Required |
-+=============================+=============================+==========+
-| **Indicator Variable**      | Dropdown of                 | Yes      |
-|                             | ``spp.cel.variable``        |          |
-|                             | records (no inline          |          |
-|                             | create/open)                |          |
-+-----------------------------+-----------------------------+----------+
-| **Period Key**              | Free-text, defaults to      | No       |
-|                             | "current". Examples:        |          |
-|                             | "2024-12", "current"        |          |
-+-----------------------------+-----------------------------+----------+
-| **Incident/Disaster**       | Dropdown of                 | No       |
-|                             | ``spp.hazard.incident``     |          |
-|                             | records. Filters indicator  |          |
-|                             | data by incident.           |          |
-+-----------------------------+-----------------------------+----------+
++------------------------+----------------------------------+----------+
+| Field                  | Description                      | Required |
++========================+==================================+==========+
+| **Indicator Variable** | Dropdown of ``spp.cel.variable`` | Yes      |
+|                        | records (no inline create/open)  |          |
++------------------------+----------------------------------+----------+
+| **Period Key**         | Free-text, defaults to           | No       |
+|                        | "current". Examples: "2024-12",  |          |
+|                        | "current"                        |          |
++------------------------+----------------------------------+----------+
+| **Incident/Disaster**  | Dropdown of                      | No       |
+|                        | ``spp.hazard.incident`` records. |          |
+|                        | Filters indicator data by        |          |
+|                        | incident.                        |          |
++------------------------+----------------------------------+----------+
 
 Indicator Layer — Form: Visualization Tab
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/spp_gis_indicators/static/description/index.html b/spp_gis_indicators/static/description/index.html
index 6e6f6e27..8e0531b8 100644
--- a/spp_gis_indicators/static/description/index.html
+++ b/spp_gis_indicators/static/description/index.html
@@ -613,8 +613,8 @@ <h1>Indicator Layer — Form: Data Source Tab</h1>
 <p>The <strong>Data Source</strong> tab contains:</p>
 <table border="1" class="docutils">
 <colgroup>
-<col width="43%" />
-<col width="43%" />
+<col width="35%" />
+<col width="50%" />
 <col width="15%" />
 </colgroup>
 <thead valign="bottom">
@@ -625,23 +625,21 @@ <h1>Indicator Layer — Form: Data Source Tab</h1>
 </thead>
 <tbody valign="top">
 <tr><td><strong>Indicator Variable</strong></td>
-<td>Dropdown of
-<tt class="docutils literal">spp.cel.variable</tt>
-records (no inline
-create/open)</td>
+<td>Dropdown of <tt class="docutils literal">spp.cel.variable</tt>
+records (no inline create/open)</td>
 <td>Yes</td>
 </tr>
 <tr><td><strong>Period Key</strong></td>
 <td>Free-text, defaults to
-“current”. Examples:
-“2024-12”, “current”</td>
+“current”. Examples: “2024-12”,
+“current”</td>
 <td>No</td>
 </tr>
 <tr><td><strong>Incident/Disaster</strong></td>
 <td>Dropdown of
-<tt class="docutils literal">spp.hazard.incident</tt>
-records. Filters indicator
-data by incident.</td>
+<tt class="docutils literal">spp.hazard.incident</tt> records.
+Filters indicator data by
+incident.</td>
 <td>No</td>
 </tr>
 </tbody>
diff --git a/spp_hazard/README.rst b/spp_hazard/README.rst
index c65df250..4634a07c 100644
--- a/spp_hazard/README.rst
+++ b/spp_hazard/README.rst
@@ -312,20 +312,20 @@ Log in as **Admin** or **Manager**.
 
 **3.6 Search and Grouping**
 
-+-------+------------------------------+------------------------------+
-| Step  | Action                       | Expected Result              |
-+=======+==============================+==============================+
-| 3.6.1 | Type in search bar, select   | Filters by name              |
-|       | "Name" search                |                              |
-+-------+------------------------------+------------------------------+
-| 3.6.2 | Type in search bar, select   | Filters by code              |
-|       | "Code" search                |                              |
-+-------+------------------------------+------------------------------+
-| 3.6.3 | Use Filters > Active /       | Filters correctly            |
-|       | Inactive                     |                              |
-+-------+------------------------------+------------------------------+
-| 3.6.4 | Use Group By > Parent        | Categories grouped by parent |
-+-------+------------------------------+------------------------------+
++-------+-------------------------------+------------------------------+
+| Step  | Action                        | Expected Result              |
++=======+===============================+==============================+
+| 3.6.1 | Type in search bar, select    | Filters by name              |
+|       | "Name" search                 |                              |
++-------+-------------------------------+------------------------------+
+| 3.6.2 | Type in search bar, select    | Filters by code              |
+|       | "Code" search                 |                              |
++-------+-------------------------------+------------------------------+
+| 3.6.3 | Use Filters > Active /        | Filters correctly            |
+|       | Inactive                      |                              |
++-------+-------------------------------+------------------------------+
+| 3.6.4 | Use Group By > Parent         | Categories grouped by parent |
++-------+-------------------------------+------------------------------+
 
 --------------
 
@@ -365,18 +365,18 @@ Log in as **Admin** or **Manager**.
 
 **4.2 Create an Impact Type**
 
-+-------+------------------------------+------------------------------+
-| Step  | Action                       | Expected Result              |
-+=======+==============================+==============================+
-| 4.2.1 | Click **New**                | Form opens                   |
-+-------+------------------------------+------------------------------+
-| 4.2.2 | Enter Name:                  | Fields accept input          |
-|       | ``Water Contamination``,     |                              |
-|       | Code: ``WATER_CONTAM``,      |                              |
-|       | Category: Health             |                              |
-+-------+------------------------------+------------------------------+
-| 4.2.3 | Save                         | Record saves successfully    |
-+-------+------------------------------+------------------------------+
++-------+----------------------------------+---------------------------+
+| Step  | Action                           | Expected Result           |
++=======+==================================+===========================+
+| 4.2.1 | Click **New**                    | Form opens                |
++-------+----------------------------------+---------------------------+
+| 4.2.2 | Enter Name:                      | Fields accept input       |
+|       | ``Water Contamination``, Code:   |                           |
+|       | ``WATER_CONTAM``, Category:      |                           |
+|       | Health                           |                           |
++-------+----------------------------------+---------------------------+
+| 4.2.3 | Save                             | Record saves successfully |
++-------+----------------------------------+---------------------------+
 
 **4.3 Reorder via Drag**
 
@@ -594,17 +594,17 @@ Use the incident created in 5.2 (starts as "Active").
 
 **5.8 Stat Buttons**
 
-+-------+------------------------------+------------------------------+
-| Step  | Action                       | Expected Result              |
-+=======+==============================+==============================+
-| 5.8.1 | Click "Affected" stat button | Opens Impact Records list    |
-|       |                              | filtered to this incident    |
-+-------+------------------------------+------------------------------+
-| 5.8.2 | Click browser back           | Returns to incident form     |
-+-------+------------------------------+------------------------------+
-| 5.8.3 | Click "Areas" stat button    | Opens Area list filtered to  |
-|       |                              | linked areas                 |
-+-------+------------------------------+------------------------------+
++-------+------------------------------+-------------------------------+
+| Step  | Action                       | Expected Result               |
++=======+==============================+===============================+
+| 5.8.1 | Click "Affected" stat button | Opens Impact Records list     |
+|       |                              | filtered to this incident     |
++-------+------------------------------+-------------------------------+
+| 5.8.2 | Click browser back           | Returns to incident form      |
++-------+------------------------------+-------------------------------+
+| 5.8.3 | Click "Areas" stat button    | Opens Area list filtered to   |
+|       |                              | linked areas                  |
++-------+------------------------------+-------------------------------+
 
 **5.9 Search and Filters (Incident List)**
 
@@ -645,25 +645,24 @@ Use the incident created in 5.2 (starts as "Active").
 
 **5.10 List View Decorations**
 
-+--------+------------------------------+------------------------------+
-| Step   | Action                       | Expected Result              |
-+========+==============================+==============================+
-| 5.10.1 | Check row coloring           | Alert rows: blue tint.       |
-|        |                              | Recovery rows: yellow tint.  |
-|        |                              | Closed rows: grey/muted.     |
-|        |                              | Active rows: default (no     |
-|        |                              | special coloring)            |
-+--------+------------------------------+------------------------------+
-| 5.10.2 | Check Status column badges   | Alert: blue badge. Active:   |
-|        |                              | green badge. Recovery:       |
-|        |                              | yellow badge. Closed: grey   |
-|        |                              | badge                        |
-+--------+------------------------------+------------------------------+
-| 5.10.3 | Check columns visible        | Name, Code, Category, Start  |
-|        |                              | Date, End Date (optional),   |
-|        |                              | Status, Severity, Areas,     |
-|        |                              | Affected                     |
-+--------+------------------------------+------------------------------+
++--------+----------------------------+--------------------------------+
+| Step   | Action                     | Expected Result                |
++========+============================+================================+
+| 5.10.1 | Check row coloring         | Alert rows: blue tint.         |
+|        |                            | Recovery rows: yellow tint.    |
+|        |                            | Closed rows: grey/muted.       |
+|        |                            | Active rows: default (no       |
+|        |                            | special coloring)              |
++--------+----------------------------+--------------------------------+
+| 5.10.2 | Check Status column badges | Alert: blue badge. Active:     |
+|        |                            | green badge. Recovery: yellow  |
+|        |                            | badge. Closed: grey badge      |
++--------+----------------------------+--------------------------------+
+| 5.10.3 | Check columns visible      | Name, Code, Category, Start    |
+|        |                            | Date, End Date (optional),     |
+|        |                            | Status, Severity, Areas,       |
+|        |                            | Affected                       |
++--------+----------------------------+--------------------------------+
 
 --------------
 
@@ -833,22 +832,22 @@ Using the impact created in 6.1 (starts as "Reported"):
 
 **6.7 Impact List Decorations**
 
-+-------+------------------------------+------------------------------+
-| Step  | Action                       | Expected Result              |
-+=======+==============================+==============================+
-| 6.7.1 | Check row coloring           | Reported: blue. Verified:    |
-|       |                              | green. Disputed: yellow.     |
-|       |                              | Closed: grey/muted           |
-+-------+------------------------------+------------------------------+
-| 6.7.2 | Verification Status badges   | Same color coding as rows    |
-+-------+------------------------------+------------------------------+
-| 6.7.3 | Damage Level column          | Shows as badge widget        |
-|       |                              | (neutral color)              |
-+-------+------------------------------+------------------------------+
-| 6.7.4 | Optional columns             | "Verified By" and "Verified  |
-|       |                              | Date" available under column |
-|       |                              | options (hidden by default)  |
-+-------+------------------------------+------------------------------+
++-------+----------------------------+---------------------------------+
+| Step  | Action                     | Expected Result                 |
++=======+============================+=================================+
+| 6.7.1 | Check row coloring         | Reported: blue. Verified:       |
+|       |                            | green. Disputed: yellow.        |
+|       |                            | Closed: grey/muted              |
++-------+----------------------------+---------------------------------+
+| 6.7.2 | Verification Status badges | Same color coding as rows       |
++-------+----------------------------+---------------------------------+
+| 6.7.3 | Damage Level column        | Shows as badge widget (neutral  |
+|       |                            | color)                          |
++-------+----------------------------+---------------------------------+
+| 6.7.4 | Optional columns           | "Verified By" and "Verified     |
+|       |                            | Date" available under column    |
+|       |                            | options (hidden by default)     |
++-------+----------------------------+---------------------------------+
 
 --------------
 
diff --git a/spp_hazard/static/description/index.html b/spp_hazard/static/description/index.html
index e6eb4f50..9df1ed8e 100644
--- a/spp_hazard/static/description/index.html
+++ b/spp_hazard/static/description/index.html
@@ -816,8 +816,8 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 <table border="1" class="docutils">
 <colgroup>
 <col width="10%" />
-<col width="45%" />
-<col width="45%" />
+<col width="46%" />
+<col width="44%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th class="head">Step</th>
@@ -910,8 +910,8 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 <table border="1" class="docutils">
 <colgroup>
 <col width="10%" />
-<col width="45%" />
-<col width="45%" />
+<col width="50%" />
+<col width="40%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th class="head">Step</th>
@@ -926,9 +926,9 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 </tr>
 <tr><td>4.2.2</td>
 <td>Enter Name:
-<tt class="docutils literal">Water Contamination</tt>,
-Code: <tt class="docutils literal">WATER_CONTAM</tt>,
-Category: Health</td>
+<tt class="docutils literal">Water Contamination</tt>, Code:
+<tt class="docutils literal">WATER_CONTAM</tt>, Category:
+Health</td>
 <td>Fields accept input</td>
 </tr>
 <tr><td>4.2.3</td>
@@ -1346,8 +1346,8 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 <table border="1" class="docutils">
 <colgroup>
 <col width="10%" />
-<col width="45%" />
-<col width="45%" />
+<col width="44%" />
+<col width="46%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th class="head">Step</th>
@@ -1447,8 +1447,8 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 <table border="1" class="docutils">
 <colgroup>
 <col width="12%" />
-<col width="44%" />
-<col width="44%" />
+<col width="41%" />
+<col width="47%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th class="head">Step</th>
@@ -1468,9 +1468,8 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 <tr><td>5.10.2</td>
 <td>Check Status column badges</td>
 <td>Alert: blue badge. Active:
-green badge. Recovery:
-yellow badge. Closed: grey
-badge</td>
+green badge. Recovery: yellow
+badge. Closed: grey badge</td>
 </tr>
 <tr><td>5.10.3</td>
 <td>Check columns visible</td>
@@ -1788,8 +1787,8 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 <table border="1" class="docutils">
 <colgroup>
 <col width="10%" />
-<col width="45%" />
-<col width="45%" />
+<col width="41%" />
+<col width="49%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th class="head">Step</th>
@@ -1810,8 +1809,8 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 </tr>
 <tr><td>6.7.3</td>
 <td>Damage Level column</td>
-<td>Shows as badge widget
-(neutral color)</td>
+<td>Shows as badge widget (neutral
+color)</td>
 </tr>
 <tr><td>6.7.4</td>
 <td>Optional columns</td>
diff --git a/spp_security/README.rst b/spp_security/README.rst
index eb8aa096..4e84b6d5 100644
--- a/spp_security/README.rst
+++ b/spp_security/README.rst
@@ -59,17 +59,17 @@ This module defines no model access rights (empty
 ``ir.model.access.csv``). It provides only security groups and record
 rules.
 
-+-----------------------+--------------------------------+----------------------+
-| Group                 | XML ID                         | Purpose              |
-+=======================+================================+======================+
-| Administrator         | ``group_spp_admin``            | Inherits all manager |
-|                       |                                | permissions from all |
-|                       |                                | domains              |
-+-----------------------+--------------------------------+----------------------+
-| Restricted: Self Only | ``group_access_restrict_self`` | Restricts users to   |
-|                       |                                | viewing only their   |
-|                       |                                | own record           |
-+-----------------------+--------------------------------+----------------------+
++----------------------+--------------------------------+----------------------+
+| Group                | XML ID                         | Purpose              |
++======================+================================+======================+
+| Administrator        | ``group_spp_admin``            | Inherits all manager |
+|                      |                                | permissions from all |
+|                      |                                | domains              |
++----------------------+--------------------------------+----------------------+
+| Restricted: Self     | ``group_access_restrict_self`` | Restricts users to   |
+| Only                 |                                | viewing only their   |
+|                      |                                | own record           |
++----------------------+--------------------------------+----------------------+
 
 Record rules:
 
diff --git a/spp_security/static/description/index.html b/spp_security/static/description/index.html
index 9b4154da..e7f92898 100644
--- a/spp_security/static/description/index.html
+++ b/spp_security/static/description/index.html
@@ -406,7 +406,7 @@ <h1>Security</h1>
 rules.</p>
 <table border="1" class="docutils">
 <colgroup>
-<col width="30%" />
+<col width="29%" />
 <col width="42%" />
 <col width="29%" />
 </colgroup>
@@ -423,7 +423,8 @@ <h1>Security</h1>
 permissions from all
 domains</td>
 </tr>
-<tr><td>Restricted: Self Only</td>
+<tr><td>Restricted: Self
+Only</td>
 <td><tt class="docutils literal">group_access_restrict_self</tt></td>
 <td>Restricts users to
 viewing only their

From b890139165098f91e41001259dc24ab13e2c3e58 Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Mon, 8 Jun 2026 16:39:38 +0800
Subject: [PATCH 25/26] fix(drims): address review feedback on inspection
 wizard + picking view (#651)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- integer_positive_required: guard fieldInfo.required before
  evaluateBooleanExpr — an undefined required modifier was passed straight
  to the evaluator and crashed the form view.
- action_remove_split: compute the remaining children before unlink() so
  the One2many cache never reads the unlinked record (MissingError).
- _onchange_quantity_update_parent: drop the eager quantity clamping so the
  operator can freely rebalance split quantities while drafting; an
  over/under-split total is still rejected at confirm time.
- stock_picking_views: target the done-state delivery Print and the Return
  header buttons by action XML ID instead of the fragile data-hotkey /
  contains(@invisible) xpath.
---
 .../src/js/integer_positive_required.js       | 12 ++++----
 spp_drims/views/stock_picking_views.xml       | 11 +++++--
 spp_drims/wizard/inspection_wizard.py         | 30 +++++++++----------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/spp_base_common/static/src/js/integer_positive_required.js b/spp_base_common/static/src/js/integer_positive_required.js
index 13d2d35f..a5e501ea 100644
--- a/spp_base_common/static/src/js/integer_positive_required.js
+++ b/spp_base_common/static/src/js/integer_positive_required.js
@@ -43,11 +43,13 @@ export const integerPositiveRequiredField = {
         // 0, false (unset), or non-numeric — only valid when field is not
         // required. Evaluate the required modifier against the record's
         // eval context (it may be a dynamic expression like
-        // `drims_type == 'request_dispatch'`).
-        const required = evaluateBooleanExpr(
-            fieldInfo.required,
-            record.evalContextWithVirtualIds
-        );
+        // `drims_type == 'request_dispatch'`). `fieldInfo.required` is
+        // undefined for fields with no required modifier; guard against it
+        // so `evaluateBooleanExpr` is never handed `undefined` (which throws
+        // and crashes the form view).
+        const required = fieldInfo.required
+            ? evaluateBooleanExpr(fieldInfo.required, record.evalContextWithVirtualIds)
+            : false;
         return !required;
     },
 };
diff --git a/spp_drims/views/stock_picking_views.xml b/spp_drims/views/stock_picking_views.xml
index 1bc282b6..8a0ea785 100644
--- a/spp_drims/views/stock_picking_views.xml
+++ b/spp_drims/views/stock_picking_views.xml
@@ -100,13 +100,20 @@
                     name="invisible"
                 >state != 'assigned' or drims_type_id</attribute>
             </xpath>
+            <!-- Target the core buttons by their action XML ID rather than by
+                 data-hotkey / invisible-text matching, which breaks if core
+                 changes a hotkey or modifier. The done-state delivery "Print"
+                 and the "Return" buttons are both hidden for DRIMS pickings. -->
             <xpath
-                expr="//header/button[@data-hotkey='o' and contains(@invisible, 'done')]"
+                expr="//header/button[@name='%(stock.action_report_delivery)d']"
                 position="attributes"
             >
                 <attribute name="invisible">state != 'done' or drims_type_id</attribute>
             </xpath>
-            <xpath expr="//header/button[@data-hotkey='k']" position="attributes">
+            <xpath
+                expr="//header/button[@name='%(stock.act_stock_return_picking)d']"
+                position="attributes"
+            >
                 <attribute name="invisible">state != 'done' or drims_type_id</attribute>
             </xpath>
 
diff --git a/spp_drims/wizard/inspection_wizard.py b/spp_drims/wizard/inspection_wizard.py
index 78b42aeb..f8bdd69f 100644
--- a/spp_drims/wizard/inspection_wizard.py
+++ b/spp_drims/wizard/inspection_wizard.py
@@ -292,10 +292,11 @@ def _compute_is_inspected(self):
     def _onchange_quantity_update_parent(self):
         """Keep the parent row qty in sync with the running sum of its children.
 
-        Also clamps the current child's quantity if the new value would push
-        the running total over the parent's ``quantity_expected``: the qty is
-        snapped to ``expected - sum(other_children)`` so the split totals
-        never exceed the donation line's received quantity.
+        No clamping while drafting: the operator can freely adjust split
+        quantities (e.g. rebalance 500/500 to 400/600 without having to lower
+        one row first). An over- or under-split total is rejected at confirm
+        time by ``action_confirm_inspection`` (mirrored client-side by the
+        ``can_confirm`` guard), so eager clamping here only gets in the way.
         """
         if not self.parent_line_id:
             return
@@ -303,10 +304,6 @@ def _onchange_quantity_update_parent(self):
             lambda line: line.parent_line_id == self.parent_line_id and line != self
         )
         others_sum = sum(siblings.mapped("quantity"))
-        expected = self.parent_line_id.quantity_expected
-        max_allowed = expected - others_sum
-        if self.quantity and self.quantity > max_allowed:
-            self.quantity = max(0.0, max_allowed)
         total = others_sum + (self.quantity or 0.0)
         self.parent_line_id.quantity = total
 
@@ -394,16 +391,23 @@ def action_remove_split(self):
             raise UserError(_("Only split lines can be removed this way."))
         wizard_id = self.wizard_id.id
         root_line = self.parent_line_id
+
+        # Identify the children that will remain BEFORE unlinking. Reading the
+        # One2many after unlink can hit the still-cached unlinked record and
+        # raise MissingError when the lambda touches its fields.
+        remaining_children = root_line.wizard_id.line_ids.filtered(
+            lambda line: line.parent_line_id == root_line and line != self
+        )
+
         self.unlink()
 
-        remaining_children = root_line.wizard_id.line_ids.filtered(lambda line: line.parent_line_id == root_line)
         if not remaining_children:
             # Reset parent back to the full expected quantity and clear the
             # split flag so the row reverts to a normal (editable) row.
             root_line.quantity = root_line.quantity_expected
             root_line.has_splits = False
         else:
-            self._refresh_parent_quantity(root_line)
+            root_line.quantity = sum(remaining_children.mapped("quantity"))
 
         return {
             "type": "ir.actions.act_window",
@@ -412,9 +416,3 @@ def action_remove_split(self):
             "view_mode": "form",
             "target": "new",
         }
-
-    @staticmethod
-    def _refresh_parent_quantity(parent):
-        """Recompute the parent qty as the sum of its child rows."""
-        children = parent.wizard_id.line_ids.filtered(lambda line: line.parent_line_id == parent)
-        parent.quantity = sum(children.mapped("quantity"))

From cfd8dee404bf8eae307084e8df2fde7f4c8eac8f Mon Sep 17 00:00:00 2001
From: emjay0921 <michael@acn.fr>
Date: Mon, 8 Jun 2026 17:02:21 +0800
Subject: [PATCH 26/26] feat(drims): split a line into two rows on first split
 (#651)

The first '+ Add split' on an inspection line now divides it into two empty
child rows (a split produces at least two pieces); each later '+ Add split'
appends one more. All new rows start at qty 0 so the operator must enter each
amount explicitly. Update the wizard split tests to the two-children-first
behaviour.
---
 spp_drims/tests/test_wizard.py        | 99 ++++++++++-----------------
 spp_drims/wizard/inspection_wizard.py | 36 ++++++----
 2 files changed, 59 insertions(+), 76 deletions(-)

diff --git a/spp_drims/tests/test_wizard.py b/spp_drims/tests/test_wizard.py
index 7b9f4f1e..38c30841 100644
--- a/spp_drims/tests/test_wizard.py
+++ b/spp_drims/tests/test_wizard.py
@@ -396,25 +396,15 @@ def test_inspection_wizard_split_mismatch_still_raises(self):
         parent = wizard.line_ids[0]
 
         # Create a split via the real button so parent/child wiring is correct.
+        # The first split divides the row into two empty children.
         parent.action_add_split()
-        children = wizard.line_ids.filtered("is_split")
-        self.assertEqual(len(children), 1)
-        child_a = children[0]
+        children = wizard.line_ids.filtered("is_split").sorted(key=lambda line: line.id)
+        self.assertEqual(len(children), 2)
+        child_a, child_b = children[0], children[1]
 
-        # Deliberately make the totals not match expected.
+        # Deliberately make the totals not match expected (800 + 150 = 950 ≠ 1000).
         child_a.quantity = 800
-        InspectionLine = self.env["spp.drims.inspection.wizard.line"]
-        child_b = InspectionLine.create(
-            {
-                "wizard_id": wizard.id,
-                "donation_line_id": parent.donation_line_id.id,
-                "product_id": parent.product_id.id,
-                "uom_id": parent.uom_id.id,
-                "quantity_expected": parent.quantity_expected,
-                "quantity": 150,  # 800 + 150 = 950 ≠ 1000
-                "parent_line_id": parent.id,
-            }
-        )
+        child_b.quantity = 150
         self._set_inspection(child_a, self.condition_new, self.disposition_accept)
         self._set_inspection(child_b, self.condition_damaged, self.disposition_return)
 
@@ -462,27 +452,28 @@ def test_inspection_wizard_only_received_donations(self):
         with self.assertRaises(UserError):
             donation.action_open_inspection_wizard()
 
-    def test_add_split_creates_child_line(self):
-        """OP#963: action_add_split creates a child with parent_line_id set
-        and starts the child at qty=0 (the operator must fill it explicitly)."""
+    def test_add_split_creates_two_child_lines(self):
+        """OP#963: the first action_add_split divides the row into two child
+        splits (parent + 2 children), each with parent_line_id set and starting
+        at qty=0 (the operator must fill them explicitly)."""
         donation = self._create_received_donation(quantity=1000)
         wizard = self._open_inspection_wizard(donation)
         parent = wizard.line_ids[0]
 
         parent.action_add_split()
-        self.assertEqual(len(wizard.line_ids), 2)
+        self.assertEqual(len(wizard.line_ids), 3)
 
         children = wizard.line_ids.filtered("is_split")
-        self.assertEqual(len(children), 1)
-        child = children[0]
-        self.assertEqual(child.parent_line_id, parent)
-        # New split children are created with qty 0 — the operator fills
-        # the row themselves.
-        self.assertEqual(child.quantity, 0)
+        self.assertEqual(len(children), 2)
+        for child in children:
+            self.assertEqual(child.parent_line_id, parent)
+            # New split children are created with qty 0 — the operator fills
+            # the rows themselves.
+            self.assertEqual(child.quantity, 0)
         # Parent qty mirrors the child running total (also 0).
         self.assertEqual(parent.quantity, 0)
         self.assertTrue(parent.has_splits)
-        # Parent is not yet "fully split" until the child is filled.
+        # Parent is not yet "fully split" until the children are filled.
         self.assertFalse(parent.is_fully_split)
 
     def test_add_split_subsequent_splits_are_also_zero(self):
@@ -493,13 +484,13 @@ def test_add_split_subsequent_splits_are_also_zero(self):
         wizard = self._open_inspection_wizard(donation)
         parent = wizard.line_ids[0]
 
-        parent.action_add_split()
+        parent.action_add_split()  # first split -> two children
         children = wizard.line_ids.filtered("is_split")
         children[0].quantity = 700
 
-        parent.action_add_split()
+        parent.action_add_split()  # subsequent split -> one more child
         children = wizard.line_ids.filtered("is_split")
-        self.assertEqual(len(children), 2)
+        self.assertEqual(len(children), 3)
         new_child = children.sorted(key=lambda line: line.id)[-1]
         # New child starts at 0; running parent total stays at 700.
         self.assertEqual(new_child.quantity, 0)
@@ -529,10 +520,16 @@ def test_remove_split_resets_parent_qty(self):
 
         parent.action_add_split()
         children = wizard.line_ids.filtered("is_split")
-        self.assertEqual(len(children), 1)
+        self.assertEqual(len(children), 2)
+
+        # Removing one child leaves the parent split with the other.
         children[0].action_remove_split()
+        remaining = wizard.line_ids.filtered("is_split")
+        self.assertEqual(len(remaining), 1)
+        self.assertTrue(parent.has_splits)
 
-        # Parent is the only line left, back to expected qty.
+        # Removing the last child reverts the parent to a normal row.
+        remaining.action_remove_split()
         self.assertEqual(len(wizard.line_ids), 1)
         self.assertEqual(parent.quantity, 1000)
         self.assertFalse(parent.has_splits)
@@ -561,22 +558,11 @@ def test_confirm_ignores_parent_row_when_splits_exist(self):
         parent = wizard.line_ids[0]
 
         parent.action_add_split()
-        children = wizard.line_ids.filtered("is_split")
-        child_a = children[0]
+        children = wizard.line_ids.filtered("is_split").sorted(key=lambda line: line.id)
+        self.assertEqual(len(children), 2)
+        child_a, child_b = children[0], children[1]
         child_a.quantity = 700
-
-        InspectionLine = self.env["spp.drims.inspection.wizard.line"]
-        child_b = InspectionLine.create(
-            {
-                "wizard_id": wizard.id,
-                "donation_line_id": parent.donation_line_id.id,
-                "product_id": parent.product_id.id,
-                "uom_id": parent.uom_id.id,
-                "quantity_expected": parent.quantity_expected,
-                "quantity": 300,
-                "parent_line_id": parent.id,
-            }
-        )
+        child_b.quantity = 300
 
         # Parent has no condition/action; children do — Confirm must succeed.
         self._set_inspection(child_a, self.condition_new, self.disposition_accept)
@@ -599,22 +585,11 @@ def test_inspection_confirms_and_creates_splits(self):
         parent = wizard.line_ids[0]
 
         parent.action_add_split()
-        children = wizard.line_ids.filtered("is_split")
-        child_a = children[0]
+        children = wizard.line_ids.filtered("is_split").sorted(key=lambda line: line.id)
+        self.assertEqual(len(children), 2)
+        child_a, child_b = children[0], children[1]
         child_a.quantity = 800
-
-        InspectionLine = self.env["spp.drims.inspection.wizard.line"]
-        child_b = InspectionLine.create(
-            {
-                "wizard_id": wizard.id,
-                "donation_line_id": parent.donation_line_id.id,
-                "product_id": parent.product_id.id,
-                "uom_id": parent.uom_id.id,
-                "quantity_expected": parent.quantity_expected,
-                "quantity": 200,
-                "parent_line_id": parent.id,
-            }
-        )
+        child_b.quantity = 200
         self._set_inspection(child_a, self.condition_new, self.disposition_accept)
         self._set_inspection(child_b, self.condition_damaged, self.disposition_return)
 
diff --git a/spp_drims/wizard/inspection_wizard.py b/spp_drims/wizard/inspection_wizard.py
index f8bdd69f..2b75671f 100644
--- a/spp_drims/wizard/inspection_wizard.py
+++ b/spp_drims/wizard/inspection_wizard.py
@@ -346,34 +346,42 @@ def action_add_split(self):
         # the running sum of children), mark the parent as split, and clear
         # any Condition / Action the operator may have set before deciding
         # to split — the parent row carries no decision; the children do.
+        # The first split divides the row into TWO empty parts (a split has
+        # to produce at least two pieces); each later "+ Add split" appends
+        # one more part.
         if not child_lines:
             root_line.quantity = 0
             root_line.condition_id = False
             root_line.disposition_id = False
             root_line.has_splits = True
+            splits_to_create = 2
+        else:
+            splits_to_create = 1
 
-        # Create the new split with qty=0 so the operator has to enter the
+        # Create each new split with qty=0 so the operator has to enter the
         # split amount explicitly. The "+ Add split" button is then hidden
         # in the UI while any child still has qty=0, forcing the operator
-        # to fill the new row before opening another. This avoids the
+        # to fill the new rows before opening another. This avoids the
         # "I added a split but forgot to set its quantity" footgun.
         self.env["spp.drims.inspection.wizard.line"].create(
-            {
-                "wizard_id": self.wizard_id.id,
-                "donation_line_id": root_line.donation_line_id.id,
-                "product_id": root_line.product_id.id,
-                "uom_id": root_line.uom_id.id,
-                "quantity_expected": root_line.quantity_expected,
-                "quantity": 0,
-                "parent_line_id": root_line.id,
-            }
+            [
+                {
+                    "wizard_id": self.wizard_id.id,
+                    "donation_line_id": root_line.donation_line_id.id,
+                    "product_id": root_line.product_id.id,
+                    "uom_id": root_line.uom_id.id,
+                    "quantity_expected": root_line.quantity_expected,
+                    "quantity": 0,
+                    "parent_line_id": root_line.id,
+                }
+                for _ in range(splits_to_create)
+            ]
         )
 
-        # Running total is unchanged because the new child contributes 0;
+        # Running total is unchanged because the new children contribute 0;
         # the parent still mirrors the sum of existing children.
         root_line.quantity = total_in_splits
-        # The new child has qty 0, so by definition the parent is not yet
-        # fully split.
+        # The new children have qty 0, so the parent is not yet fully split.
         root_line.is_fully_split = False
 
         return {