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

fix: compare start and end time to prevent negative diff (#21974)

Browse Source 
* fix: compare start and end time to prevent negative diff

* feat: parse date when comparing
This commit is contained in:
Shivam Mishra 2020-05-27 15:01:30 +00:00 committed by Shivam Mishra
parent 31557bf2c8
commit 402ed10004
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@ -102,8 +102,11 @@ class JobCard(Document):
workstation_doc = frappe.get_cached_doc("Workstation", self.workstation)
if (not workstation_doc.working_hours or
cint(frappe.db.get_single_value("Manufacturing Settings", "allow_overtime"))):
row.remaining_time_in_mins -= time_diff_in_minutes(row.planned_end_time,
row.planned_start_time)
if getdate(row.planned_end_time) < getdate(row.planned_start_time):
row.planned_end_time = add_to_date(row.planned_start_time, minutes=row.time_in_mins)
row.remaining_time_in_mins = 0.0
else:
row.remaining_time_in_mins -= time_diff_in_minutes(row.planned_end_time, row.planned_start_time)
self.update_time_logs(row)
return