From a31be78cbdc5ae9cac427d7d41d1476643f165af Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 11 Mar 2016 16:03:19 +0000
Subject: [PATCH] CustomFields : Fixed a regression in field_set.js during
 validation due to touched_fields what were no longer in the form when
 switching templates

SVN:trunk[3947]
---
 js/field_set.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/js/field_set.js b/js/field_set.js
index 22fbe7258..f189e11fe 100644
--- a/js/field_set.js
+++ b/js/field_set.js
@@ -221,10 +221,15 @@ $(function()
 
 			for(var i in aFieldsToValidate)
 			{
-				var oRes = this.getField(aFieldsToValidate[i]).triggerHandler('validate', oData);
-				if (!oRes.is_valid)
+				var oField = this.getField(aFieldsToValidate[i]);
+				// Checking if the field still exists as it could have been from a dynamic subform (Typically with custom fields)
+				if(oField.length > 0)
 				{
-					this.options.is_valid = false;
+					var oRes = oField.triggerHandler('validate', oData);
+					if (!oRes.is_valid)
+					{
+						this.options.is_valid = false;
+					}
 				}
 			}
 			return this.options.is_valid;