Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: add Partially Reserved status in SRE

Browse Source
This commit is contained in:
s-aga-r 2023-03-23 19:50:34 +05:30
parent 4ad55382cf
commit ee074883bb
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
View File

@ -182,7 +182,7 @@
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 1, "hidden": 1,
"label": "Status", "label": "Status",
"options": "Draft\nReserved\nPartially Delivered\nDelivered\nCancelled", "options": "Draft\nPartially Reserved\nReserved\nPartially Delivered\nDelivered\nCancelled",
"read_only": 1 "read_only": 1
}, },
{ {
@ -242,7 +242,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2023-03-23 19:35:55.479617", "modified": "2023-03-23 19:41:37.140303",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Reservation Entry", "name": "Stock Reservation Entry",

13
erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
View File

@ -47,12 +47,15 @@ class StockReservationEntry(TransactionBase):
if not status: if not status:
if self.docstatus == 2: if self.docstatus == 2:
status = "Cancelled" 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: 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: else:
status = "Draft" status = "Draft"

1
erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry_list.js
View File

@ -5,6 +5,7 @@ frappe.listview_settings['Stock Reservation Entry'] = {
get_indicator: function (doc) { get_indicator: function (doc) {
const status_colors = { const status_colors = {
'Draft': 'red', 'Draft': 'red',
'Partially Reserved': 'orange',
'Reserved': 'blue', 'Reserved': 'blue',
'Partially Delivered': 'purple', 'Partially Delivered': 'purple',
'Delivered': 'green', 'Delivered': 'green',