diff --git a/docs/docs.dev.api.md b/docs/dev/docs.dev.api.md
similarity index 100%
rename from docs/docs.dev.api.md
rename to docs/dev/docs.dev.api.md
diff --git a/docs/dev/docs.dev.client_script.md b/docs/dev/docs.dev.client_script.md
new file mode 100644
index 00000000000..fc82f9d5ff7
--- /dev/null
+++ b/docs/dev/docs.dev.client_script.md
@@ -0,0 +1,10 @@
+---
+{
+	"_label": "Client Scripts: Custoimzing ERPNext"
+	
+}
+---
+
+	
+	
+	
diff --git a/docs/docs.dev.docs.md b/docs/dev/docs.dev.docs.md
similarity index 100%
rename from docs/docs.dev.docs.md
rename to docs/dev/docs.dev.docs.md
diff --git a/docs/docs.dev.install.md b/docs/dev/docs.dev.install.md
similarity index 100%
rename from docs/docs.dev.install.md
rename to docs/dev/docs.dev.install.md
diff --git a/docs/docs.dev.install.restore_from_backup.md b/docs/dev/docs.dev.install.restore_from_backup.md
similarity index 100%
rename from docs/docs.dev.install.restore_from_backup.md
rename to docs/dev/docs.dev.install.restore_from_backup.md
diff --git a/docs/docs.dev.md b/docs/dev/docs.dev.md
similarity index 94%
rename from docs/docs.dev.md
rename to docs/dev/docs.dev.md
index 3f645d84fef..285f1767c7f 100644
--- a/docs/docs.dev.md
+++ b/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"
 	]
diff --git a/docs/docs.dev.modules.md b/docs/dev/docs.dev.modules.md
similarity index 100%
rename from docs/docs.dev.modules.md
rename to docs/dev/docs.dev.modules.md
diff --git a/docs/docs.dev.translate.md b/docs/dev/docs.dev.translate.md
similarity index 100%
rename from docs/docs.dev.translate.md
rename to docs/dev/docs.dev.translate.md
diff --git a/docs/docs.user.accounts.closing.md b/docs/user/accounts/docs.user.accounts.closing.md
similarity index 100%
rename from docs/docs.user.accounts.closing.md
rename to docs/user/accounts/docs.user.accounts.closing.md
diff --git a/docs/docs.user.accounts.journal_voucher.md b/docs/user/accounts/docs.user.accounts.journal_voucher.md
similarity index 100%
rename from docs/docs.user.accounts.journal_voucher.md
rename to docs/user/accounts/docs.user.accounts.journal_voucher.md
diff --git a/docs/docs.user.accounts.md b/docs/user/accounts/docs.user.accounts.md
similarity index 100%
rename from docs/docs.user.accounts.md
rename to docs/user/accounts/docs.user.accounts.md
diff --git a/docs/docs.user.accounts.payments.md b/docs/user/accounts/docs.user.accounts.payments.md
similarity index 100%
rename from docs/docs.user.accounts.payments.md
rename to docs/user/accounts/docs.user.accounts.payments.md
diff --git a/docs/docs.user.accounts.pos.md b/docs/user/accounts/docs.user.accounts.pos.md
similarity index 100%
rename from docs/docs.user.accounts.pos.md
rename to docs/user/accounts/docs.user.accounts.pos.md
diff --git a/docs/docs.user.accounts.purchase_invoice.md b/docs/user/accounts/docs.user.accounts.purchase_invoice.md
similarity index 100%
rename from docs/docs.user.accounts.purchase_invoice.md
rename to docs/user/accounts/docs.user.accounts.purchase_invoice.md
diff --git a/docs/docs.user.accounts.reports.md b/docs/user/accounts/docs.user.accounts.reports.md
similarity index 100%
rename from docs/docs.user.accounts.reports.md
rename to docs/user/accounts/docs.user.accounts.reports.md
diff --git a/docs/docs.user.accounts.returns.md b/docs/user/accounts/docs.user.accounts.returns.md
similarity index 100%
rename from docs/docs.user.accounts.returns.md
rename to docs/user/accounts/docs.user.accounts.returns.md
diff --git a/docs/docs.user.accounts.sales_invoice.md b/docs/user/accounts/docs.user.accounts.sales_invoice.md
similarity index 100%
rename from docs/docs.user.accounts.sales_invoice.md
rename to docs/user/accounts/docs.user.accounts.sales_invoice.md
diff --git a/docs/docs.user.buying.material_request.md b/docs/user/buying/docs.user.buying.material_request.md
similarity index 100%
rename from docs/docs.user.buying.material_request.md
rename to docs/user/buying/docs.user.buying.material_request.md
diff --git a/docs/docs.user.buying.md b/docs/user/buying/docs.user.buying.md
similarity index 100%
rename from docs/docs.user.buying.md
rename to docs/user/buying/docs.user.buying.md
diff --git a/docs/docs.user.buying.purchase_order.md b/docs/user/buying/docs.user.buying.purchase_order.md
similarity index 100%
rename from docs/docs.user.buying.purchase_order.md
rename to docs/user/buying/docs.user.buying.purchase_order.md
diff --git a/docs/docs.user.buying.supplier.md b/docs/user/buying/docs.user.buying.supplier.md
similarity index 100%
rename from docs/docs.user.buying.supplier.md
rename to docs/user/buying/docs.user.buying.supplier.md
diff --git a/docs/docs.user.buying.supplier_quotation.md b/docs/user/buying/docs.user.buying.supplier_quotation.md
similarity index 100%
rename from docs/docs.user.buying.supplier_quotation.md
rename to docs/user/buying/docs.user.buying.supplier_quotation.md
diff --git a/docs/docs.user.customize.custom_field.md b/docs/user/customize/docs.user.customize.custom_field.md
similarity index 100%
rename from docs/docs.user.customize.custom_field.md
rename to docs/user/customize/docs.user.customize.custom_field.md
diff --git a/docs/docs.user.customize.custom_form.md b/docs/user/customize/docs.user.customize.custom_form.md
similarity index 100%
rename from docs/docs.user.customize.custom_form.md
rename to docs/user/customize/docs.user.customize.custom_form.md
diff --git a/docs/docs.user.customize.md b/docs/user/customize/docs.user.customize.md
similarity index 100%
rename from docs/docs.user.customize.md
rename to docs/user/customize/docs.user.customize.md
diff --git a/docs/docs.user.customize.modules.md b/docs/user/customize/docs.user.customize.modules.md
similarity index 100%
rename from docs/docs.user.customize.modules.md
rename to docs/user/customize/docs.user.customize.modules.md
diff --git a/docs/docs.user.customize.print_format.md b/docs/user/customize/docs.user.customize.print_format.md
similarity index 100%
rename from docs/docs.user.customize.print_format.md
rename to docs/user/customize/docs.user.customize.print_format.md
diff --git a/docs/docs.user.help.md b/docs/user/docs.user.help.md
similarity index 100%
rename from docs/docs.user.help.md
rename to docs/user/docs.user.help.md
diff --git a/docs/docs.user.md b/docs/user/docs.user.md
similarity index 100%
rename from docs/docs.user.md
rename to docs/user/docs.user.md
diff --git a/docs/docs.user.projects.md b/docs/user/docs.user.projects.md
similarity index 100%
rename from docs/docs.user.projects.md
rename to docs/user/docs.user.projects.md
diff --git a/docs/docs.user.reports.builder.md b/docs/user/docs.user.reports.builder.md
similarity index 100%
rename from docs/docs.user.reports.builder.md
rename to docs/user/docs.user.reports.builder.md
diff --git a/docs/docs.user.reports.md b/docs/user/docs.user.reports.md
similarity index 100%
rename from docs/docs.user.reports.md
rename to docs/user/docs.user.reports.md
diff --git a/docs/docs.user.hr.appraisal.md b/docs/user/hr/docs.user.hr.appraisal.md
similarity index 100%
rename from docs/docs.user.hr.appraisal.md
rename to docs/user/hr/docs.user.hr.appraisal.md
diff --git a/docs/docs.user.hr.employee.md b/docs/user/hr/docs.user.hr.employee.md
similarity index 100%
rename from docs/docs.user.hr.employee.md
rename to docs/user/hr/docs.user.hr.employee.md
diff --git a/docs/docs.user.hr.expense_claim.md b/docs/user/hr/docs.user.hr.expense_claim.md
similarity index 100%
rename from docs/docs.user.hr.expense_claim.md
rename to docs/user/hr/docs.user.hr.expense_claim.md
diff --git a/docs/docs.user.hr.leave.md b/docs/user/hr/docs.user.hr.leave.md
similarity index 100%
rename from docs/docs.user.hr.leave.md
rename to docs/user/hr/docs.user.hr.leave.md
diff --git a/docs/docs.user.hr.md b/docs/user/hr/docs.user.hr.md
similarity index 100%
rename from docs/docs.user.hr.md
rename to docs/user/hr/docs.user.hr.md
diff --git a/docs/docs.user.hr.payroll.md b/docs/user/hr/docs.user.hr.payroll.md
similarity index 100%
rename from docs/docs.user.hr.payroll.md
rename to docs/user/hr/docs.user.hr.payroll.md
diff --git a/docs/docs.user.hr.setup.md b/docs/user/hr/docs.user.hr.setup.md
similarity index 100%
rename from docs/docs.user.hr.setup.md
rename to docs/user/hr/docs.user.hr.setup.md
diff --git a/docs/docs.user.implement.concepts.md b/docs/user/intro/docs.user.implement.concepts.md
similarity index 100%
rename from docs/docs.user.implement.concepts.md
rename to docs/user/intro/docs.user.implement.concepts.md
diff --git a/docs/docs.user.implement.md b/docs/user/intro/docs.user.implement.md
similarity index 100%
rename from docs/docs.user.implement.md
rename to docs/user/intro/docs.user.implement.md
diff --git a/docs/docs.user.implement.strategy.md b/docs/user/intro/docs.user.implement.strategy.md
similarity index 100%
rename from docs/docs.user.implement.strategy.md
rename to docs/user/intro/docs.user.implement.strategy.md
diff --git a/docs/docs.user.intro.md b/docs/user/intro/docs.user.intro.md
similarity index 100%
rename from docs/docs.user.intro.md
rename to docs/user/intro/docs.user.intro.md
diff --git a/docs/docs.user.intro.open_source.md b/docs/user/intro/docs.user.intro.open_source.md
similarity index 100%
rename from docs/docs.user.intro.open_source.md
rename to docs/user/intro/docs.user.intro.open_source.md
diff --git a/docs/docs.user.intro.try.md b/docs/user/intro/docs.user.intro.try.md
similarity index 100%
rename from docs/docs.user.intro.try.md
rename to docs/user/intro/docs.user.intro.try.md
diff --git a/docs/docs.user.mfg.bom.md b/docs/user/mfg/docs.user.mfg.bom.md
similarity index 100%
rename from docs/docs.user.mfg.bom.md
rename to docs/user/mfg/docs.user.mfg.bom.md
diff --git a/docs/docs.user.mfg.md b/docs/user/mfg/docs.user.mfg.md
similarity index 100%
rename from docs/docs.user.mfg.md
rename to docs/user/mfg/docs.user.mfg.md
diff --git a/docs/docs.user.mfg.planning.md b/docs/user/mfg/docs.user.mfg.planning.md
similarity index 100%
rename from docs/docs.user.mfg.planning.md
rename to docs/user/mfg/docs.user.mfg.planning.md
diff --git a/docs/docs.user.mfg.production_order.md b/docs/user/mfg/docs.user.mfg.production_order.md
similarity index 100%
rename from docs/docs.user.mfg.production_order.md
rename to docs/user/mfg/docs.user.mfg.production_order.md
diff --git a/docs/docs.user.selling.customer.md b/docs/user/selling/docs.user.selling.customer.md
similarity index 100%
rename from docs/docs.user.selling.customer.md
rename to docs/user/selling/docs.user.selling.customer.md
diff --git a/docs/docs.user.selling.lead.md b/docs/user/selling/docs.user.selling.lead.md
similarity index 100%
rename from docs/docs.user.selling.lead.md
rename to docs/user/selling/docs.user.selling.lead.md
diff --git a/docs/docs.user.selling.md b/docs/user/selling/docs.user.selling.md
similarity index 100%
rename from docs/docs.user.selling.md
rename to docs/user/selling/docs.user.selling.md
diff --git a/docs/docs.user.selling.opportunity.md b/docs/user/selling/docs.user.selling.opportunity.md
similarity index 100%
rename from docs/docs.user.selling.opportunity.md
rename to docs/user/selling/docs.user.selling.opportunity.md
diff --git a/docs/docs.user.selling.quotation.md b/docs/user/selling/docs.user.selling.quotation.md
similarity index 100%
rename from docs/docs.user.selling.quotation.md
rename to docs/user/selling/docs.user.selling.quotation.md
diff --git a/docs/docs.user.selling.sales_order.md b/docs/user/selling/docs.user.selling.sales_order.md
similarity index 100%
rename from docs/docs.user.selling.sales_order.md
rename to docs/user/selling/docs.user.selling.sales_order.md
diff --git a/docs/docs.user.setup.accounting.md b/docs/user/setup/docs.user.setup.accounting.md
similarity index 100%
rename from docs/docs.user.setup.accounting.md
rename to docs/user/setup/docs.user.setup.accounting.md
diff --git a/docs/docs.user.setup.codification.md b/docs/user/setup/docs.user.setup.codification.md
similarity index 100%
rename from docs/docs.user.setup.codification.md
rename to docs/user/setup/docs.user.setup.codification.md
diff --git a/docs/docs.user.setup.cost_centers.md b/docs/user/setup/docs.user.setup.cost_centers.md
similarity index 100%
rename from docs/docs.user.setup.cost_centers.md
rename to docs/user/setup/docs.user.setup.cost_centers.md
diff --git a/docs/docs.user.setup.data_import.md b/docs/user/setup/docs.user.setup.data_import.md
similarity index 100%
rename from docs/docs.user.setup.data_import.md
rename to docs/user/setup/docs.user.setup.data_import.md
diff --git a/docs/docs.user.setup.email.md b/docs/user/setup/docs.user.setup.email.md
similarity index 100%
rename from docs/docs.user.setup.email.md
rename to docs/user/setup/docs.user.setup.email.md
diff --git a/docs/docs.user.setup.first.md b/docs/user/setup/docs.user.setup.first.md
similarity index 100%
rename from docs/docs.user.setup.first.md
rename to docs/user/setup/docs.user.setup.first.md
diff --git a/docs/docs.user.setup.letter_head.md b/docs/user/setup/docs.user.setup.letter_head.md
similarity index 100%
rename from docs/docs.user.setup.letter_head.md
rename to docs/user/setup/docs.user.setup.letter_head.md
diff --git a/docs/docs.user.setup.masters.md b/docs/user/setup/docs.user.setup.masters.md
similarity index 100%
rename from docs/docs.user.setup.masters.md
rename to docs/user/setup/docs.user.setup.masters.md
diff --git a/docs/docs.user.setup.md b/docs/user/setup/docs.user.setup.md
similarity index 100%
rename from docs/docs.user.setup.md
rename to docs/user/setup/docs.user.setup.md
diff --git a/docs/docs.user.setup.opening.md b/docs/user/setup/docs.user.setup.opening.md
similarity index 100%
rename from docs/docs.user.setup.opening.md
rename to docs/user/setup/docs.user.setup.opening.md
diff --git a/docs/docs.user.setup.permissions.md b/docs/user/setup/docs.user.setup.permissions.md
similarity index 100%
rename from docs/docs.user.setup.permissions.md
rename to docs/user/setup/docs.user.setup.permissions.md
diff --git a/docs/docs.user.setup.price_list.md b/docs/user/setup/docs.user.setup.price_list.md
similarity index 100%
rename from docs/docs.user.setup.price_list.md
rename to docs/user/setup/docs.user.setup.price_list.md
diff --git a/docs/docs.user.setup.series.md b/docs/user/setup/docs.user.setup.series.md
similarity index 100%
rename from docs/docs.user.setup.series.md
rename to docs/user/setup/docs.user.setup.series.md
diff --git a/docs/docs.user.setup.taxes.md b/docs/user/setup/docs.user.setup.taxes.md
similarity index 100%
rename from docs/docs.user.setup.taxes.md
rename to docs/user/setup/docs.user.setup.taxes.md
diff --git a/docs/docs.user.stock.delivery_note.md b/docs/user/stock/docs.user.stock.delivery_note.md
similarity index 100%
rename from docs/docs.user.stock.delivery_note.md
rename to docs/user/stock/docs.user.stock.delivery_note.md
diff --git a/docs/docs.user.stock.item.md b/docs/user/stock/docs.user.stock.item.md
similarity index 100%
rename from docs/docs.user.stock.item.md
rename to docs/user/stock/docs.user.stock.item.md
diff --git a/docs/docs.user.stock.md b/docs/user/stock/docs.user.stock.md
similarity index 100%
rename from docs/docs.user.stock.md
rename to docs/user/stock/docs.user.stock.md
diff --git a/docs/docs.user.stock.purchase_receipt.md b/docs/user/stock/docs.user.stock.purchase_receipt.md
similarity index 100%
rename from docs/docs.user.stock.purchase_receipt.md
rename to docs/user/stock/docs.user.stock.purchase_receipt.md
diff --git a/docs/docs.user.stock.serialized.md b/docs/user/stock/docs.user.stock.serialized.md
similarity index 100%
rename from docs/docs.user.stock.serialized.md
rename to docs/user/stock/docs.user.stock.serialized.md
diff --git a/docs/docs.user.stock.stock_entry.md b/docs/user/stock/docs.user.stock.stock_entry.md
similarity index 100%
rename from docs/docs.user.stock.stock_entry.md
rename to docs/user/stock/docs.user.stock.stock_entry.md
diff --git a/docs/docs.user.stock.sub_contracting.md b/docs/user/stock/docs.user.stock.sub_contracting.md
similarity index 100%
rename from docs/docs.user.stock.sub_contracting.md
rename to docs/user/stock/docs.user.stock.sub_contracting.md
diff --git a/docs/docs.user.stock.valuation.md b/docs/user/stock/docs.user.stock.valuation.md
similarity index 100%
rename from docs/docs.user.stock.valuation.md
rename to docs/user/stock/docs.user.stock.valuation.md
diff --git a/docs/docs.user.support.customer_issue.md b/docs/user/support/docs.user.support.customer_issue.md
similarity index 100%
rename from docs/docs.user.support.customer_issue.md
rename to docs/user/support/docs.user.support.customer_issue.md
diff --git a/docs/docs.user.support.maintenance_schedule.md b/docs/user/support/docs.user.support.maintenance_schedule.md
similarity index 100%
rename from docs/docs.user.support.maintenance_schedule.md
rename to docs/user/support/docs.user.support.maintenance_schedule.md
diff --git a/docs/docs.user.support.maintenance_visit.md b/docs/user/support/docs.user.support.maintenance_visit.md
similarity index 100%
rename from docs/docs.user.support.maintenance_visit.md
rename to docs/user/support/docs.user.support.maintenance_visit.md
diff --git a/docs/docs.user.support.md b/docs/user/support/docs.user.support.md
similarity index 100%
rename from docs/docs.user.support.md
rename to docs/user/support/docs.user.support.md
diff --git a/docs/docs.user.support.support_ticket.md b/docs/user/support/docs.user.support.support_ticket.md
similarity index 100%
rename from docs/docs.user.support.support_ticket.md
rename to docs/user/support/docs.user.support.support_ticket.md
diff --git a/docs/docs.user.tools.calendar.md b/docs/user/tools/docs.user.tools.calendar.md
similarity index 100%
rename from docs/docs.user.tools.calendar.md
rename to docs/user/tools/docs.user.tools.calendar.md
diff --git a/docs/docs.user.tools.form_tools.md b/docs/user/tools/docs.user.tools.form_tools.md
similarity index 100%
rename from docs/docs.user.tools.form_tools.md
rename to docs/user/tools/docs.user.tools.form_tools.md
diff --git a/docs/docs.user.tools.md b/docs/user/tools/docs.user.tools.md
similarity index 100%
rename from docs/docs.user.tools.md
rename to docs/user/tools/docs.user.tools.md
diff --git a/docs/docs.user.tools.messages.md b/docs/user/tools/docs.user.tools.messages.md
similarity index 100%
rename from docs/docs.user.tools.messages.md
rename to docs/user/tools/docs.user.tools.messages.md
diff --git a/docs/docs.user.tools.notes.md b/docs/user/tools/docs.user.tools.notes.md
similarity index 100%
rename from docs/docs.user.tools.notes.md
rename to docs/user/tools/docs.user.tools.notes.md
diff --git a/docs/docs.user.tools.todo.md b/docs/user/tools/docs.user.tools.todo.md
similarity index 100%
rename from docs/docs.user.tools.todo.md
rename to docs/user/tools/docs.user.tools.todo.md
diff --git a/docs/docs.user.website.blog.md b/docs/user/website/docs.user.website.blog.md
similarity index 100%
rename from docs/docs.user.website.blog.md
rename to docs/user/website/docs.user.website.blog.md
diff --git a/docs/docs.user.website.md b/docs/user/website/docs.user.website.md
similarity index 100%
rename from docs/docs.user.website.md
rename to docs/user/website/docs.user.website.md
diff --git a/docs/docs.user.website.setup.md b/docs/user/website/docs.user.website.setup.md
similarity index 100%
rename from docs/docs.user.website.setup.md
rename to docs/user/website/docs.user.website.setup.md
diff --git a/docs/docs.user.website.style.md b/docs/user/website/docs.user.website.style.md
similarity index 100%
rename from docs/docs.user.website.style.md
rename to docs/user/website/docs.user.website.style.md
diff --git a/docs/docs.user.website.web_page.md b/docs/user/website/docs.user.website.web_page.md
similarity index 100%
rename from docs/docs.user.website.web_page.md
rename to docs/user/website/docs.user.website.web_page.md
diff --git a/hr/doctype/job_applicant/job_applicant.js b/hr/doctype/job_applicant/job_applicant.js
index 9aff6057641..f82da11f07f 100644
--- a/hr/doctype/job_applicant/job_applicant.js
+++ b/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
diff --git a/patches/september_2013/p01_update_communication.py b/patches/september_2013/p01_update_communication.py
index c3bd61b4025..d840c801f9b 100644
--- a/patches/september_2013/p01_update_communication.py
+++ b/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, '')='' """)
 	
\ No newline at end of file
diff --git a/selling/doctype/lead/get_leads.py b/selling/doctype/lead/get_leads.py
index 91ffd700702..3305a3b9f6e 100644
--- a/selling/doctype/lead/get_leads.py
+++ b/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)
 	
diff --git a/selling/doctype/lead/lead.js b/selling/doctype/lead/lead.js
index 40887393889..9a86b22d63e 100644
--- a/selling/doctype/lead/lead.js
+++ b/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
diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js
index 2c1f3322f33..0e612734393 100644
--- a/support/doctype/support_ticket/support_ticket.js
+++ b/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 sortfn = function (a, b) { return (b.creation > a.creation) ? 1 : -1; }
-		comm_list = comm_list.sort(sortfn);
+		var comm_list = wn.model.get("Communication", {"parent": doc.name, "parenttype":"Support Ticket"})
 		
-		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});
 		}
 					
diff --git a/utilities/transaction_base.py b/utilities/transaction_base.py
index 22bc5318513..ea807c248e4 100644
--- a/utilities/transaction_base.py
+++ b/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):