nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rushabh Mehta
2013-02-14 17:35:32 +05:30
parent 5eb37647cf fb67605042
commit b496756696
12 changed files with 254 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utilities/page/messages/messages.py
View File

@@ -91,6 +91,8 @@ def delete(arg=None):
def notify(arg=None):
from webnotes.utils import cstr
from startup import get_url
fn = webnotes.conn.sql('select first_name, last_name from tabProfile where name=%s', webnotes.user.name)[0]
if fn[0] or f[1]:
fn = cstr(fn[0]) + (fn[0] and ' ' or '') + cstr(fn[1])
@@ -110,14 +112,4 @@ def notify(arg=None):
from webnotes.utils.email_lib import sendmail
sendmail([arg['contact']], sender, message, "You have a message from %s" % (fn,))
def get_url():
from webnotes.utils import get_request_site_address
url = get_request_site_address()
if not url or "localhost" in url:
subdomain = webnotes.conn.get_value("Website Settings", "Website Settings",
"subdomain")
if subdomain:
if "http" not in subdomain:
url = "http://" + subdomain
return url