diff --git a/support/doctype/communication/communication.txt b/support/doctype/communication/communication.txt index 3d249ab559..1f01c50c38 100644 --- a/support/doctype/communication/communication.txt +++ b/support/doctype/communication/communication.txt @@ -4,7 +4,7 @@ "docstatus": 0, "creation": "2012-11-14 12:25:16", "modified_by": "Administrator", - "modified": "2012-11-27 12:24:43" + "modified": "2012-11-27 18:51:01" }, { "autoname": "naming_series:", @@ -69,7 +69,7 @@ "label": "Content", "width": "400", "fieldname": "content", - "fieldtype": "Text", + "fieldtype": "Text Editor", "reqd": 0, "permlevel": 0 }, diff --git a/support/doctype/support_ticket/support_ticket.py b/support/doctype/support_ticket/support_ticket.py index d42ad82263..e9b13bcc6c 100644 --- a/support/doctype/support_ticket/support_ticket.py +++ b/support/doctype/support_ticket/support_ticket.py @@ -33,21 +33,21 @@ class DocType(TransactionBase): return webnotes.conn.get_value('Email Settings',None,'support_email') def get_subject(self, comm): - return '[' + self.doc.name + '] ' + (comm.doc.subject or 'No Subject Specified') + return '[' + self.doc.name + '] ' + (comm.subject or 'No Subject Specified') def get_content(self, comm): signature = webnotes.conn.get_value('Email Settings',None,'support_signature') - content = comm.doc.content + content = comm.content if signature: content += '

' + signature + '

' return content def on_communication_sent(self, comm): webnotes.conn.set(self.doc, 'status', 'Waiting for Customer') - if comm.doc.lead and not self.doc.lead: - webnotes.conn.set(self.doc, 'lead', comm.doc.lead) - if comm.doc.contact and not self.doc.contact: - webnotes.conn.set(self.doc, 'contact', comm.doc.contact) + if comm.lead and not self.doc.lead: + webnotes.conn.set(self.doc, 'lead', comm.lead) + if comm.contact and not self.doc.contact: + webnotes.conn.set(self.doc, 'contact', comm.contact) def close_ticket(self): webnotes.conn.set(self.doc,'status','Closed')