From 585448b225f495a4dd139674f11c47bbc109e225 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 30 Dec 2016 15:41:55 +0530 Subject: [PATCH 1/2] set default terms and condition if tc_name is available on the form --- erpnext/public/js/controllers/transaction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index dcbb56b857..799730edd5 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -349,7 +349,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ 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); } From edb99f8750177ee85bdedf0892583bbc1f75237f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 30 Dec 2016 16:24:31 +0600 Subject: [PATCH 2/2] bumped to version 7.2.5 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 79a8fe1830..06af401e73 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.2.4' +__version__ = '7.2.5' def get_default_company(user=None): '''Get default company for user'''