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

[fix] capacity planning error

Browse Source
This commit is contained in:
Rushabh Mehta
2015-08-11 15:41:52 +05:30
parent 1828c12481
commit 3131c732ff
5 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import frappe, json
from frappe import _
from frappe.utils import cstr, flt, get_datetime, get_time, getdate
from dateutil.relativedelta import relativedelta
from erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings import get_mins_between_operations
class OverlapError(frappe.ValidationError): pass
class OverProductionLoggedError(frappe.ValidationError): pass
@@ -182,9 +183,14 @@ class TimeLog(Document):
def move_to_next_non_overlapping_slot(self):
"""If in overlap, set start as the end point of the overlapping time log"""
overlapping = self.get_overlap_for("workstation")
if overlapping:
self.from_time = get_datetime(overlapping.to_time) + relativedelta(minutes=10)
overlapping = self.get_overlap_for("workstation") \
or self.get_overlap_for("employee") \
or self.get_overlap_for("user")
if not overlapping:
frappe.throw("Logical error: Must find overlapping")
self.from_time = get_datetime(overlapping.to_time) + get_mins_between_operations()
def get_time_log_summary(self):
"""Returns 'Actual Operating Time'. """