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

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

Browse Source
This commit is contained in:
nabinhait 2011-07-19 12:34:32 +05:30
commit 5f1d9962c6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
home/page/my_company/my_company.js
View File

@ -143,7 +143,10 @@ MemberList.prototype.make_list = function() {
var c1 = repl(' AND (first_name LIKE "%(txt)s" OR last_name LIKE "%(txt)s" OR name LIKE "%(txt)s")', {txt:'%' + me.search_inp.value + '%'}); var c1 = repl(' AND (first_name LIKE "%(txt)s" OR last_name LIKE "%(txt)s" OR name LIKE "%(txt)s")', {txt:'%' + me.search_inp.value + '%'});
} }
this.query = repl("SELECT distinct ifnull(name,''), ifnull(concat_ws(' ', first_name, last_name),''), ifnull(messanger_status,''), ifnull(gender,''), ifnull(file_list,''), 0, enabled from tabProfile where docstatus != 2 AND name not in ('Guest','Administrator') %(cond)s ORDER BY name asc",{cond:c1}); this.query = repl("SELECT distinct ifnull(name,''), ifnull(concat_ws(' ', first_name, last_name),''), \
ifnull(messanger_status,''), ifnull(gender,''), ifnull(file_list,''), 0, enabled, last_login \
from tabProfile where docstatus != 2 AND name not in ('Guest','Administrator') %(cond)s \
ORDER BY name asc",{cond:c1});
} }
this.lst.make(this.lst_area); this.lst.make(this.lst_area);
this.lst.show_cell= function(cell, ri, ci, d) { this.lst.show_cell= function(cell, ri, ci, d) {

2
startup/event_handlers.py
View File

@ -33,7 +33,7 @@ def update_account_details():
webnotes.conn.set_global('days_to_expiry', webnotes.form_dict.get('days_to_expiry')) webnotes.conn.set_global('days_to_expiry', webnotes.form_dict.get('days_to_expiry'))
if webnotes.form_dict.get('first_name'): if webnotes.form_dict.get('first_name'):
from server_tools.server_tools.gateway_utils import update_user_details from server_tools.gateway_utils import update_user_details
update_user_details() update_user_details()
# #