Merge pull request #5754 from rohitwaghchaure/timesheet_patch_fix

[Fix] Timesheet patch
This commit is contained in:
Nabin Hait 2016-07-14 15:25:34 +05:30 committed by GitHub
commit 64602168b7
2 changed files with 2 additions and 3 deletions

View File

@ -3,8 +3,7 @@ import frappe
from erpnext.manufacturing.doctype.production_order.production_order import make_timesheet, add_timesheet_detail
def execute():
if "note" not in frappe.db.get_table_columns("timesheet"):
frappe.reload_doc('projects', 'doctype', 'timesheet')
frappe.reload_doc('projects', 'doctype', 'timesheet')
for data in frappe.get_all('Time Log', fields=["*"],
filters = [["docstatus", "<", "2"]]):

View File

@ -1,7 +1,7 @@
import frappe
def execute():
if frappe.db.table_exists("Time Sheet"):
if frappe.db.table_exists("Time Sheet") and not frappe.db.table_exists("Timesheet"):
frappe.rename_doc("DocType", "Time Sheet", "Timesheet")
frappe.rename_doc("DocType", "Time Sheet Detail", "Timesheet Detail")