diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 210a9e83df..cab08cac89 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -268,3 +268,4 @@ erpnext.patches.v7_0.update_home_page
 erpnext.patches.v7_0.create_budget_record
 execute:frappe.delete_doc_if_exists("Page", "financial-analytics")
 erpnext.patches.v7_0.update_project_in_gl_entry
+execute:frappe.db.sql('update tabQuotation set status="Cancelled" where docstatus=2')
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 9cc7473a0d..6ed188893d 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -63,7 +63,7 @@ class Quotation(SellingController):
 
 	def on_cancel(self):
 		#update enquiry status
-		self.set_status()
+		self.set_status(update=True)
 		self.update_opportunity()
 
 	def print_other_charges(self,docname):