version
diff --git a/erpnext/home/__init__.py b/erpnext/home/__init__.py
index 8969695..0380ec1 100644
--- a/erpnext/home/__init__.py
+++ b/erpnext/home/__init__.py
@@ -48,9 +48,8 @@
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)
diff --git a/erpnext/home/page/my_company/my_company.js b/erpnext/home/page/my_company/my_company.js
index d286372..a057ac3 100644
--- a/erpnext/home/page/my_company/my_company.js
+++ b/erpnext/home/page/my_company/my_company.js
@@ -243,7 +243,8 @@
// 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
diff --git a/erpnext/home/page/my_company/my_company.py b/erpnext/home/page/my_company/my_company.py
index 09bb9ee..1610506 100644
--- a/erpnext/home/page/my_company/my_company.py
+++ b/erpnext/home/page/my_company/my_company.py
@@ -98,18 +98,17 @@
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 @@
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:
diff --git a/erpnext/patches/jan_mar_2012/subdomain_login_patch.py b/erpnext/patches/jan_mar_2012/subdomain_login_patch.py
index edfcb66..2b89368 100644
--- a/erpnext/patches/jan_mar_2012/subdomain_login_patch.py
+++ b/erpnext/patches/jan_mar_2012/subdomain_login_patch.py
@@ -6,11 +6,14 @@
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`
diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py
index 14cc6a0..798c201 100644
--- a/erpnext/startup/event_handlers.py
+++ b/erpnext/startup/event_handlers.py
@@ -28,3 +28,8 @@
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)
\ No newline at end of file
diff --git a/index.html b/index.html
index 381e794..772bac4 100644
--- a/index.html
+++ b/index.html
@@ -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]={}}
diff --git a/version.num b/version.num
index 9d1ce53..8bfa2f5 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-82
\ No newline at end of file
+86
\ No newline at end of file