[FIX]purchase_manual_delivery: pending in forecast

Purchase Order Lines that are pending to receive are not considered for stock forecast. Thus, the manual and automatic reordering of products can be done despite having already create a Purchase Order and surpassing the max quantity. Confirmed Purchase Orders with pending to receive Purchase Order Lines are now considered at the forecast and the forecast report.

Author: ChristophAbenthungCibex

purchase_manual_delivery/__init__.py

@@ -1,2 +1,3 @@
 from . import models
+from . import report
 from . import wizard

purchase_manual_delivery/__manifest__.py

@@ -19,4 +19,9 @@
         "views/purchase_order_views.xml",
         "views/res_config_view.xml",
     ],
+    "assets": {
+        "web.assets_backend": [
+            "purchase_manual_delivery/static/src/**/*",
+        ]
+    },
 }

purchase_manual_delivery/models/__init__.py

@@ -1,3 +1,4 @@
+from . import product_product
 from . import res_company
 from . import res_config
 from . import purchase_order

purchase_manual_delivery/models/product_product.py

@@ -0,0 +1,58 @@
+from odoo import models
+
+
+class ProductProduct(models.Model):
+    _inherit = "product.product"
+
+    def _get_pending_lines_domain(self, location_ids=False, warehouse_ids=False):
+        domain = self._get_lines_domain(location_ids, warehouse_ids)
+        for domain_part in domain:
+            if (
+                isinstance(domain_part, tuple)
+                and len(domain_part) == 3
+                and domain_part[0] == "state"
+            ):
+                domain_index = domain.index(domain_part)
+                domain[domain_index] = ("state", "in", ("purchase", "done"))
+                domain.insert(domain_index + 1, ("pending_to_receive", "=", True))
+                domain.insert(domain_index, "&")
+                break
+        return domain
+
+    def _get_quantity_in_progress(self, location_ids=False, warehouse_ids=False):
+        qty_by_product_location, qty_by_product_wh = super()._get_quantity_in_progress(
+            location_ids, warehouse_ids
+        )
+        domain = self._get_pending_lines_domain(location_ids, warehouse_ids)
+        groups = self.env["purchase.order.line"]._read_group(
+            domain,
+            [
+                "product_id",
+                "product_qty",
+                "order_id",
+                "product_uom",
+                "orderpoint_id",
+                "existing_qty",
+            ],
+            ["order_id", "product_id", "product_uom", "orderpoint_id"],
+            lazy=False,
+        )
+        for group in groups:
+            if group.get("orderpoint_id"):
+                location = (
+                    self.env["stock.warehouse.orderpoint"]
+                    .browse(group["orderpoint_id"][:1])
+                    .location_id
+                )
+            else:
+                order = self.env["purchase.order"].browse(group["order_id"][0])
+                location = order.picking_type_id.default_location_dest_id
+            product = self.env["product.product"].browse(group["product_id"][0])
+            uom = self.env["uom.uom"].browse(group["product_uom"][0])
+            product_qty = uom._compute_quantity(
+                group["product_qty"], product.uom_id, round=False
+            )
+            remaining_qty = product_qty - group["existing_qty"]
+            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/report/__init__.py

@@ -0,0 +1 @@
+from . import stock_forecasted

purchase_manual_delivery/report/stock_forecasted.py

@@ -0,0 +1,35 @@
+from odoo import models
+
+
+class ReplenishmentReport(models.AbstractModel):
+    _inherit = "report.stock.report_product_product_replenishment"
+
+    def _serialize_docs(
+        self, docs, product_template_ids=False, product_variant_ids=False
+    ):
+        res = super()._serialize_docs(docs, product_template_ids, product_variant_ids)
+        res["no_delivery_purchase_orders"] = docs["no_delivery_purchase_orders"].read(
+            fields=["id", "name"]
+        )
+        return res
+
+    def _compute_draft_quantity_count(
+        self, product_template_ids, product_variant_ids, wh_location_ids
+    ):
+        res = super()._compute_draft_quantity_count(
+            product_template_ids, product_variant_ids, wh_location_ids
+        )
+        domain = [
+            ("state", "in", ["purchase", "done"]),
+            ("pending_to_receive", "=", True),
+        ]
+        domain += self._product_domain(product_template_ids, product_variant_ids)
+        warehouse_id = self.env.context.get("warehouse", False)
+        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))
+        res["no_delivery_purchase_qty"] = in_sum
+        res["no_delivery_purchase_orders"] = po_lines.mapped("order_id").sorted("name")
+        res["qty"]["in"] += in_sum
+        return res

purchase_manual_delivery/static/src/purchase_manual_delivery_forecasted/forecasted_details.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<templates id="template" xml:space="preserve">
+    <t
+        t-name="purchase_manual_delivery.ForecastedDetails"
+        owl="1"
+        t-inherit="stock.ForecastedDetails"
+        t-inherit-mode="extension"
+    >
+        <xpath expr="//tr[@name='draft_po_in']" position="after">
+            <tr t-if="props.docs.no_delivery_purchase_qty" name="no_delivery_in">
+                <td colspan="2"> Requests without delivery</td>
+                <td
+                    t-out="_formatFloat(props.docs.no_delivery_purchase_qty)"
+                    class="text-end"
+                />
+                <td>
+                    <t
+                        t-foreach="props.docs.no_delivery_purchase_orders"
+                        t-as="purchase_order"
+                        t-key="purchase_order_index"
+                    >
+                        <t t-if="purchase_order_index > 0"> | </t>
+                        <a
+                            t-attf-href="#"
+                            t-out="purchase_order.name"
+                            class="fw-bold"
+                            t-on-click.prevent="() => this.props.openView('purchase.order', 'form', purchase_order.id)"
+                        />
+                    </t>
+                </td>
+            </tr>
+        </xpath>
+    </t>
+</templates>

purchase_manual_delivery/tests/test_purchase_manual_delivery.py

@@ -301,3 +301,59 @@ def test_04_pending_to_receive(self):
 
         # The PO Line should not be pending to receive
         self.assertFalse(po_existing_bigger.pending_to_receive)
+
+    def test_05_purchase_order_in_progress(self):
+        """
+        Create a new Product and Purchase Order.
+        Confirm Purchase Order and create a Picking with only a partial amount of
+        the selected amount of the Purchase Order Line. Confirm the Picking.
+        The quantity in progress is the pending to receive quantity of the Purchase
+        Order Line.
+        """
+        product_in_progress = self.env["product.product"].create(
+            {
+                "name": "Test product pending",
+                "type": "product",
+                "list_price": 1,
+                "standard_price": 1,
+            }
+        )
+        po_in_progress = self.purchase_order_obj.create(
+            {
+                "partner_id": self.ref("base.res_partner_3"),
+            }
+        )
+        self.purchase_order_line_obj.create(
+            {
+                "order_id": po_in_progress.id,
+                "product_id": product_in_progress.id,
+                "product_uom": product_in_progress.uom_id.id,
+                "name": product_in_progress.name,
+                "price_unit": product_in_progress.standard_price,
+                "date_planned": fields.datetime.now(),
+                "product_qty": 5.0,
+            }
+        )
+        po_in_progress.button_confirm_manual()
+        location = self.env["stock.location"].browse(
+            po_in_progress.picking_type_id.default_location_dest_id.id
+        )
+        wizard = (
+            self.env["create.stock.picking.wizard"]
+            .with_context(
+                **{
+                    "active_model": "purchase.order",
+                    "active_id": po_in_progress.id,
+                    "active_ids": po_in_progress.ids,
+                }
+            )
+            .create({})
+        )
+        wizard.fill_lines(po_in_progress.order_line)
+        wizard.line_ids[0].qty = 2
+        wizard.create_stock_picking()
+        po_in_progress.picking_ids[0].button_validate()
+        qty, _ = product_in_progress._get_quantity_in_progress(
+            location_ids=location.ids
+        )
+        self.assertEqual(qty.get((product_in_progress.id, location.id)), 3)