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

Revert "fix: Reserve and Unreserve buttons visibility in SO"

Browse Source 
This reverts commit cdb31816918c8d07344f9af4b7cdf43d0f2b959e.
This commit is contained in:
s-aga-r 2023-04-23 15:31:53 +05:30
parent 0cd10a50d2
commit 0b5f03e88c
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/selling/doctype/sales_order/sales_order.js
View File

@ -66,16 +66,18 @@ frappe.ui.form.on("Sales Order", {
} }
if (frm.is_new()) { if (frm.is_new()) {
if (frm.doc.__onload && frm.doc.__onload.enable_stock_reservation) { frappe.db.get_single_value("Stock Settings", "enable_stock_reservation").then((value) => {
if (frm.doc.__onload.reserve_stock_on_so_submission) { if (value) {
// If `Reserve Stock on Sales Order Submission` is enabled in Stock Settings, set Reserve Stock to 1 else 0. frappe.db.get_single_value("Stock Settings", "reserve_stock_on_sales_order_submission").then((value) => {
frm.set_value("reserve_stock", value ? 1 : 0); // If `Reserve Stock on Sales Order Submission` is enabled in Stock Settings, set Reserve Stock to 1 else 0.
frm.set_value("reserve_stock", value ? 1 : 0);
})
} else {
// If `Stock Reservation` is disabled in Stock Settings, set Reserve Stock to 0 and read only.
frm.set_value("reserve_stock", 0);
frm.set_df_property("reserve_stock", "read_only", 1);
} }
} else { })
// If `Stock Reservation` is disabled in Stock Settings, set Reserve Stock to 0 and read only.
frm.set_value("reserve_stock", 0);
frm.set_df_property("reserve_stock", "read_only", 1);
}
} }
} }
}, },
@ -287,7 +289,7 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
} }
// Stock Reservation > Reserve button will be only visible if the SO has unreserved stock. // Stock Reservation > Reserve button will be only visible if the SO has unreserved stock.
if (this.frm.doc.__onload && this.frm.doc.__onload.enable_stock_reservation && this.frm.doc.__onload.has_unreserved_stock) { if (this.frm.doc.__onload && this.frm.doc.__onload.has_unreserved_stock) {
this.frm.add_custom_button(__('Reserve'), () => this.create_stock_reservation_entries(), __('Stock Reservation')); this.frm.add_custom_button(__('Reserve'), () => this.create_stock_reservation_entries(), __('Stock Reservation'));
} }

13
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -50,13 +50,12 @@ class SalesOrder(SellingController):
super(SalesOrder, self).__init__(*args, **kwargs) super(SalesOrder, self).__init__(*args, **kwargs)
def onload(self) -> None: def onload(self) -> None:
stock_settings = frappe.get_doc("Stock Settings") if frappe.get_cached_value("Stock Settings", None, "enable_stock_reservation"):
self.set_onload("enable_stock_reservation", stock_settings.enable_stock_reservation) if self.has_unreserved_stock():
self.set_onload( self.set_onload("has_unreserved_stock", True)
"reserve_stock_on_so_submission", stock_settings.reserve_stock_on_sales_order_submission
) if has_reserved_stock(self.doctype, self.name):
self.set_onload("has_reserved_stock", has_reserved_stock(self.doctype, self.name)) self.set_onload("has_reserved_stock", True)
self.set_onload("has_unreserved_stock", self.has_unreserved_stock())
def validate(self): def validate(self):
super(SalesOrder, self).validate() super(SalesOrder, self).validate()