From 0327b35b5e25dd60217a9265ddbb94f6a4b98157 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 7 Dec 2016 18:32:36 +0530 Subject: [PATCH 1/3] [fix] timesheet datetime issue --- erpnext/projects/doctype/timesheet/timesheet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py index 548332091e..f853692c57 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.py +++ b/erpnext/projects/doctype/timesheet/timesheet.py @@ -79,7 +79,7 @@ class Timesheet(Document): self.status = "Completed" def set_dates(self): - if self.docstatus < 2: + if self.docstatus < 2 and self.time_logs: start_date = min([d.from_time for d in self.time_logs]) end_date = max([d.to_time for d in self.time_logs]) From 86ed030b5cf8e7c9ea107b2cc89130bdafaef543 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 7 Dec 2016 18:49:07 +0530 Subject: [PATCH 2/3] minor issue --- erpnext/accounts/doctype/sales_invoice/pos.py | 1 - erpnext/projects/doctype/timesheet/timesheet.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py index d6cf12020f..4e4ad780ed 100644 --- a/erpnext/accounts/doctype/sales_invoice/pos.py +++ b/erpnext/accounts/doctype/sales_invoice/pos.py @@ -296,4 +296,3 @@ def save_invoice(e, si_doc, name): 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 f853692c57..5cb018425a 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.py +++ b/erpnext/projects/doctype/timesheet/timesheet.py @@ -80,8 +80,8 @@ class Timesheet(Document): def set_dates(self): if self.docstatus < 2 and self.time_logs: - start_date = min([d.from_time for d in self.time_logs]) - end_date = max([d.to_time for d in 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) From 7b513891e3291bb0a21e9aca26b66a61cab5264c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 8 Dec 2016 13:03:53 +0600 Subject: [PATCH 3/3] bumped to version 7.1.22 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 2d1a24d1c1..b54ba59943 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'''