Merge pull request frappe#939 from Bloomstack/staging

Merge staging into production
DeveloperMetal · Jan 8, 2021 · bc97ccf · bc97ccf
2 parents 10dd839 + 8b79579
commit bc97ccf
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 283 deletions.
diff --git a/erpnext/selling/doctype/customer/customer_list.js b/erpnext/selling/doctype/customer/customer_list.js
@@ -1,3 +1,4 @@
 frappe.listview_settings['Customer'] = {
 	add_fields: ["customer_name", "territory", "customer_group", "customer_type", "image"],
+	ignore_user_default_filters: true
 };
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
@@ -415,7 +415,7 @@
    "oldfieldname": "quotation_details",
    "oldfieldtype": "Table",
    "options": "Quotation Item",
-   "reqd": 1,
+   "reqd": 0,
    "width": "40px"
   },
   {
@@ -957,7 +957,7 @@
  "idx": 82,
  "is_submittable": 1,
  "max_attachments": 1,
- "modified": "2021-01-04 06:58:24.189403",
+ "modified": "2021-01-08 06:58:24.189403",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Quotation",

diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
@@ -90,6 +90,7 @@ def on_submit(self):
 		#update enquiry status
 		self.update_opportunity()
 		self.update_lead()
+		self.check_items()
 
 	def on_cancel(self):
 		super(Quotation, self).on_cancel()
@@ -99,6 +100,10 @@ def on_cancel(self):
 		self.update_opportunity()
 		self.update_lead()
 
+	def check_items(self): 
+		if not self.items: 
+			frappe.throw(_("You cannot submit an empty Quotation."))
+
 	def print_other_charges(self,docname):
 		print_lst = []
 		for d in self.get('taxes'):