nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Anand Doshi
2015-11-10 11:31:29 +05:30
parent 87b5fcb3b5 39982a5f02
commit 8df5b5e3a1
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

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

2
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

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

2
erpnext/hooks.py
View File

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

4
erpnext/startup/notifications.py
View File

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

2
setup.py
View File

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