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

resolved merge conflicts on develop (#10185)

Browse Source 
* resolved merge conflicts on develop

* [minor] removed the validate_activity
This commit is contained in:
Makarand Bauskar
2017-07-31 15:09:52 +05:30
committed by GitHub
parent 8b6f7914b0
commit 98b52a7245
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/projects/doctype/timesheet/timesheet.py
View File

@@ -174,7 +174,6 @@ class Timesheet(Document):
for data in self.get('time_logs'):
self.check_workstation_timings(data)
self.validate_overlap(data)
validate_activity(data)
def validate_overlap(self, data):
if self.production_order: