Merge branch 'master' into perpetual

docs/dev/docs.dev.client_script.md

@@ -0,0 +1,10 @@
+---
+{
+	"_label": "Client Scripts: Custoimzing ERPNext"
+	
+}
+---
+
+	
+	
+	

docs/dev/docs.dev.md

@@ -5,8 +5,9 @@
 		"docs.dev.install",
 		"docs.dev.quickstart",
 		"docs.dev.framework",
-		"docs.dev.api",
 		"docs.dev.modules",
+		"docs.dev.client_script",
+		"docs.dev.api",
 		"docs.dev.translate",
 		"docs.dev.docs"
 	]

hr/doctype/job_applicant/job_applicant.js

@@ -16,7 +16,7 @@ cur_frm.cscript = {
 	},
 	make_listing: function(doc) {
 		cur_frm.communication_view = new wn.views.CommunicationList({
-			list: wn.model.get("Communication", {"job_applicant": doc.name}),
+			list: wn.model.get("Communication", {"parent": doc.name, "parenttype": "Job Applicant"}),
 			parent: cur_frm.fields_dict['thread_html'].wrapper,
 			doc: doc,
 			recipients: doc.email_id

patches/september_2013/p01_update_communication.py

@@ -7,4 +7,9 @@ def execute():
 			set parenttype=%s, parentfield='communications', 
 			parent=`%s` 
 			where ifnull(`%s`, '')!=''""" % ("%s", fieldname, fieldname), doctype)
+			
+		webnotes.reload_doc("core", "doctype", "communication")
+			
+		webnotes.conn.sql("""update tabCommunication set communication_date = creation where 
+			ifnull(communication_date, '')='' """)
 	

selling/doctype/lead/get_leads.py

@@ -12,9 +12,6 @@ def add_sales_communication(subject, content, sender, real_name, mail=None,
 	lead_name = webnotes.conn.get_value("Lead", {"email_id": sender})
 	contact_name = webnotes.conn.get_value("Contact", {"email_id": sender})
 
-	parent_doctype = "Contact" if contact_name else "Lead"
-	parent_name = contact_name or lead_name
-
 	if not (lead_name or contact_name):
 		# none, create a new Lead
 		lead = webnotes.bean({
@@ -28,6 +25,9 @@ def add_sales_communication(subject, content, sender, real_name, mail=None,
 		lead.insert()
 		lead_name = lead.doc.name
 
+	parent_doctype = "Contact" if contact_name else "Lead"
+	parent_name = contact_name or lead_name
+
 	message = make(content=content, sender=sender, subject=subject,
 		doctype = parent_doctype, name = parent_name, date=date)
 	

selling/doctype/lead/lead.js

@@ -51,7 +51,7 @@ erpnext.LeadController = wn.ui.form.Controller.extend({
 		}
 		
 		cur_frm.communication_view = new wn.views.CommunicationList({
-			list: wn.model.get("Communication", {"lead": this.frm.doc.name}),
+			list: wn.model.get("Communication", {"parenttype": "Lead", "parent":this.frm.doc.name}),
 			parent: this.frm.fields_dict.communication_html.wrapper,
 			doc: this.frm.doc,
 			recipients: this.frm.doc.email_id

support/doctype/support_ticket/support_ticket.js

@@ -46,16 +46,12 @@ $.extend(cur_frm.cscript, {
 	make_listing: function(doc) {
 		var wrapper = cur_frm.fields_dict['thread_html'].wrapper;
 		
-		var comm_list = wn.model.get("Communication", {"support_ticket": doc.name})
+		var comm_list = wn.model.get("Communication", {"parent": doc.name, "parenttype":"Support Ticket"})
-
-		var sortfn = function (a, b) { return (b.creation > a.creation) ? 1 : -1; }
-		comm_list = comm_list.sort(sortfn);
 		
-		if(!comm_list.length || (comm_list[comm_list.length - 1].sender != doc.raised_by)) {
+		if(!comm_list.length) {
 			comm_list.push({
 				"sender": doc.raised_by,
 				"creation": doc.creation,
-				"modified": doc.creation,
 				"content": doc.description});
 		}
 					

utilities/transaction_base.py

@@ -87,7 +87,7 @@ class TransactionBase(StatusUpdater):
 			if self.meta.get_field(fieldname):
 				self.doc.fields[fieldname] = val
 			
-		if self.meta.get_field("sales_team"):
+		if self.meta.get_field("sales_team") and self.doc.customer:
 			self.set_sales_team_for_customer()
 			
 	def set_sales_team_for_customer(self):