fix: Difference In in `Stock Ledger Variance

`
frappe · Dec 5, 2023 · 8d33901 · 8d33901
1 parent 5da3e53
commit 8d33901
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 20 deletions.
diff --git a/erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.js b/erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.js
@@ -50,8 +50,11 @@ frappe.query_reports["Stock Ledger Variance"] = {
 			"options": [
 				"",
 				"Qty",
+				"Qty (FIFO)",
 				"Value",
+				"Value (FIFO)",
 				"Valuation",
+				"Valuation (FIFO)",
 			],
 		},
 		{

diff --git a/erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py b/erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py
@@ -249,28 +249,31 @@ def get_item_warehouse_combinations(filters: dict = None) -> dict:
 
 
 def has_difference(row, precision, difference_in):
-	has_qty_difference = flt(row.difference_in_qty, precision) or flt(row.fifo_qty_diff, precision)
-	has_value_difference = (
-		flt(row.diff_value_diff, precision)
-		or flt(row.fifo_value_diff, precision)
-		or flt(row.fifo_difference_diff, precision)
-	)
-	has_valuation_difference = flt(row.valuation_diff, precision) or flt(
-		row.fifo_valuation_diff, precision
-	)
+	qty_diff = flt(row.difference_in_qty, precision)
+	qty_fifo_diff = flt(row.fifo_qty_diff, precision)
+
+	value_diff = flt(row.diff_value_diff, precision)
+	value_fifo_diff = flt(row.fifo_value_diff, precision) or flt(row.fifo_difference_diff, precision)
+
+	valuation_diff = flt(row.valuation_diff, precision)
+	valuation_fifo_diff = flt(row.fifo_valuation_diff, precision)
 
-	if difference_in == "Qty" and has_qty_difference:
-		return True
-	elif difference_in == "Value" and has_value_difference:
-		return True
-	elif difference_in == "Valuation" and has_valuation_difference:
-		return True
-	elif difference_in not in ["Qty", "Value", "Valuation"] and (
-		has_qty_difference or has_value_difference or has_valuation_difference
-	):
-		return True
+	conditions = {
+		"Qty": qty_diff,
+		"Qty (FIFO)": qty_fifo_diff,
+		"Value": value_diff,
+		"Value (FIFO)": value_fifo_diff,
+		"Valuation": valuation_diff,
+		"Valuation (FIFO)": valuation_fifo_diff,
+		"Default": qty_diff
+		or qty_fifo_diff
+		or value_diff
+		or value_fifo_diff
+		or valuation_diff
+		or valuation_fifo_diff,
+	}
 
-	return False
+	return True if conditions.get(difference_in, conditions["Default"]) else False
 
 
 def add_item_warehouse_details(row, item_warehouse):