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

minor bugfixes

Browse Source
This commit is contained in:
Rushabh Mehta 2012-01-19 11:43:34 +01:00
parent 3a32478db9
commit f2c4c4231f
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
*.comp.js *.comp.js
.DS_Store .DS_Store
server_tools server_tools
services
user_files user_files
patch.log patch.log
lib lib

2
erpnext/home/page/profile_settings/profile_settings.py
View File

@ -12,7 +12,7 @@ def change_password(arg):
webnotes.msgprint('Old password is not correct', raise_exception=1) webnotes.msgprint('Old password is not correct', raise_exception=1)
from webnotes.utils import nowdate from webnotes.utils import nowdate
webnotes.conn.sql("update tabProfile set password=password(%s) where name=%s",(arg['new_password'], nowdate(), webnotes.session['user'])) webnotes.conn.sql("update tabProfile set password=password(%s), modified=%s where name=%s",(arg['new_password'], nowdate(), webnotes.session['user']))
webnotes.msgprint('Password Updated'); webnotes.msgprint('Password Updated');
def get_user_details(arg=None): def get_user_details(arg=None):

8
erpnext/startup/startup.js
View File

@ -55,14 +55,6 @@ pscript.startup_make_sidebar = function() {
// menu // menu
var ml = r.message; var ml = r.message;
// login-file
if(r.login_url){
login_file = 'http://' + r.login_url;
}
else if(pscript.is_erpnext_saas) {
login_file = 'https://www.erpnext.com';
}
// clear // clear
page_body.left_sidebar.innerHTML = ''; page_body.left_sidebar.innerHTML = '';