From 83db3e3ddb5c5f0013e78dbe545cf45ba4e739f9 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 1 Dec 2014 16:53:29 +0530 Subject: [PATCH] "From time" cannot be later than "To time" and hours cannot be negative --- erpnext/projects/doctype/time_log/test_time_log.py | 9 +++++++++ erpnext/projects/doctype/time_log/time_log.py | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/erpnext/projects/doctype/time_log/test_time_log.py b/erpnext/projects/doctype/time_log/test_time_log.py index 4a312adb41..d0cf6a0328 100644 --- a/erpnext/projects/doctype/time_log/test_time_log.py +++ b/erpnext/projects/doctype/time_log/test_time_log.py @@ -16,6 +16,15 @@ class TestTimeLog(unittest.TestCase): self.assertRaises(OverlapError, ts.insert) frappe.db.sql("delete from `tabTime Log`") + + def test_negative_hours(self): + frappe.db.sql("delete from `tabTime Log`") + test_time_log = frappe.new_doc("Time Log") + test_time_log.activity_type = "Communication" + test_time_log.from_time = "2013-01-01 11:00:00.000000" + test_time_log.to_time = "2013-01-01 10:00:00.000000" + self.assertRaises(frappe.ValidationError, test_time_log.save) + frappe.db.sql("delete from `tabTime Log`") test_records = frappe.get_test_records('Time Log') test_ignore = ["Time Log Batch", "Sales Invoice"] diff --git a/erpnext/projects/doctype/time_log/time_log.py b/erpnext/projects/doctype/time_log/time_log.py index eb8afc7729..b925114ceb 100644 --- a/erpnext/projects/doctype/time_log/time_log.py +++ b/erpnext/projects/doctype/time_log/time_log.py @@ -19,10 +19,12 @@ class TimeLog(Document): self.set_status() self.validate_overlap() self.calculate_total_hours() - + def calculate_total_hours(self): from frappe.utils import time_diff_in_hours self.hours = time_diff_in_hours(self.to_time, self.from_time) + if self.hours < 0: + frappe.throw(_("\'From Time\' cannot be later than \'To Time\'")) def set_status(self): self.status = {