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

[fix] include cancel time logs in convert and v6 to v7.1 fix (#6840)

Browse Source
This commit is contained in:
robert schouten 2016-11-07 19:46:39 +08:00 committed by Rushabh Mehta
parent dd01bcc485
commit d8bdaeffe3
1 changed files with 10 additions and 2 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

@ -3,11 +3,12 @@ from erpnext.manufacturing.doctype.production_order.production_order \
import make_timesheet, add_timesheet_detail import make_timesheet, add_timesheet_detail
def execute(): def execute():
frappe.reload_doc('projects', 'doctype', 'task')
frappe.reload_doc('projects', 'doctype', 'timesheet') frappe.reload_doc('projects', 'doctype', 'timesheet')
if not frappe.db.table_exists("Time Log"): if not frappe.db.table_exists("Time Log"):
return return
for data in frappe.db.sql("select * from `tabTime Log` where docstatus < 2", as_dict=1): for data in frappe.db.sql("select * from `tabTime Log`", as_dict=1):
if data.task: if data.task:
company = frappe.db.get_value("Task", data.task, "company") company = frappe.db.get_value("Task", data.task, "company")
elif data.production_order: elif data.production_order:
@ -18,7 +19,10 @@ def execute():
time_sheet = make_timesheet(data.production_order) time_sheet = make_timesheet(data.production_order)
args = get_timelog_data(data) args = get_timelog_data(data)
add_timesheet_detail(time_sheet, args) add_timesheet_detail(time_sheet, args)
time_sheet.docstatus = data.docstatus if data.docstatus == 2:
time_sheet.docstatus = 0
else:
time_sheet.docstatus = data.docstatus
time_sheet.employee = data.employee time_sheet.employee = data.employee
time_sheet.note = data.note time_sheet.note = data.note
time_sheet.company = company time_sheet.company = company
@ -38,6 +42,10 @@ def execute():
d.db_set("docstatus", 1) d.db_set("docstatus", 1)
time_sheet.update_production_order(time_sheet.name) time_sheet.update_production_order(time_sheet.name)
time_sheet.update_task_and_project() time_sheet.update_task_and_project()
if data.docstatus == 2:
time_sheet.db_set("docstatus", 2)
for d in time_sheet.get("time_logs"):
d.db_set("docstatus", 2)
def get_timelog_data(data): def get_timelog_data(data):
return { return {