nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 15:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: Fix incorrect cache implementation

Browse Source 
`if not {}` results to `True` so if someone doesn't have inventory dimensions, this gets called again and again.
This commit is contained in:
Ankush Menat
2025-05-28 15:27:37 +05:30
parent 076b765cb2
commit e2920e2536
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
View File

@@ -5,6 +5,7 @@ import frappe
from frappe import _, bold, scrub from frappe import _, bold, scrub
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
from frappe.model.document import Document from frappe.model.document import Document
from frappe.utils.caching import request_cache
class DoNotChangeError(frappe.ValidationError): class DoNotChangeError(frappe.ValidationError):
@@ -388,27 +389,20 @@ def get_document_wise_inventory_dimensions(doctype) -> dict:
@frappe.whitelist() @frappe.whitelist()
@request_cache
def get_inventory_dimensions(): def get_inventory_dimensions():
if not hasattr(frappe.local, "inventory_dimensions"): return frappe.get_all(
frappe.local.inventory_dimensions = {} "Inventory Dimension",
fields=[
if not frappe.local.inventory_dimensions: "distinct target_fieldname as fieldname",
dimensions = frappe.get_all( "source_fieldname",
"Inventory Dimension", "reference_document as doctype",
fields=[ "validate_negative_stock",
"distinct target_fieldname as fieldname", "name as dimension_name",
"source_fieldname", ],
"reference_document as doctype", filters={"disabled": 0},
"validate_negative_stock", order_by="creation",
"name as dimension_name", )
],
filters={"disabled": 0},
order_by="creation",
)
frappe.local.inventory_dimensions = dimensions
return frappe.local.inventory_dimensions
@frappe.whitelist() @frappe.whitelist()

5
erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py
View File

@@ -12,6 +12,7 @@ from erpnext.stock.doctype.inventory_dimension.inventory_dimension import (
CanNotBeDefaultDimension, CanNotBeDefaultDimension,
DoNotChangeError, DoNotChangeError,
delete_dimension, delete_dimension,
get_inventory_dimensions,
) )
from erpnext.stock.doctype.item.test_item import create_item from erpnext.stock.doctype.item.test_item import create_item
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
@@ -447,7 +448,7 @@ class TestInventoryDimension(IntegrationTestCase):
self.assertEqual(d.store, "Inter Transfer Store 2") self.assertEqual(d.store, "Inter Transfer Store 2")
def test_validate_negative_stock_for_inventory_dimension(self): def test_validate_negative_stock_for_inventory_dimension(self):
frappe.local.inventory_dimensions = {} get_inventory_dimensions.clear_cache()
item_code = "Test Negative Inventory Dimension Item" item_code = "Test Negative Inventory Dimension Item"
frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1) frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
create_item(item_code) create_item(item_code)
@@ -496,7 +497,7 @@ class TestInventoryDimension(IntegrationTestCase):
# disable validate_negative_stock for inventory dimension # disable validate_negative_stock for inventory dimension
inv_dimension.reload() inv_dimension.reload()
inv_dimension.db_set("validate_negative_stock", 0) inv_dimension.db_set("validate_negative_stock", 0)
frappe.local.inventory_dimensions = {} get_inventory_dimensions.clear_cache()
# Try issuing 100 qty, more than available stock against inventory dimension # Try issuing 100 qty, more than available stock against inventory dimension
doc = make_stock_entry(item_code=item_code, source=warehouse, qty=100, do_not_submit=True) doc = make_stock_entry(item_code=item_code, source=warehouse, qty=100, do_not_submit=True)