Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
commit
4febc84f13
@ -131,12 +131,14 @@ def sent_reminder_task():
|
||||
<p>This is a reminder for the task %(name)s has been assigned to you
|
||||
by %(senders_name)s on %(opening_date)s</p>
|
||||
<p><b>Project:</b> %(project)s</p>
|
||||
<p><b>Expected Start Date:</b> %(exp_start_date)s</p>
|
||||
<p><b>Expected End Date:</b> %(exp_end_date)s</p>
|
||||
<p><b>Review Date:</b> %(review_date)s</p>
|
||||
<p><b>Details:</b> %(description)s</p>
|
||||
<p>If you have already completed this task, please update the system</p>
|
||||
<p>Good Luck!</p>
|
||||
<p>(This notification is autogenerated)</p>""" % i
|
||||
sendmail(i['allocated_to'], sender='automail@webnotestech.com', msg=msg2,send_now=1, \
|
||||
subject='A task has been assigned')
|
||||
subject='A task has been assigned')
|
||||
sql("update `tabTicket` set sent_reminder='1' where name='%(name)s' and allocated_to= '%(allocated_to)s'" % i)
|
||||
|
||||
|
@ -94,7 +94,9 @@ class DocType:
|
||||
i = {
|
||||
'name' : self.doc.name,
|
||||
'senders_name': self.doc.allocated_to,
|
||||
'opening_date': self.doc.exp_start_date,
|
||||
'opening_date': self.doc.opening_date,
|
||||
'exp_start_date': self.doc.exp_start_date,
|
||||
'exp_end_date' : self.doc.exp_end_date,
|
||||
'project': self.doc.project,
|
||||
'review_date': self.doc.review_date,
|
||||
'description': self.doc.description
|
||||
@ -105,12 +107,14 @@ class DocType:
|
||||
by %(senders_name)s on %(opening_date)s</p>
|
||||
<p><b>Project:</b> %(project)s</p>
|
||||
<p><b>Review Date:</b> %(review_date)s</p>
|
||||
<p><b>Expected Start Date:</b> %(exp_start_date)s</p>
|
||||
<p><b>Expected End Date:</b> %(exp_end_date)s</p>
|
||||
<p><b>Details:</b> %(description)s</p>
|
||||
<p>You will also recieve another reminder 2 days before the commencement of the task</p>
|
||||
<p>Good Luck!</p>
|
||||
<p>(This notification is autogenerated)</p>""" % i
|
||||
sendmail(self.doc.allocated_to, sender='automail@webnotestech.com', msg=msg2,send_now=1,\
|
||||
subject='A task has been assigned')
|
||||
subject='A task has been assigned')
|
||||
|
||||
|
||||
|
||||
@ -213,7 +217,7 @@ class DocType:
|
||||
""" Add calendar event for task in calendar of Allocated person"""
|
||||
event = Document('Event')
|
||||
event.owner = self.doc.allocated_to
|
||||
event.description =''
|
||||
event.description = self.doc.name
|
||||
event.event_date = self.doc.exp_start_date and self.doc.exp_start_date or ''
|
||||
event.event_hour = self.doc.event_hour and self.doc.event_hour or '10:00'
|
||||
event.event_type = 'Private'
|
||||
|
@ -5,14 +5,14 @@
|
||||
{
|
||||
'creation': '2011-01-28 17:52:35',
|
||||
'docstatus': 0,
|
||||
'modified': '2011-12-23 12:02:29',
|
||||
'modified': '2011-12-26 11:56:35',
|
||||
'modified_by': 'Administrator',
|
||||
'owner': 'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all DocType
|
||||
{
|
||||
'_last_update': '1324619022',
|
||||
'_last_update': '1324880734',
|
||||
'allow_trash': 1,
|
||||
'autoname': 'TIC/.####',
|
||||
'colour': 'White:FFF',
|
||||
@ -26,7 +26,7 @@
|
||||
'show_in_menu': 0,
|
||||
'subject': '%(subject)s',
|
||||
'tag_fields': 'status',
|
||||
'version': 252
|
||||
'version': 254
|
||||
},
|
||||
|
||||
# These values are common for all DocField
|
||||
@ -137,15 +137,6 @@
|
||||
'trigger': 'Client'
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'task_email_notify',
|
||||
'fieldtype': 'Check',
|
||||
'label': 'Sent Mail Notification',
|
||||
'permlevel': 0
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
@ -274,6 +265,15 @@
|
||||
'trigger': 'Client'
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'task_email_notify',
|
||||
'fieldtype': 'Check',
|
||||
'label': 'Sent Mail Notification',
|
||||
'permlevel': 0
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
|
Loading…
x
Reference in New Issue
Block a user