Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.7.7'
+__version__ = '6.7.8'

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -59,7 +59,7 @@ class PricingRule(Document):
 					self.set(f, None)
 
 	def validate_price_or_discount(self):
-		for field in ["Price", "Discount Percentage"]:
+		for field in ["Price"]:
 			if flt(self.get(frappe.scrub(field))) < 0:
 				throw(_("{0} can not be negative").format(field))
 

erpnext/hooks.py

@@ -29,7 +29,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.7.7"
+app_version = "6.7.8"
 source_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"

erpnext/startup/notifications.py

@@ -15,7 +15,7 @@ def get_notification_config():
 			"Opportunity": {"status": "Open"},
 			"Quotation": {"docstatus": 0},
 			"Sales Order": {
-				"status": ("not in", ("Stopped", "Completed")),
+				"status": ("not in", ("Stopped", "Completed", "Closed")),
 				"docstatus": ("<", 2)
 			},
 			"Journal Entry": {"docstatus": 0},
@@ -29,7 +29,7 @@ def get_notification_config():
 			"Stock Entry": {"docstatus": 0},
 			"Material Request": {"docstatus": 0},
 			"Purchase Order": {
-				"status": ("not in", ("Stopped", "Completed")),
+				"status": ("not in", ("Stopped", "Completed", "Closed")),
 				"docstatus": ("<", 2)
 			},
 			"Production Order": { "status": "In Process" },

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.7.7"
+version = "6.7.8"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()