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

Merge pull request #2725 from neilLasrado/workstation-operation-hours

Browse Source 
Workstation Doc Fixed
This commit is contained in:
Nabin Hait 2015-02-11 16:52:26 +05:30
commit ceb04726c8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/workstation/workstation.py
View File

@ -32,7 +32,7 @@ class Workstation(Document):
def validate_overlap_for_operation_timings(self): def validate_overlap_for_operation_timings(self):
for d in self.get("working_hours"): 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 where parent = %s and name != %s
and ( and (
(start_time between %s and %s) or (start_time between %s and %s) or

2
erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
View File

@ -115,7 +115,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2014-12-24 14:46:40.678236", "modified": "2015-02-11 14:55:55.650726",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Workstation Working Hour", "name": "Workstation Working Hour",