nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 05:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: error because of non-mandatory fields

Browse Source
This commit is contained in:
Nabin Hait
2019-05-27 15:43:26 +05:30
parent 7a9b014f72
commit a3a733fa91
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,21 +18,22 @@ class JobCard(Document):
self.total_completed_qty = 0.0 self.total_completed_qty = 0.0
self.total_time_in_mins = 0.0 self.total_time_in_mins = 0.0
for d in self.get('time_logs'): if self.get('time_logs'):
if get_datetime(d.from_time) > get_datetime(d.to_time): for d in self.get('time_logs'):
frappe.throw(_("Row {0}: From time must be less than to time").format(d.idx)) if get_datetime(d.from_time) > get_datetime(d.to_time):
frappe.throw(_("Row {0}: From time must be less than to time").format(d.idx))
data = self.get_overlap_for(d) data = self.get_overlap_for(d)
if data: if data:
frappe.throw(_("Row {0}: From Time and To Time of {1} is overlapping with {2}") frappe.throw(_("Row {0}: From Time and To Time of {1} is overlapping with {2}")
.format(d.idx, self.name, data.name)) .format(d.idx, self.name, data.name))
if d.from_time and d.to_time: if d.from_time and d.to_time:
d.time_in_mins = time_diff_in_hours(d.to_time, d.from_time) * 60 d.time_in_mins = time_diff_in_hours(d.to_time, d.from_time) * 60
self.total_time_in_mins += d.time_in_mins self.total_time_in_mins += d.time_in_mins
if d.completed_qty: if d.completed_qty:
self.total_completed_qty += d.completed_qty self.total_completed_qty += d.completed_qty
def get_overlap_for(self, args): def get_overlap_for(self, args):
existing = frappe.db.sql("""select jc.name as name from existing = frappe.db.sql("""select jc.name as name from
@@ -112,8 +113,10 @@ class JobCard(Document):
for_quantity += doc.total_completed_qty for_quantity += doc.total_completed_qty
time_in_mins += doc.total_time_in_mins time_in_mins += doc.total_time_in_mins
for time_log in doc.time_logs: for time_log in doc.time_logs:
from_time_list.append(time_log.from_time) if time_log.from_time:
to_time_list.append(time_log.to_time) from_time_list.append(time_log.from_time)
if time_log.to_time:
to_time_list.append(time_log.to_time)
if for_quantity: if for_quantity:
wo = frappe.get_doc('Work Order', self.work_order) wo = frappe.get_doc('Work Order', self.work_order)