[IMP] purchase_manual_delivery: rely on qty_received instead of 'done' stock moves

Rename existing_qty to qty_in_receipt. It now reflects the quantity for which there
are pending stock moves and no longer includes the quantities of 'done' stock moves.

Co-authored-by: Cas Vissers <[email protected]>

Author: StefanRijnhart

purchase_manual_delivery/migrations/17.0.1.0.0/pre-migration.py

@@ -0,0 +1,16 @@
+from odoo.tools.sql import column_exists
+
+
+def migrate(cr, version):
+    """Initialize qty_in_receipt as existing_qty - qty_received"""
+    if not column_exists(cr, "purchase_order_line", "qty_in_receipt") and column_exists(
+        cr, "purchase_order_line", "existing_qty"
+    ):
+        cr.execute(
+            """
+            alter table purchase_order_line
+            add column qty_in_receipt numeric;
+            update purchase_order_line
+            set qty_in_receipt = coalesce(existing_qty, 0) - coalesce(qty_received, 0);
+            """
+        )

purchase_manual_delivery/models/product_product.py

@@ -32,17 +32,25 @@ def _get_quantity_in_progress(self, location_ids=False, warehouse_ids=False):
                 "product_uom",
                 "orderpoint_id",
             ],
-            ["product_qty:sum", "existing_qty:sum"],
+            ["product_qty:sum", "qty_in_receipt:sum", "qty_received:sum"],
         )
-        for product, order, uom, orderpoint, product_qty, existing_qty in groups:
+        for (
+            product,
+            order,
+            uom,
+            orderpoint,
+            product_qty,
+            qty_in_receipt,
+            qty_received,
+        ) in groups:
             if orderpoint:
                 location = orderpoint.location_id
             else:
                 location = order.picking_type_id.default_location_dest_id
             product_qty = uom._compute_quantity(
                 product_qty, product.uom_id, round=False
             )
-            remaining_qty = product_qty - existing_qty
+            remaining_qty = product_qty - (qty_in_receipt + qty_received)
             qty_by_product_location[(product.id, location.id)] += remaining_qty
             qty_by_product_wh[(product.id, location.warehouse_id.id)] += remaining_qty
         return qty_by_product_location, qty_by_product_wh

purchase_manual_delivery/models/purchase_order.py

@@ -52,15 +52,14 @@ def _create_picking(self):
 class PurchaseOrderLine(models.Model):
     _inherit = "purchase.order.line"
 
-    existing_qty = fields.Float(
-        compute="_compute_existing_qty",
+    qty_in_receipt = fields.Float(
+        compute="_compute_qty_in_receipt",
         store=True,
-        string="Existing Quantity",
         digits="Product Unit of Measure",
-        help="Quantity already planned or shipped (stock movements " "already created)",
+        help="Quantity for which there are pending stock moves",
     )
     pending_to_receive = fields.Boolean(
-        compute="_compute_existing_qty",
+        compute="_compute_qty_in_receipt",
         store=True,
         string="Pending Qty to Receive",
         help="There is pending quantity to receive not yet planned",
@@ -72,15 +71,17 @@ class PurchaseOrderLine(models.Model):
         "move_ids.location_id",
         "move_ids.location_dest_id",
         "product_uom_qty",
+        "qty_received",
+        "state",
     )
-    def _compute_existing_qty(self):
+    def _compute_qty_in_receipt(self):
         for line in self:
             precision_digits = self.env["decimal.precision"].precision_get(
                 "Product Unit of Measure"
             )
             total = 0.0
             for move in line.move_ids:
-                if move.state not in ["cancel"]:
+                if move.state not in ["cancel", "done"]:
                     if (
                         move.location_id
                         == self.order_id.picking_type_id.default_location_dest_id
@@ -106,11 +107,11 @@ def _compute_existing_qty(self):
                         total += move.product_uom._compute_quantity(
                             move.quantity, line.product_uom
                         )
-            line.existing_qty = total
+            line.qty_in_receipt = total
             if (
                 float_compare(
                     line.product_qty,
-                    line.existing_qty,
+                    line.qty_in_receipt + line.qty_received,
                     precision_digits=precision_digits,
                 )
                 == 1

purchase_manual_delivery/report/stock_forecasted.py

@@ -18,7 +18,11 @@ def _get_report_header(self, product_template_ids, product_ids, wh_location_ids)
         if warehouse_id:
             domain += [("order_id.picking_type_id.warehouse_id", "=", warehouse_id)]
         po_lines = self.env["purchase.order.line"].search(domain)
-        in_sum = sum(po_lines.mapped(lambda po: po.product_qty - po.existing_qty))
+        in_sum = sum(
+            po_lines.mapped(
+                lambda pol: pol.product_qty - (pol.qty_in_receipt + pol.qty_received)
+            )
+        )
         res["no_delivery_purchase_qty"] = in_sum
         res["no_delivery_purchase_orders"] = (
             po_lines.mapped("order_id").sorted("name").read(fields=["id", "name"])

purchase_manual_delivery/tests/test_purchase_manual_delivery.py

@@ -90,8 +90,8 @@ def test_01_purchase_order_manual_delivery(self):
         self.po1.button_confirm_manual()
         self.assertTrue(self.po1_line1.pending_to_receive)
         self.assertTrue(self.po1_line2.pending_to_receive)
-        self.assertEqual(self.po1_line1.existing_qty, 0)
-        self.assertEqual(self.po1_line2.existing_qty, 0)
+        self.assertEqual(self.po1_line1.qty_in_receipt, 0)
+        self.assertEqual(self.po1_line2.qty_in_receipt, 0)
         self.assertFalse(
             self.po1.picking_ids,
             "Purchase Manual Delivery: no picking should had been created",
@@ -172,8 +172,8 @@ def test_01_purchase_order_manual_delivery(self):
         )
         self.assertFalse(self.po1_line1.pending_to_receive)
         self.assertFalse(self.po1_line2.pending_to_receive)
-        self.assertEqual(self.po1_line1.existing_qty, self.po1_line1.product_qty)
-        self.assertEqual(self.po1_line2.existing_qty, self.po1_line2.product_qty)
+        self.assertEqual(self.po1_line1.qty_in_receipt, self.po1_line1.product_qty)
+        self.assertEqual(self.po1_line2.qty_in_receipt, self.po1_line2.product_qty)
         self.assertFalse(self.po1.pending_to_receive)
 
         # Process the picking
@@ -209,11 +209,11 @@ def test_01_purchase_order_manual_delivery(self):
         )
         return_wiz.create_returns()
 
-        # The refund line is open to receive the returned item
+        # The refund line is open to re-receive the returned item
         self.assertTrue(self.po1_line1.pending_to_receive)
-        self.assertEqual(self.po1_line1.existing_qty, self.po1_line1.product_qty - 2)
+        self.assertEqual(self.po1_line1.qty_in_receipt, -2)
         # But the non-refund line is not
-        self.assertEqual(self.po1_line2.existing_qty, self.po1_line2.product_qty)
+        self.assertFalse(self.po1_line2.qty_in_receipt)
         self.assertFalse(self.po1_line2.pending_to_receive)
 
         self.assertTrue(self.po1.pending_to_receive)
@@ -231,10 +231,10 @@ def test_02_purchase_order_line_manual_delivery(self):
         self.assertTrue(self.po1_line2.pending_to_receive)
         self.assertTrue(self.po2_line1.pending_to_receive)
         self.assertTrue(self.po2_line2.pending_to_receive)
-        self.assertEqual(self.po1_line1.existing_qty, 0)
-        self.assertEqual(self.po1_line2.existing_qty, 0)
-        self.assertEqual(self.po2_line1.existing_qty, 0)
-        self.assertEqual(self.po2_line2.existing_qty, 0)
+        self.assertEqual(self.po1_line1.qty_in_receipt, 0)
+        self.assertEqual(self.po1_line2.qty_in_receipt, 0)
+        self.assertEqual(self.po2_line1.qty_in_receipt, 0)
+        self.assertEqual(self.po2_line2.qty_in_receipt, 0)
         with self.assertRaises(UserError):
             # create a manual delivery for two lines different PO
             self.env["create.stock.picking.wizard"].with_context(
@@ -266,10 +266,10 @@ def test_02_purchase_order_line_manual_delivery(self):
         self.assertTrue(self.po1_line2.pending_to_receive)
         self.assertFalse(self.po2_line1.pending_to_receive)
         self.assertFalse(self.po2_line2.pending_to_receive)
-        self.assertEqual(self.po1_line1.existing_qty, 0)
-        self.assertEqual(self.po1_line2.existing_qty, 0)
-        self.assertEqual(self.po2_line1.existing_qty, self.po2_line1.product_qty)
-        self.assertEqual(self.po2_line2.existing_qty, self.po2_line2.product_qty)
+        self.assertEqual(self.po1_line1.qty_in_receipt, 0)
+        self.assertEqual(self.po1_line2.qty_in_receipt, 0)
+        self.assertEqual(self.po2_line1.qty_in_receipt, self.po2_line1.product_qty)
+        self.assertEqual(self.po2_line2.qty_in_receipt, self.po2_line2.product_qty)
 
     def test_03_purchase_order_line_location(self):
         """
@@ -282,8 +282,8 @@ def test_03_purchase_order_line_location(self):
         self.po1.button_confirm_manual()
         self.assertTrue(self.po1_line1.pending_to_receive)
         self.assertTrue(self.po1_line2.pending_to_receive)
-        self.assertEqual(self.po1_line1.existing_qty, 0)
-        self.assertEqual(self.po1_line2.existing_qty, 0)
+        self.assertEqual(self.po1_line1.qty_in_receipt, 0)
+        self.assertEqual(self.po1_line2.qty_in_receipt, 0)
         # create a manual delivery for one line (product1)
         wizard = (
             self.env["create.stock.picking.wizard"]
@@ -307,8 +307,8 @@ def test_03_purchase_order_line_location(self):
         self.assertEqual(picking_id.location_dest_id, self.shelf2)
         self.assertFalse(self.po1_line1.pending_to_receive)
         self.assertTrue(self.po1_line2.pending_to_receive)
-        self.assertEqual(self.po1_line1.existing_qty, self.po1_line1.product_qty)
-        self.assertEqual(self.po1_line2.existing_qty, 0)
+        self.assertEqual(self.po1_line1.qty_in_receipt, self.po1_line1.product_qty)
+        self.assertEqual(self.po1_line2.qty_in_receipt, 0)
 
     def test_04_pending_to_receive(self):
         """
@@ -409,11 +409,22 @@ def test_05_purchase_order_in_progress(self):
         wizard.line_ids[0].qty = 2
         wizard.create_stock_picking()
         po_in_progress.picking_ids[0].button_validate()
+
+        self.assertEqual(po_in_progress.order_line.qty_received, 2)
+        self.assertEqual(po_in_progress.order_line.qty_in_receipt, 0)
+        self.assertTrue(po_in_progress.order_line.pending_to_receive)
+
         qty, _ = product_in_progress._get_quantity_in_progress(
             location_ids=location.ids
         )
         self.assertEqual(qty.get((product_in_progress.id, location.id)), 3)
 
+        wizard.line_ids[0].qty = 3
+        wizard.create_stock_picking()
+        self.assertEqual(po_in_progress.order_line.qty_received, 2)
+        self.assertEqual(po_in_progress.order_line.qty_in_receipt, 3)
+        self.assertFalse(po_in_progress.order_line.pending_to_receive)
+
     def test_06_purchase_order_manual_delivery_double_validation(self):
         """
         Confirm Purchase Order 1, check no incoming shipments have been
@@ -460,7 +471,7 @@ def test_06_purchase_order_manual_delivery_double_validation(self):
         # confirm RFQ
         self.po.button_confirm_manual()
         self.assertTrue(self.po.order_line.pending_to_receive)
-        self.assertEqual(self.po.order_line.existing_qty, 0)
+        self.assertEqual(self.po.order_line.qty_in_receipt, 0)
         self.assertFalse(
             self.po.picking_ids,
             "Purchase Manual Delivery: no picking should had been created",
@@ -471,7 +482,7 @@ def test_06_purchase_order_manual_delivery_double_validation(self):
         self.po.env.user.groups_id += self.env.ref("purchase.group_purchase_manager")
         self.po.button_approve()
         self.assertTrue(self.po.order_line.pending_to_receive)
-        self.assertEqual(self.po.order_line.existing_qty, 0)
+        self.assertEqual(self.po.order_line.qty_in_receipt, 0)
         self.assertFalse(
             self.po.picking_ids,
             "Purchase Manual Delivery: no picking should had been created",

purchase_manual_delivery/tests/test_report_forecast.py

@@ -42,7 +42,15 @@ def test_report_forecast(self):
             .create({})
         )
         wizard.fill_lines(self.po1.order_line)
-        wizard.line_ids.qty = 35
+        # Transfer a quantity of 12
+        wizard.line_ids.qty = 12
+        wizard.create_stock_picking()
+        picking = self.po1.picking_ids
+        picking.move_line_ids.quantity = 12
+        picking.button_validate()
+
+        # Create an unvalidated picking with a quantity of 23
+        wizard.line_ids.qty = 23
         wizard.create_stock_picking()
 
         # Checks the report.
@@ -51,6 +59,7 @@ def test_report_forecast(self):
         )
         self.assertEqual(docs["no_delivery_purchase_qty"], 7)
         self.assertEqual(docs["qty"]["in"], 7)
+        self.assertEqual(docs["quantity_on_hand"], 12)
         self.assertEqual(docs["virtual_available"], 35)
         self.assertEqual(
             docs["no_delivery_purchase_orders"],

purchase_manual_delivery/views/purchase_order_views.xml

@@ -42,9 +42,9 @@
                 />
             </button>
             <field name="qty_received" position="before">
-                <field name="pending_to_receive" invisible="1" />
+                <field name="pending_to_receive" column_invisible="1" />
                 <field
-                    name="existing_qty"
+                    name="qty_in_receipt"
                     optional="hide"
                     column_invisible="parent.state not in ('purchase', 'done')"
                 />
@@ -73,10 +73,10 @@
                 >state == 'purchase' and pending_to_receive</attribute>
             </xpath>
             <field name="product_qty" position="after">
-                <field name="existing_qty" />
+                <field name="qty_in_receipt" />
             </field>
             <field name="date_planned" position="after">
-                <field name="pending_to_receive" />
+                <field name="pending_to_receive" optional="hide" />
                 <field name="state" invisible="1" />
             </field>
         </field>

purchase_manual_delivery/wizard/create_manual_stock_picking.py

@@ -68,17 +68,9 @@ def fill_lines(self, po_lines):
                 {
                     "purchase_order_line_id": line.id,
                     "name": line.name,
-                    "product_id": line.product_id.id,
-                    "date_planned": line.date_planned,
-                    "price_unit": line.price_unit,
-                    "product_qty": line.product_qty,
-                    "existing_qty": line.existing_qty,
-                    "remaining_qty": line.product_qty - line.existing_qty,
-                    "qty": line.product_qty - line.existing_qty,
-                    "product_uom": line.product_uom.id,
-                    "currency_id": line.currency_id.id,
-                    "partner_id": line.partner_id.id,
-                    # 'taxes_id': line.taxes_id.ids,
+                    "remaining_qty": line.product_qty
+                    - (line.qty_in_receipt + line.qty_received),
+                    "qty": line.product_qty - (line.qty_in_receipt + line.qty_received),
                 },
             )
             for line in po_lines
@@ -191,15 +183,17 @@ class CreateManualStockPickingWizardLine(models.TransientModel):
         related="purchase_order_line_id.product_qty",
         digits="Product Unit of Measure",
     )
-    existing_qty = fields.Float(
-        string="Existing Quantity",
-        related="purchase_order_line_id.existing_qty",
+    qty_in_receipt = fields.Float(
+        related="purchase_order_line_id.qty_in_receipt",
+        digits="Product Unit of Measure",
+    )
+    qty_received = fields.Float(
+        related="purchase_order_line_id.qty_received",
         digits="Product Unit of Measure",
     )
     remaining_qty = fields.Float(
         string="Remaining Quantity",
         compute="_compute_remaining_qty",
-        readonly=True,
         digits="Product Unit of Measure",
     )
     qty = fields.Float(
@@ -208,7 +202,7 @@ class CreateManualStockPickingWizardLine(models.TransientModel):
         help="This is the quantity taken into account to create the picking",
     )
     price_unit = fields.Float(
-        related="purchase_order_line_id.price_unit", readonly=True
+        related="purchase_order_line_id.price_unit",
     )
     currency_id = fields.Many2one(
         "res.currency", related="purchase_order_line_id.currency_id"
@@ -224,7 +218,9 @@ class CreateManualStockPickingWizardLine(models.TransientModel):
 
     def _compute_remaining_qty(self):
         for line in self:
-            line.remaining_qty = line.product_qty - line.existing_qty
+            line.remaining_qty = line.product_qty - (
+                line.qty_in_receipt + line.qty_received
+            )
 
     def _prepare_stock_moves(self, picking):
         po_line = self.purchase_order_line_id

purchase_manual_delivery/wizard/create_manual_stock_picking.xml

@@ -25,13 +25,14 @@
                 </group>
                 <field name="line_ids" nolabel="1">
                     <tree create="false" editable="bottom">
-                        <field name="purchase_order_line_id" invisible="1" />
+                        <field name="purchase_order_line_id" column_invisible="1" />
                         <field name="product_id" />
                         <field name="partner_id" />
                         <field name="date_planned" />
                         <field name="price_unit" />
                         <field name="product_qty" string="Ordered Qty" />
-                        <field name="existing_qty" string="Existing Qty" />
+                        <field name="qty_received" />
+                        <field name="qty_in_receipt" />
                         <field name="remaining_qty" string="Remaining Qty" />
                         <field name="qty" string="Quantity" />
                         <field name="product_uom" groups="uom.group_uom" />