diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py index d679b94deb..00f7ee644b 100644 --- a/erpnext/manufacturing/doctype/workstation/workstation.py +++ b/erpnext/manufacturing/doctype/workstation/workstation.py @@ -32,7 +32,7 @@ class Workstation(Document): def validate_overlap_for_operation_timings(self): for d in self.get("working_hours"): - existing = frappe.db.sql_list("""select idx from `tabWorkstation Operation Hours` + existing = frappe.db.sql_list("""select idx from `tabWorkstation Working Hour` where parent = %s and name != %s and ( (start_time between %s and %s) or diff --git a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json index 2afc2e7f37..a513cdee8f 100644 --- a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json +++ b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json @@ -115,7 +115,7 @@ "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2014-12-24 14:46:40.678236", + "modified": "2015-02-11 14:55:55.650726", "modified_by": "Administrator", "module": "Manufacturing", "name": "Workstation Working Hour",