commit 4de4b56c6002cca6abc8674fd599da39f99b09bc
author Nabin Hait <nabinhait@gmail.com> Fri Dec 30 15:46:57 2016 +0530
committer GitHub <noreply@github.com> Fri Dec 30 15:46:57 2016 +0530
tree c065c6211839c3d05c641f14f2fdad059602bd7b
parent 257ecf71ac7deea8dfcfb1edd327c0b4b52c0e52
parent 585448b225f495a4dd139674f11c47bbc109e225

Merge pull request #7363 from rohitwaghchaure/terms_and_conditions_for_company

set default terms and condition if tc_name is available on the form

erpnext/public/js/controllers/transaction.js

diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index dcbb56b..799730e 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -349,7 +349,7 @@
 						me.frm.set_value("letter_head", company_doc.default_letter_head);
 					}
 				}
-				if (company_doc.default_terms && me.frm.doc.doctype != "Purchase Invoice") {
+				if (company_doc.default_terms && me.frm.doc.doctype != "Purchase Invoice" && frappe.meta.has_field(me.frm.doc.doctype, "tc_name")) {
 					me.frm.set_value("tc_name", company_doc.default_terms);
 				}