From 739aa4d51a4868a2b0d4510c36010123a7add544 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sat, 7 Nov 2015 20:28:12 +0530 Subject: [PATCH 1/3] [minor] allow pricing rule to have negative discount --- erpnext/accounts/doctype/pricing_rule/pricing_rule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py index bcdf9fcd5dc..5209e8ec852 100644 --- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +++ b/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)) From 8f228dd7f9233d0d8b1b0cff76432984f7a909d9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 10 Nov 2015 11:28:35 +0530 Subject: [PATCH 2/3] [fix] [minor] closed not in notifications --- erpnext/startup/notifications.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py index b1b63b0cb8b..4b5de233e5c 100644 --- a/erpnext/startup/notifications.py +++ b/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" }, From 39982a5f02e42776ef1c99369980c6a112d1e355 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 10 Nov 2015 12:01:29 +0600 Subject: [PATCH 3/3] bumped to version 6.7.8 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 293d37387b8..893a85e1d29 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/hooks.py b/erpnext/hooks.py index 51d0b5c182f..012ed5e5c70 100644 --- a/erpnext/hooks.py +++ b/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" diff --git a/setup.py b/setup.py index c6f12a97069..f5a46df3b5f 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()