diff --git a/frappe/core/report/todo/todo.js b/frappe/core/report/todo/todo.js index ff6cb20556..e69de29bb2 100644 --- a/frappe/core/report/todo/todo.js +++ b/frappe/core/report/todo/todo.js @@ -1 +0,0 @@ -__("Test") // for test case \ No newline at end of file diff --git a/frappe/core/report/todo/todo.py b/frappe/core/report/todo/todo.py index 0c5012962b..87f9496f6d 100644 --- a/frappe/core/report/todo/todo.py +++ b/frappe/core/report/todo/todo.py @@ -9,28 +9,28 @@ from frappe.utils import getdate def execute(filters=None): priority_map = {"High": 3, "Medium": 2, "Low": 1} - + todo_list = runreport(doctype="ToDo", fields=["name", "date", "description", - "priority", "reference_type", "reference_name", "assigned_by", "owner"], - filters=[["ToDo", "checked", "!=", 1]]) - - todo_list.sort(key=lambda todo: (priority_map.get(todo.priority, 0), + "priority", "reference_type", "reference_name", "assigned_by", "owner"], + filters=[["ToDo", "status", "=", "Open"]]) + + todo_list.sort(key=lambda todo: (priority_map.get(todo.priority, 0), todo.date and getdate(todo.date) or getdate("1900-01-01")), reverse=True) - - columns = [_("ID")+":Link/ToDo:90", _("Priority")+"::60", _("Date")+ ":Date", - _("Description")+"::150", _("Assigned To/Owner") + ":Data:120", + + columns = [_("ID")+":Link/ToDo:90", _("Priority")+"::60", _("Date")+ ":Date", + _("Description")+"::150", _("Assigned To/Owner") + ":Data:120", _("Assigned By")+":Data:120", _("Reference")+"::200"] result = [] for todo in todo_list: if todo.owner==frappe.session.user or todo.assigned_by==frappe.session.user: if todo.reference_type: - todo.reference = """%s: %s""" % (todo.reference_type, + todo.reference = """%s: %s""" % (todo.reference_type, todo.reference_name, todo.reference_type, todo.reference_name) else: todo.reference = None result.append([todo.name, todo.priority, todo.date, todo.description, todo.owner, todo.assigned_by, todo.reference]) - + return columns, result - +