[Fix] Time sheet rename issues
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 0796cec..1d48df0 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -450,7 +450,7 @@
frm.fields_dict["timesheets"].grid.get_field("time_sheet").get_query = function(doc, cdt, cdn){
return {
filters: [
- ["Time Sheet", "status", "in", ["Submitted", "Payslip"]]
+ ["Timesheet", "status", "in", ["Submitted", "Payslip"]]
]
}
}
diff --git a/erpnext/config/manufacturing.py b/erpnext/config/manufacturing.py
index 51c5ef9..d2432b6 100644
--- a/erpnext/config/manufacturing.py
+++ b/erpnext/config/manufacturing.py
@@ -23,7 +23,7 @@
},
{
"type": "doctype",
- "name": "Time Sheet",
+ "name": "Timesheet",
"description": _("Time Sheet for manufacturing."),
},
diff --git a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
index 8c2b44a..24a5f4e 100644
--- a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
+++ b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
@@ -1,11 +1,11 @@
import frappe
-from erpnext.manufacturing.doctype.production_order.production_order import make_time_sheet, add_timesheet_detail
+from erpnext.manufacturing.doctype.production_order.production_order import make_timesheet, add_timesheet_detail
def execute():
for data in frappe.get_all('Time Log', fields=["*"],
filters = [["docstatus", "<", "2"]]):
- time_sheet = make_time_sheet(data.production_order)
+ time_sheet = make_timesheet(data.production_order)
args = get_timesheet_data(data)
add_timesheet_detail(time_sheet, args)
time_sheet.docstatus = data.docstatus
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index a0f52dd..f9b71c4 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -80,7 +80,7 @@
section.on('click', '.time-sheet-link', function() {
var activity_type = $(this).attr('data-activity_type');
- frappe.set_route('List', 'Time Sheet',
+ frappe.set_route('List', 'Timesheet',
{'activity_type': activity_type, 'project': frm.doc.name});
});
}
diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js
index 1d708c4..c6b6664 100644
--- a/erpnext/projects/doctype/task/task.js
+++ b/erpnext/projects/doctype/task/task.js
@@ -16,10 +16,10 @@
if(!doc.__islocal) {
- if(frappe.model.can_read("Time Sheet")) {
- frm.add_custom_button(__("Time Sheet"), function() {
+ if(frappe.model.can_read("Timesheet")) {
+ frm.add_custom_button(__("Timesheet"), function() {
frappe.route_options = {"project": doc.project, "task": doc.name}
- frappe.set_route("List", "Time Sheet");
+ frappe.set_route("List", "Timesheet");
}, __("View"), true);
}
if(frappe.model.can_read("Expense Claim")) {
diff --git a/erpnext/projects/report/daily_time_sheet_summary/__init__.py b/erpnext/projects/report/daily_time_sheet_summary/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/projects/report/daily_time_sheet_summary/__init__.py
+++ /dev/null
diff --git a/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.js b/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.js
deleted file mode 100644
index 4798697..0000000
--- a/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.query_reports["Daily Time Sheet Summary"] = {
- "filters": [
- {
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today()
- },
- {
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today()
- },
- ]
-}
\ No newline at end of file
diff --git a/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.json b/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.json
deleted file mode 100644
index cf5a8cb..0000000
--- a/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "add_total_row": 0,
- "apply_user_permissions": 1,
- "creation": "2016-06-25 01:52:25.911238",
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "idx": 0,
- "is_standard": "Yes",
- "modified": "2016-06-25 01:52:31.214122",
- "modified_by": "Administrator",
- "module": "Projects",
- "name": "Daily Time Sheet Summary",
- "owner": "Administrator",
- "ref_doctype": "Time Sheet",
- "report_name": "Daily Time Sheet Summary",
- "report_type": "Script Report"
-}
\ No newline at end of file
diff --git a/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.py b/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.py
deleted file mode 100644
index ab0b4a1..0000000
--- a/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-
-def execute(filters=None):
- if not filters:
- filters = {}
- elif filters.get("from_date") or filters.get("to_date"):
- filters["from_time"] = "00:00:00"
- filters["to_time"] = "24:00:00"
-
- columns = [_("Timesheet") + ":Link/Timesheet:120", _("Employee") + "::150", _("From Datetime") + "::140",
- _("To Datetime") + "::140", _("Hours") + "::70", _("Activity Type") + "::120", _("Task") + ":Link/Task:150",
- _("Project") + ":Link/Project:120", _("Status") + "::70"]
-
- conditions = "ts.docstatus = 1"
- if filters.get("from_date"):
- conditions += " and tsd.from_time >= timestamp(%(from_date)s, %(from_time)s)"
- if filters.get("to_date"):
- conditions += " and tsd.to_time <= timestamp(%(to_date)s, %(to_time)s)"
-
- data = get_data(conditions, filters)
-
- return columns, data
-
-def get_data(conditions, filters):
- time_sheet = frappe.db.sql(""" select ts.name, ts.employee, tsd.from_time, tsd.to_time, tsd.hours,
- tsd.activity_type, tsd.task, tsd.project, ts.status from `tabTimesheet Detail` tsd,
- `tabTimesheet` ts where ts.name = tsd.parent and %s order by ts.name"""%(conditions), filters, as_list=1)
-
- return time_sheet