diff --git a/erpnext/accounts/deferred_revenue.py b/erpnext/accounts/deferred_revenue.py index fb49ef3a42347..d0940c7df2137 100644 --- a/erpnext/accounts/deferred_revenue.py +++ b/erpnext/accounts/deferred_revenue.py @@ -341,7 +341,7 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None): "enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense" ) - accounts_frozen_upto = frappe.get_cached_value("Accounts Settings", "None", "acc_frozen_upto") + accounts_frozen_upto = frappe.db.get_single_value("Accounts Settings", "acc_frozen_upto") def _book_deferred_revenue_or_expense( item, diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 6d905a37cde3e..d791232c0afb5 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -232,7 +232,7 @@ def validate_with_previous_doc(self): ) if ( - cint(frappe.get_cached_value("Buying Settings", "None", "maintain_same_rate")) + cint(frappe.db.get_single_value("Buying Settings", "maintain_same_rate")) and not self.is_return and not self.is_internal_supplier ): diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index da838d1b7952f..f9d01107feee5 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -44,6 +44,17 @@ class SalesOrder(SellingController): def __init__(self, *args, **kwargs): super(SalesOrder, self).__init__(*args, **kwargs) +<<<<<<< HEAD +======= + def onload(self) -> None: + if frappe.db.get_single_value("Stock Settings", "enable_stock_reservation"): + if self.has_unreserved_stock(): + self.set_onload("has_unreserved_stock", True) + + if has_reserved_stock(self.doctype, self.name): + self.set_onload("has_reserved_stock", True) + +>>>>>>> ba15810639 (fix: incorrect usage `get_cached_value` on single doctypes) def validate(self): super(SalesOrder, self).validate() self.validate_delivery_date() diff --git a/erpnext/stock/doctype/price_list/price_list.py b/erpnext/stock/doctype/price_list/price_list.py index 554055fd839a8..e77d53a36712a 100644 --- a/erpnext/stock/doctype/price_list/price_list.py +++ b/erpnext/stock/doctype/price_list/price_list.py @@ -45,7 +45,7 @@ def check_impact_on_shopping_cart(self): doc_before_save = self.get_doc_before_save() currency_changed = self.currency != doc_before_save.currency - affects_cart = self.name == frappe.get_cached_value("E Commerce Settings", None, "price_list") + affects_cart = self.name == frappe.db.get_single_value("E Commerce Settings", "price_list") if currency_changed and affects_cart: validate_cart_settings()