Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"From time" cannot be later than "To time" and hours cannot be negative

Browse Source
This commit is contained in:
Revant Nandgaonkar 2014-12-01 16:53:29 +05:30
parent 3d65d9602e
commit 83db3e3ddb
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/projects/doctype/time_log/test_time_log.py
View File

@ -17,5 +17,14 @@ class TestTimeLog(unittest.TestCase):
frappe.db.sql("delete from `tabTime Log`") 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_records = frappe.get_test_records('Time Log')
test_ignore = ["Time Log Batch", "Sales Invoice"] test_ignore = ["Time Log Batch", "Sales Invoice"]

2
erpnext/projects/doctype/time_log/time_log.py
View File

@ -23,6 +23,8 @@ class TimeLog(Document):
def calculate_total_hours(self): def calculate_total_hours(self):
from frappe.utils import time_diff_in_hours from frappe.utils import time_diff_in_hours
self.hours = time_diff_in_hours(self.to_time, self.from_time) 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): def set_status(self):
self.status = { self.status = {