Browse Source

minor bugfixes

develop
Rushabh Mehta 13 years ago
parent
commit
f2c4c4231f
  1. 1
      .gitignore
  2. 2
      erpnext/home/page/profile_settings/profile_settings.py
  3. 8
      erpnext/startup/startup.js

1
.gitignore

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

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

@ -12,7 +12,7 @@ def change_password(arg):
webnotes.msgprint('Old password is not correct', raise_exception=1)
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');
def get_user_details(arg=None):

8
erpnext/startup/startup.js

@ -55,14 +55,6 @@ pscript.startup_make_sidebar = function() {
// menu
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
page_body.left_sidebar.innerHTML = '';

Loading…
Cancel
Save