Merge pull request #33356 from frappe/mergify/bp/version-14-hotfix/pr…

…-33354 fix: unsupported operand type(s) for +: 'int' and 'NoneType' (backport #33354)
frappe · Dec 15, 2022 · beaf955 · beaf955
2 parents 6940923 + 7bdfb3d
commit beaf955
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
@@ -828,9 +828,9 @@ def insert_item_price(args):
 	):
 		if frappe.has_permission("Item Price", "write"):
 			price_list_rate = (
-				(args.rate + args.discount_amount) / args.get("conversion_factor")
+				(flt(args.rate) + flt(args.discount_amount)) / args.get("conversion_factor")
 				if args.get("conversion_factor")
-				else (args.rate + args.discount_amount)
+				else (flt(args.rate) + flt(args.discount_amount))
 			)
 
 			item_price = frappe.db.get_value(