From b8436dbd215a8bbbe932af3cbc15a4551e6e587c Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 11 Apr 2025 18:58:09 +0530 Subject: [PATCH] fix: removed display depends on (cherry picked from commit e0bf45e03bf21556fe2c131e66a49bfc1d5202fb) (cherry picked from commit 00b25537f4f452b400eb2c4b6479fb03e1b13917) # Conflicts: # erpnext/stock/doctype/stock_settings/stock_settings.json --- .../doctype/stock_settings/stock_settings.json | 5 ++++- .../doctype/stock_settings/stock_settings.py | 16 ---------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index 551104688a2..e62a1159a8b 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -456,7 +456,6 @@ }, { "default": "0", - "depends_on": "eval:doc.valuation_method === \"Moving Average\"", "description": "If enabled, the system will use the moving average valuation method to calculate the valuation rate for the batched items and will not consider the individual batch-wise incoming rate.", "fieldname": "do_not_use_batchwise_valuation", "fieldtype": "Check", @@ -510,7 +509,11 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], +<<<<<<< HEAD "modified": "2025-03-31 15:34:20.752065", +======= + "modified": "2025-04-11 18:56:35.781929", +>>>>>>> 00b25537f4 (fix: removed display depends on) "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings", diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.py b/erpnext/stock/doctype/stock_settings/stock_settings.py index 4de8057a006..128e19c5b00 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.py +++ b/erpnext/stock/doctype/stock_settings/stock_settings.py @@ -105,22 +105,6 @@ class StockSettings(Document): self.validate_stock_reservation() self.change_precision_for_for_sales() self.change_precision_for_purchase() - self.validate_use_batch_wise_valuation() - - def validate_use_batch_wise_valuation(self): - if not self.do_not_use_batchwise_valuation: - return - - if self.valuation_method == "FIFO": - frappe.throw(_("Cannot disable batch wise valuation for FIFO valuation method.")) - - if frappe.get_all( - "Item", filters={"valuation_method": "FIFO", "is_stock_item": 1, "has_batch_no": 1}, limit=1 - ): - frappe.throw(_("Can't disable batch wise valuation for items with FIFO valuation method.")) - - if frappe.get_all("Batch", filters={"use_batchwise_valuation": 1}, limit=1): - frappe.throw(_("Can't disable batch wise valuation for active batches.")) def validate_warehouses(self): warehouse_fields = ["default_warehouse", "sample_retention_warehouse"]