vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into sync

Browse source
This commit is contained in:
Anand Doshi 2012-03-14 12:26:39 +05:30
commit 5634034797
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
py/webnotes/widgets/form/assign_to.py
View file

@ -93,14 +93,24 @@ def notify_assignment(assigned_by, owner, doc_type, doc_name, action='CLOSE', no
# Search for email address in description -- i.e. assignee
assignment = """<a href="#!Form/%s/%s">%s</a>""" % (doc_type, doc_name, doc_name)
if action=='CLOSE':
arg = {
'uid': assigned_by,
'comment': "The task %s, assigned to %s, has been closed by %s" % (assignment, owner, webnotes.user.name)
}
if owner == webnotes.session.get('user'):
arg = {
'uid': assigned_by,
'comment': "The task %s, that you assigned to %s, has been \
closed." % (assignment, owner)
}
else:
arg = {
'uid': assigned_by,
'comment': "The task %s, that you assigned to %s, \
has been closed by %s." % (assignment, owner,
webnotes.session.get('user'))
}
else:
arg = {
'uid': owner,
'comment': "A new task, %s, has been assigned to you by %s" % (assignment, webnotes.user.name),
'comment': "A new task, %s, has been assigned to you by %s." \
% (assignment, webnotes.session.get('uer')),
'notify': notify
}
from home.page.my_company import my_company