From 2a59030e05d4693793e55cc0ffaa772c71f5a389 Mon Sep 17 00:00:00 2001 From: Nijil Y Date: Mon, 26 Dec 2011 12:00:30 +0530 Subject: [PATCH 1/3] task notification fix --- .../project_control/project_control.py | 2 +- erpnext/projects/doctype/ticket/ticket.py | 4 ++-- erpnext/projects/doctype/ticket/ticket.txt | 24 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/erpnext/projects/doctype/project_control/project_control.py b/erpnext/projects/doctype/project_control/project_control.py index 6d41ea95dc..68361b2b5e 100644 --- a/erpnext/projects/doctype/project_control/project_control.py +++ b/erpnext/projects/doctype/project_control/project_control.py @@ -137,6 +137,6 @@ def sent_reminder_task():

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') + subject='A task has been assigned') 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 8ef8fb9bf1..620bc50bdc 100644 --- a/erpnext/projects/doctype/ticket/ticket.py +++ b/erpnext/projects/doctype/ticket/ticket.py @@ -110,7 +110,7 @@ class DocType:

Good Luck!

(This notification is autogenerated)

""" % 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 +213,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' diff --git a/erpnext/projects/doctype/ticket/ticket.txt b/erpnext/projects/doctype/ticket/ticket.txt index a1ac330e1d..5b8da14111 100644 --- a/erpnext/projects/doctype/ticket/ticket.txt +++ b/erpnext/projects/doctype/ticket/ticket.txt @@ -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', From 68de3687f4dd63584c3ef52c6e54d2489b7a57e3 Mon Sep 17 00:00:00 2001 From: Nijil Y Date: Mon, 26 Dec 2011 15:24:55 +0530 Subject: [PATCH 2/3] added fields --- erpnext/projects/doctype/ticket/ticket.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/projects/doctype/ticket/ticket.py b/erpnext/projects/doctype/ticket/ticket.py index 620bc50bdc..4dbcfe78de 100644 --- a/erpnext/projects/doctype/ticket/ticket.py +++ b/erpnext/projects/doctype/ticket/ticket.py @@ -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,6 +107,8 @@ class DocType: by %(senders_name)s on %(opening_date)s

Project: %(project)s

Review Date: %(review_date)s

+

Expected Start Date: %(exp_start_date)s

+

Expected End Date: %(exp_end_date)s

Details: %(description)s

You will also recieve another reminder 2 days before the commencement of the task

Good Luck!

From 04eb52dbe310f1b05fc87cd8b0da96a55d628fc3 Mon Sep 17 00:00:00 2001 From: Nijil Y Date: Mon, 26 Dec 2011 15:30:45 +0530 Subject: [PATCH 3/3] added fields --- erpnext/projects/doctype/project_control/project_control.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/projects/doctype/project_control/project_control.py b/erpnext/projects/doctype/project_control/project_control.py index 68361b2b5e..4b382a555d 100644 --- a/erpnext/projects/doctype/project_control/project_control.py +++ b/erpnext/projects/doctype/project_control/project_control.py @@ -131,6 +131,8 @@ def sent_reminder_task():

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

+

Expected Start Date: %(exp_start_date)s

+

Expected End Date: %(exp_end_date)s

Review Date: %(review_date)s

Details: %(description)s

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