From 1d162ffb8765413fbd14ac759131cef3e636289e Mon Sep 17 00:00:00 2001
From: Hossein Yousefian <86075967+ihosseinu@users.noreply.github.com>
Date: Sun, 16 Apr 2023 11:03:16 +0330
Subject: [PATCH 1/2] get_incoming_rate_zero_in_rate_fix

---
 erpnext/stock/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index b8c5187b2c..d1d72e6eab 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -293,10 +293,10 @@ def get_incoming_rate(args, raise_error_if_no_rate=True):
 				in_rate = (
 					_get_fifo_lifo_rate(previous_stock_queue, args.get("qty") or 0, valuation_method)
 					if previous_stock_queue
-					else 0
+					else None
 				)
 		elif valuation_method == "Moving Average":
-			in_rate = previous_sle.get("valuation_rate") or 0
+			in_rate = previous_sle.get("valuation_rate")
 
 	if in_rate is None:
 		in_rate = get_valuation_rate(

From 13d4f859238fcfda2d3db42cac518eae5eb8a1ff Mon Sep 17 00:00:00 2001
From: Hossein Yousefian <86075967+ihosseinu@users.noreply.github.com>
Date: Tue, 18 Apr 2023 14:50:09 +0330
Subject: [PATCH 2/2] get_incoming_rate_voucher_no_fix

---
 erpnext/stock/utils.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index d1d72e6eab..feb0e2b6a5 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -269,8 +269,6 @@ def get_incoming_rate(args, raise_error_if_no_rate=True):
 	if isinstance(args, str):
 		args = json.loads(args)
 
-	voucher_no = args.get("voucher_no") or args.get("name")
-
 	in_rate = None
 	if (args.get("serial_no") or "").strip():
 		in_rate = get_avg_purchase_rate(args.get("serial_no"))
@@ -299,6 +297,7 @@ def get_incoming_rate(args, raise_error_if_no_rate=True):
 			in_rate = previous_sle.get("valuation_rate")
 
 	if in_rate is None:
+		voucher_no = args.get("voucher_no") or args.get("name")
 		in_rate = get_valuation_rate(
 			args.get("item_code"),
 			args.get("warehouse"),