Merge branch 'hotfix'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 2d1a24d..b54ba59 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.1.21'
+__version__ = '7.1.22'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index d6cf120..4e4ad78 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -296,4 +296,3 @@
si_doc.docstatus = 0
si_doc.flags.ignore_mandatory = True
si_doc.insert()
- frappe.log_error(frappe.get_traceback())
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index 5483320..5cb0184 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -79,9 +79,9 @@
self.status = "Completed"
def set_dates(self):
- if self.docstatus < 2:
- start_date = min([d.from_time for d in self.time_logs])
- end_date = max([d.to_time for d in self.time_logs])
+ if self.docstatus < 2 and self.time_logs:
+ start_date = min([getdate(d.from_time) for d in self.time_logs])
+ end_date = max([getdate(d.to_time) for d in self.time_logs])
if start_date and end_date:
self.start_date = getdate(start_date)