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 ebe5255b27..9332c56e75 100644 --- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json @@ -27,7 +27,7 @@ "project", "column_break_26", "status", - "is_cancelled" + "amended_from" ], "fields": [ { @@ -162,14 +162,6 @@ "search_index": 1, "width": "150px" }, - { - "default": "0", - "fieldname": "is_cancelled", - "fieldtype": "Check", - "label": "Is Cancelled", - "read_only": 1, - "report_hide": 1 - }, { "fieldname": "column_break_6", "fieldtype": "Column Break" @@ -203,12 +195,12 @@ "width": "150px" }, { - "default": "Submitted", + "default": "Draft", "fieldname": "status", "fieldtype": "Select", "hidden": 1, "label": "Status", - "options": "Submitted\nPartially Delivered\nDelivered\nCancelled", + "options": "Draft\nSubmitted\nPartially Delivered\nDelivered\nCancelled", "read_only": 1 }, { @@ -216,13 +208,23 @@ "fieldtype": "Float", "label": "Delivered Qty", "read_only": 1 + }, + { + "fieldname": "amended_from", + "fieldtype": "Link", + "label": "Amended From", + "no_copy": 1, + "options": "Stock Reservation Entry", + "print_hide": 1, + "read_only": 1 } ], "hide_toolbar": 1, "in_create": 1, "index_web_pages_for_search": 1, + "is_submittable": 1, "links": [], - "modified": "2023-03-20 21:53:07.671437", + "modified": "2023-03-21 20:15:42.659789", "modified_by": "Administrator", "module": "Stock", "name": "Stock Reservation Entry", @@ -230,6 +232,7 @@ "owner": "Administrator", "permissions": [ { + "cancel": 1, "create": 1, "delete": 1, "email": 1, @@ -239,6 +242,7 @@ "report": 1, "role": "System Manager", "share": 1, + "submit": 1, "write": 1 } ], 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 1dbda6a519..406fba8807 100644 --- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py +++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py @@ -20,7 +20,6 @@ class StockReservationEntry(TransactionBase): self.update_status() def on_cancel(self): - frappe.db.set_value(self.doctype, self.name, "is_cancelled", 1) self.update_status() def validate_mandatory(self): @@ -42,13 +41,15 @@ class StockReservationEntry(TransactionBase): def update_status(self, status=None, update_modified=True): if not status: - if self.is_cancelled: + 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" - else: + elif self.docstatus == 1: status = "Submitted" + else: + status = "Draft" frappe.db.set_value(self.doctype, self.name, "status", status, update_modified=update_modified) 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 992c566989..443350c032 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 @@ -4,6 +4,7 @@ frappe.listview_settings['Stock Reservation Entry'] = { get_indicator: function (doc) { const status_colors = { + 'Draft': 'red', 'Submitted': 'blue', 'Partially Delivered': 'purple', 'Delivered': 'green',