Merge pull request #5877 from rohitwaghchaure/v7_fixes
[minor] Fixes
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index e0ce4fb..1850146 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.0.4'
+__version__ = '7.0.5'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
index 9821246..4cbccaf 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -58,7 +58,7 @@
if no_email_sp:
frappe.msgprint(
frappe._("Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}").format(
- doc.owner, "<br>"+no_email_sp.join("<br>")
+ self.owner, "<br>"+no_email_sp.join("<br>")
))
scheduled_date = frappe.db.sql("""select scheduled_date from
@@ -153,7 +153,7 @@
elif not d.sales_person:
throw(_("Please select Incharge Person's name"))
- if getdate(d.start_date) > getdate(d.end_date):
+ if getdate(d.start_date) >= getdate(d.end_date):
throw(_("Start date should be less than end date for Item {0}").format(d.item_code))
def validate_sales_order(self):