commit 332a17ee8668aec357b0977784ceb074264a28df
author rohitwaghchaure <rohitw1991@gmail.com> Thu Mar 01 10:28:04 2018 +0530
committer Nabin Hait <nabinhait@gmail.com> Thu Mar 01 10:28:04 2018 +0530
tree ca9977768138f10066d633d4cbc41c7e45ae281c
parent a310cc715659ff7ca7b9d2cd95f702a0d151338a

[Fix] Test case for serial no (#13136)

erpnext/stock/doctype/serial_no/serial_no.py

diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index 7194ec1..4c609df 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -187,11 +187,11 @@
 	update_serial_nos(sle, item_det)
 
 def validate_serial_no(sle, item_det):
-	if item_det.has_serial_no==0 and sle.is_cancelled == "No":
+	if item_det.has_serial_no==0:
 		if sle.serial_no:
 			frappe.throw(_("Item {0} is not setup for Serial Nos. Column must be blank").format(sle.item_code),
 				SerialNoNotRequiredError)
-	else:
+	elif sle.is_cancelled == "No":
 		if sle.serial_no:
 			serial_nos = get_serial_nos(sle.serial_no)
 			if cint(sle.actual_qty) != flt(sle.actual_qty):