diff --git a/erpnext/projects/doctype/project_control/project_control.py b/erpnext/projects/doctype/project_control/project_control.py index 92ed64b3892..42a9ba3d629 100644 --- a/erpnext/projects/doctype/project_control/project_control.py +++ b/erpnext/projects/doctype/project_control/project_control.py @@ -117,20 +117,26 @@ class DocType: def sent_reminder_task(): - task_list = sql("select subject, allocated_to, project, exp_start_date, exp_end_date, \ - priority, status, name, senders_name, opening_date, review_date, description from tabTicket \ - where task_email_notify=1 and sent_reminder=0 and status='Open' and \ - exp_start_date is not null",as_dict=1) - msgprint(task_list) - for i in task_list: - if date_diff(i['exp_start_date'],nowdate())==2: - msgprint(i['exp_start_date']) - msgprint(add_days(nowdate(),2)) - msg2="""This is an auto generated email.

This is a reminder for the task %s has been assigned \ - to you by %s on %s

Project: %s

Review Date: %s \ -

Details: %s

The expected start date of this task is on %s """ \ - %(i['name'], i['senders_name'], i['opening_date'], i['project'], i['review_date'], i['description'], i['exp_start_date']) - sendmail(i['allocated_to'], sender='automail@webnotestech.com', msg=msg2,send_now=1,\ + task_list = sql(""" + select subject, allocated_to, project, exp_start_date, exp_end_date, + priority, status, name, senders_name, opening_date, review_date, description + from tabTicket + where task_email_notify=1 + and sent_reminder=0 + and status='Open' + and exp_start_date is not null""",as_dict=1) + for i in task_list: + if date_diff(i['exp_start_date'],nowdate()) ==2: + msg2="""

Two days to complete: %(name)s

+

This is a reminder for the task %(name)s has been assigned to you + by %(senders_name)s on %(opening_date)s

+

Project: %(project)s

+

Review Date: %(review_date)s

+

Details: %(description)s

+

If you have already completed this task, please update the system

+

Good Luck!

+

(This notification is autogenerated)

""" % i + sendmail(i['allocated_to'], sender='automail@webnotestech.com', msg=msg2,send_now=1, \ subject='A task has been assigned') - i['sent_reminder']=1 + sql("update `tabTicket` set sent_reminder='1' where name='%(name)s' and allocated_to= '%(allocated_to)s'" % i) diff --git a/erpnext/projects/doctype/ticket/ticket.py b/erpnext/projects/doctype/ticket/ticket.py index b1ecf04af0f..5f299c337c6 100644 --- a/erpnext/projects/doctype/ticket/ticket.py +++ b/erpnext/projects/doctype/ticket/ticket.py @@ -74,6 +74,7 @@ class DocType: if self.doc.task_email_notify and (self.doc.allocated_to != self.doc.allocated_to_old): self.doc.allocated_to_old = self.doc.allocated_to self.sent_notification() + self.doc.sent_reminder = 0 if self.doc.exp_start_date: sql("delete from tabEvent where ref_type='Task' and ref_name=%s", self.doc.name) self.add_calendar_event() @@ -96,7 +97,8 @@ class DocType: self.doc.project, self.doc.review_date, self.doc.closing_date, self.doc.description) sendmail(self.doc.allocated_to, sender='automail@webnotestech.com', msg=msg2,send_now=1,\ subject='A task has been assigned') - self.doc.sent_reminder=0 + + #validate before closing task def validate_for_closed(self):