From 8f643f0df85be91654a1cc27f4c81e0125c887f7 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 16:45:40 +0530 Subject: [PATCH] fix: `Reserved Stock` report (backport #38922) (#38924) * chore: improve `Allowed Qty` error msg (cherry picked from commit 1a1629196d0daedef3db4f73191e21321689306d) * fix: `Reserved Stock` report (cherry picked from commit a5d5223c0e7f85a64f70288ec6e0048864b2ffd7) --------- Co-authored-by: s-aga-r --- .../stock_reservation_entry.py | 47 +++++++++++------- .../report/reserved_stock/reserved_stock.js | 48 ++++++++++--------- 2 files changed, 55 insertions(+), 40 deletions(-) diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py index 85550c2b7d..fee0e0ce93 100644 --- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py +++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py @@ -9,7 +9,7 @@ from frappe.model.document import Document from frappe.query_builder.functions import Sum from frappe.utils import cint, flt -from erpnext.stock.utils import get_or_make_bin +from erpnext.stock.utils import get_or_make_bin, get_stock_balance class StockReservationEntry(Document): @@ -151,7 +151,7 @@ class StockReservationEntry(Document): """Validates `Reserved Qty` when `Reservation Based On` is `Qty`.""" if self.reservation_based_on == "Qty": - self.validate_with_max_reserved_qty(self.reserved_qty) + self.validate_with_allowed_qty(self.reserved_qty) def auto_reserve_serial_and_batch(self, based_on: str = None) -> None: """Auto pick Serial and Batch Nos to reserve when `Reservation Based On` is `Serial and Batch`.""" @@ -324,7 +324,7 @@ class StockReservationEntry(Document): frappe.throw(msg) # Should be called after validating Serial and Batch Nos. - self.validate_with_max_reserved_qty(qty_to_be_reserved) + self.validate_with_allowed_qty(qty_to_be_reserved) self.db_set("reserved_qty", qty_to_be_reserved) def update_reserved_qty_in_voucher( @@ -429,7 +429,7 @@ class StockReservationEntry(Document): msg = _("Stock Reservation Entry cannot be updated as it has been delivered.") frappe.throw(msg) - def validate_with_max_reserved_qty(self, qty_to_be_reserved: float) -> None: + def validate_with_allowed_qty(self, qty_to_be_reserved: float) -> None: """Validates `Reserved Qty` with `Max Reserved Qty`.""" self.db_set( @@ -448,12 +448,12 @@ class StockReservationEntry(Document): ) voucher_delivered_qty = flt(delivered_qty) * flt(conversion_factor) - max_reserved_qty = min( + allowed_qty = min( self.available_qty, (self.voucher_qty - voucher_delivered_qty - total_reserved_qty) ) - if max_reserved_qty <= 0 and self.voucher_type == "Sales Order": - msg = _("Item {0} is already delivered for Sales Order {1}.").format( + if self.get("_action") != "submit" and self.voucher_type == "Sales Order" and allowed_qty <= 0: + msg = _("Item {0} is already reserved/delivered against Sales Order {1}.").format( frappe.bold(self.item_code), frappe.bold(self.voucher_no) ) @@ -463,19 +463,33 @@ class StockReservationEntry(Document): else: frappe.throw(msg) - if qty_to_be_reserved > max_reserved_qty: + if qty_to_be_reserved > allowed_qty: + actual_qty = get_stock_balance(self.item_code, self.warehouse) msg = """ - Cannot reserve more than Max Reserved Qty {0} {1}.

- The Max Reserved Qty is calculated as follows:
+ Cannot reserve more than Allowed Qty {0} {1} for Item {2} against {3} {4}.

+ The Allowed Qty is calculated as follows:
""".format( - frappe.bold(max_reserved_qty), self.stock_uom + frappe.bold(allowed_qty), + self.stock_uom, + frappe.bold(self.item_code), + self.voucher_type, + frappe.bold(self.voucher_no), + actual_qty, + actual_qty - self.available_qty, + self.available_qty, + self.voucher_qty, + voucher_delivered_qty, + total_reserved_qty, + allowed_qty, ) frappe.throw(msg) @@ -509,7 +523,6 @@ def get_available_qty_to_reserve( """Returns `Available Qty to Reserve (Actual Qty - Reserved Qty)` for Item, Warehouse and Batch combination.""" from erpnext.stock.doctype.batch.batch import get_batch_qty - from erpnext.stock.utils import get_stock_balance if batch_no: return get_batch_qty( diff --git a/erpnext/stock/report/reserved_stock/reserved_stock.js b/erpnext/stock/report/reserved_stock/reserved_stock.js index 68727411d5..2b075e2276 100644 --- a/erpnext/stock/report/reserved_stock/reserved_stock.js +++ b/erpnext/stock/report/reserved_stock/reserved_stock.js @@ -149,34 +149,36 @@ frappe.query_reports["Reserved Stock"] = { formatter: (value, row, column, data, default_formatter) => { value = default_formatter(value, row, column, data); - if (column.fieldname == "status") { - switch (data.status) { - case "Partially Reserved": - value = "" + value + ""; - break; - case "Reserved": - value = "" + value + ""; - break; - case "Partially Delivered": - value = "" + value + ""; - break; - case "Delivered": - value = "" + value + ""; - break; + if (data) { + if (column.fieldname == "status") { + switch (data.status) { + case "Partially Reserved": + value = "" + value + ""; + break; + case "Reserved": + value = "" + value + ""; + break; + case "Partially Delivered": + value = "" + value + ""; + break; + case "Delivered": + value = "" + value + ""; + break; + } } - } - else if (column.fieldname == "delivered_qty") { - if (data.delivered_qty > 0) { - if (data.reserved_qty > data.delivered_qty) { - value = "" + value + ""; + else if (column.fieldname == "delivered_qty") { + if (data.delivered_qty > 0) { + if (data.reserved_qty > data.delivered_qty) { + value = "" + value + ""; + } + else { + value = "" + value + ""; + } } else { - value = "" + value + ""; + value = "" + value + ""; } } - else { - value = "" + value + ""; - } } return value;