Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 293d373..893a85e 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.7.7'
+__version__ = '6.7.8'
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index bcdf9fc..5209e8e 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -59,7 +59,7 @@
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))
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 51d0b5c..012ed5e 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -29,7 +29,7 @@
"""
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"
diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
index b1b63b0..4b5de23 100644
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py
@@ -15,7 +15,7 @@
"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 @@
"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" },
diff --git a/setup.py b/setup.py
index c6f12a9..f5a46df 100644
--- a/setup.py
+++ b/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()