commit a7d1985b5f6fe29c6b7169129a87716844322bce
author KanchanChauhan <angel143.dr@gmail.com> Tue Jan 21 12:35:11 2020 +0530
committer Chinmay Pai <chinmaydpai@gmail.com> Tue Jan 21 12:35:11 2020 +0530
tree a4ee093d21d19c5b57394cdf119ccad5d9b083aa
parent c438a20b76a933ee0a9ccf89d8df69a69818decd

fix: Set Quotation expired if not Ordered or Lost (#20354)

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>

erpnext/selling/doctype/quotation/quotation.py

diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 9ebef0d..d8667f6 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -182,8 +182,12 @@
 	return doclist
 
 def set_expired_status():
-	frappe.db.sql("""UPDATE `tabQuotation` SET `status` = 'Expired'
-		WHERE `status` != "Expired" AND `valid_till` < %s""", (nowdate()))
+	frappe.db.sql("""
+		UPDATE
+			`tabQuotation` SET `status` = 'Expired'
+		WHERE
+			`status` not in ('Ordered', 'Expired', 'Lost', 'Cancelled') AND `valid_till` < %s
+		""", (nowdate()))
 
 @frappe.whitelist()
 def make_sales_invoice(source_name, target_doc=None):