This commit is contained in:
Rushabh Mehta 2012-01-20 15:32:18 +05:30
parent 6840ef67df
commit 49ebfb6a30
7 changed files with 24 additions and 15 deletions

View File

@ -48,9 +48,8 @@ def make_feed(doc, subject, color):
def update_feed(doc, method=None):
"adds a new feed"
if method=='validate':
return
subject, color = feed_dict.get(doc.doctype, [None, None])
if subject:
subject = subject % doc.fields
make_feed(doc, subject, color)
if method=='on_update':
subject, color = feed_dict.get(doc.doctype, [None, None])
if subject:
subject = subject % doc.fields
make_feed(doc, subject, color)

View File

@ -243,7 +243,8 @@ MemberItem = function(parent, det, mlist) {
// image
this.img = $a($td(this.tab,0,0),'img','',{width:'41px'});
set_user_img(this.img, det.name, null,
(det.file_list ? det.file_list.split(NEWLINE)[0].split(',')[1] : ('no_img_' + (det.gender=='Female' ? 'f' : 'm'))));
(det.file_list ? det.file_list.split(NEWLINE)[0].split(',')[1] :
('no_img_' + (det.gender=='Female' ? 'f' : 'm'))));
}
// set other details like email id, name etc

View File

@ -98,18 +98,17 @@ def add_profile(args):
SET password = PASSWORD(%s), modified = %s
WHERE name = %s""", (args.get('password'), now, email))
send_welcome_mail(email, args.get('password'))
send_welcome_mail(email, args)
def send_welcome_mail(email, password):
def send_welcome_mail(email, args):
"""send welcome mail to user with password and login url"""
pr = Document('Profile', email)
from webnotes.utils.email_lib import sendmail_md
args = {
args.update({
'company': webnotes.conn.get_default('company'),
'name': email,
'password': password,
'account_url': webnotes.conn.get_default('account_url')
}
})
sendmail_md(pr.email, subject="Welcome to ERPNext", msg=welcome_txt % args)
#
@ -184,7 +183,9 @@ def update_security(args=''):
welcome_txt = """
## %(company)s
#### Welcome!
Dear %(first_name)s %(last_name)s
Welcome!
A new account has been created for you, here are your details:

View File

@ -6,11 +6,14 @@ def execute():
add_default_home_page()
cleanup()
reload_doc('setup','doctype','manage_account')
webnotes.conn.commit()
webnotes.conn.sql("drop table tabDocTrigger")
def cleanup():
from webnotes.model import delete_doc
delete_doc("DocType", "SSO Control")
delete_doc("DocType", "WN ERP Cient Control")
delete_doc("DocType", "DocTrigger")
def add_default_home_page():
if not webnotes.conn.sql("""select name from `tabDefault Home Page`

View File

@ -28,3 +28,8 @@ def on_login_post_session(login_manager):
user=%s AND
sid!=%s""", \
(webnotes.session['user'], webnotes.session['sid']), as_list=1)
def doclist_all(doc, method):
"""doclist trigger called from webnotes.model.doclist on any event"""
import home
home.update_feed(doc, method)

View File

@ -3,7 +3,7 @@
<meta charset="utf-8">
<title>ERPNext</title>
<meta name="author" content="">
<script type="text/javascript">window._version_number="82"
<script type="text/javascript">window._version_number="86"
wn={}
wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}

View File

@ -1 +1 @@
82
86