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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait 2012-12-06 17:25:24 +05:30
commit c3414cd9d1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hr/doctype/leave_application/leave_application.js
View File

@ -23,6 +23,7 @@ cur_frm.cscript.onload = function(doc, dt, dn) {
method:"get_approver_list", method:"get_approver_list",
callback: function(r) { callback: function(r) {
cur_frm.set_df_property("leave_approver", "options", r.message); cur_frm.set_df_property("leave_approver", "options", r.message);
get_leave_balance(cur_frm.doc);
} }
}); });
} }

2
website/utils.py
View File

@ -73,7 +73,7 @@ def page_name(title):
def update_page_name(doc, title): def update_page_name(doc, title):
"""set page_name and check if it is unique""" """set page_name and check if it is unique"""
webnotes.conn.sql(doc, "page_name", title) webnotes.conn.set(doc, "page_name", page_name(title))
res = webnotes.conn.sql("""\ res = webnotes.conn.sql("""\
select count(*) from `tab%s` select count(*) from `tab%s`