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

Merge pull request #6095 from nabinhait/timesheet_patch

Browse Source 
Ignore overlap validation while creating timesheet from existing time logs
This commit is contained in:
Nabin Hait 2016-08-16 15:19:56 +05:30 committed by GitHub
commit f640ad4389
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/patches/v7_0/convert_timelog_to_timesheet.py
View File

@ -1,12 +1,13 @@
import frappe
from erpnext.manufacturing.doctype.production_order.production_order import make_timesheet, add_timesheet_detail
from erpnext.manufacturing.doctype.production_order.production_order \
import make_timesheet, add_timesheet_detail
from erpnext.projects.doctype.timesheet.timesheet import OverlapError
def execute():
frappe.reload_doc('projects', 'doctype', 'timesheet')
for data in frappe.get_all('Time Log', fields=["*"],
filters = [["docstatus", "<", "2"]]):
for data in frappe.get_all('Time Log', fields=["*"], filters = [["docstatus", "<", "2"]]):
try:
time_sheet = make_timesheet(data.production_order)
args = get_timelog_data(data)
add_timesheet_detail(time_sheet, args)
@ -14,6 +15,9 @@ def execute():
time_sheet.note = data.note
time_sheet.company = frappe.db.get_single_value('Global Defaults', 'default_company')
time_sheet.save(ignore_permissions=True)
except OverlapError:
time_sheet.flags.ignore_validate = True
time_sheet.save(ignore_permissions=True)
def get_timelog_data(data):
return {