From a7d1985b5f6fe29c6b7169129a87716844322bce Mon Sep 17 00:00:00 2001 From: KanchanChauhan Date: Tue, 21 Jan 2020 12:35:11 +0530 Subject: [PATCH] fix: Set Quotation expired if not Ordered or Lost (#20354) Co-authored-by: Chinmay Pai --- erpnext/selling/doctype/quotation/quotation.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py index 9ebef0d6bc..d8667f603a 100644 --- a/erpnext/selling/doctype/quotation/quotation.py +++ b/erpnext/selling/doctype/quotation/quotation.py @@ -182,8 +182,12 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False): 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):