From ee074883bbc63fefb068092ff116b4cbb30a72d6 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Thu, 23 Mar 2023 19:50:34 +0530 Subject: [PATCH] chore: add `Partially Reserved` status in `SRE` --- .../stock_reservation_entry.json | 4 ++-- .../stock_reservation_entry.py | 13 ++++++++----- .../stock_reservation_entry_list.js | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json index 529a697a9b..04861d1b86 100644 --- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json @@ -182,7 +182,7 @@ "fieldtype": "Select", "hidden": 1, "label": "Status", - "options": "Draft\nReserved\nPartially Delivered\nDelivered\nCancelled", + "options": "Draft\nPartially Reserved\nReserved\nPartially Delivered\nDelivered\nCancelled", "read_only": 1 }, { @@ -242,7 +242,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2023-03-23 19:35:55.479617", + "modified": "2023-03-23 19:41:37.140303", "modified_by": "Administrator", "module": "Stock", "name": "Stock Reservation Entry", 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 6aa45f6320..2824a71b7a 100644 --- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py +++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py @@ -47,12 +47,15 @@ class StockReservationEntry(TransactionBase): if not status: if self.docstatus == 2: status = "Cancelled" - elif self.reserved_qty == self.delivered_qty: - status = "Delivered" - elif self.delivered_qty and self.reserved_qty > self.delivered_qty: - status = "Partially Delivered" elif self.docstatus == 1: - status = "Reserved" + if self.reserved_qty == self.delivered_qty: + status = "Delivered" + elif self.delivered_qty and self.delivered_qty < self.reserved_qty: + status = "Partially Delivered" + elif self.reserved_qty == self.voucher_qty: + status = "Reserved" + else: + status = "Partially Reserved" else: status = "Draft" diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry_list.js b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry_list.js index f0414bba4f..442ac39f13 100644 --- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry_list.js +++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry_list.js @@ -5,6 +5,7 @@ frappe.listview_settings['Stock Reservation Entry'] = { get_indicator: function (doc) { const status_colors = { 'Draft': 'red', + 'Partially Reserved': 'orange', 'Reserved': 'blue', 'Partially Delivered': 'purple', 'Delivered': 'green',