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

added report button in todo page

Browse Source
This commit is contained in:
Anand Doshi 2013-02-25 15:22:20 +05:30
parent bdf4bcc2ed
commit b60aef5595
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hr/report/employee_leave_balance/employee_leave_balance.py
View File

@ -2,7 +2,8 @@ from __future__ import unicode_literals
import webnotes import webnotes
from webnotes.widgets.reportview import execute as runreport from webnotes.widgets.reportview import execute as runreport
def execute(filters={}): def execute(filters=None):
if not filters: filters = {}
employees = runreport(doctype="Employee", fields=["name", "employee_name", "department"]) employees = runreport(doctype="Employee", fields=["name", "employee_name", "department"])
leave_types = webnotes.conn.sql_list("select name from `tabLeave Type`") leave_types = webnotes.conn.sql_list("select name from `tabLeave Type`")

8
patches/february_2013/p08_todo_query_report.py Normal file
View File

@ -0,0 +1,8 @@
import webnotes
def execute():
webnotes.clear_perms("Report")
webnotes.clear_perms("ToDo")
webnotes.reload_doc("core", "doctype", "report")
webnotes.reload_doc("core", "doctype", "todo")
webnotes.reload_doc("core", "report", "todo")

3
patches/patch_list.py
View File

@ -193,5 +193,6 @@ patch_list = [
"patches.february_2013.repost_reserved_qty", "patches.february_2013.repost_reserved_qty",
"execute:webnotes.reload_doc('core', 'doctype', 'report') # 2013-02-25", "execute:webnotes.reload_doc('core', 'doctype', 'report') # 2013-02-25",
"execute:webnotes.conn.sql(\"update `tabReport` set report_type=if(ifnull(query, '')='', 'Report Builder', 'Query Report') where is_standard='No'\")", "execute:webnotes.conn.sql(\"update `tabReport` set report_type=if(ifnull(query, '')='', 'Report Builder', 'Query Report') where is_standard='No'\")",
"execute:webnotes.conn.sql(\"update `tabReport` set report_name=name where ifnull(report_name,'')='' and is_standard='No'\")" "execute:webnotes.conn.sql(\"update `tabReport` set report_name=name where ifnull(report_name,'')='' and is_standard='No'\")",
"patches.february_2013.p08_todo_query_report",
] ]

6
utilities/page/todo/todo.js
View File

@ -194,6 +194,12 @@ wn.pages.todo.onload = function(wrapper) {
}, 'icon-plus'); }, 'icon-plus');
wrapper.appframe.add_ripped_paper_effect(wrapper); wrapper.appframe.add_ripped_paper_effect(wrapper);
// show report button for System Manager
if(wn.boot.profile.roles.indexOf("System Manager") !== -1) {
wrapper.appframe.add_button("Report", function() { wn.set_route("query-report", "todo"); },
"icon-table");
}
// load todos // load todos
erpnext.todo.refresh(); erpnext.todo.refresh();