layouts/v7/modules/Vtiger/uitypes/Currency.tpl

@@ -12,7 +12,7 @@
 {strip}
 {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
 {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
-{if (!$FIELD_NAME)}
+{if !isset($FIELD_NAME) || empty($FIELD_NAME)}
     {assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
 {/if}
 {if $FIELD_MODEL->get('uitype') eq '71'}

layouts/v7/modules/Vtiger/uitypes/Date.tpl

@@ -13,7 +13,7 @@
 {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
 {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
 {assign var="dateFormat" value=$USER_MODEL->get('date_format')}
-{if (!isset($FIELD_NAME))}
+{if (!isset($FIELD_NAME) || !$FIELD_NAME)}
   {assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
 {/if}
 <div class="input-group inputElement" style="margin-bottom: 3px">
@@ -21,7 +21,7 @@
     value="{$FIELD_MODEL->getEditViewDisplayValue($FIELD_MODEL->get('fieldvalue'))}" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if}
     {if isset($MODE) && $MODE eq 'edit' && $FIELD_NAME eq 'due_date'} data-user-changed-time="true" {/if}
     {if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if}
-    {if php7_count($FIELD_INFO['validator'])}
+    {if isset($FIELD_INFO['validator']) && php7_count($FIELD_INFO['validator'])}
         data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
     {/if}  data-rule-date="true" />
 <span class="input-group-addon"><i class="fa fa-calendar "></i></span>

layouts/v7/modules/Vtiger/uitypes/DateFieldSearchView.tpl

@@ -10,9 +10,9 @@
  ********************************************************************************/
 -->*}
 {strip}
-    {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
-    {assign var="dateFormat" value=$USER_MODEL->get('date_format')}
-    <div class="row-fluid">
-        <input type="text" name="{$FIELD_MODEL->get('name')}" class="listSearchContributor inputElement dateField" data-date-format="{$dateFormat}" data-calendar-type="range" value="{$SEARCH_INFO['searchValue']}" data-fieldinfo='{$FIELD_INFO|escape}'  data-field-type="{$FIELD_MODEL->getFieldDataType()}"/>
+    {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
+    {assign var="dateFormat" value=$USER_MODEL->get('date_format')}
+    <div class="row-fluid">
+        <input type="text" name="{$FIELD_MODEL->get('name')}" class="listSearchContributor inputElement dateField" data-date-format="{$dateFormat}" data-calendar-type="range" value="{if isset($SEARCH_INFO['searchValue'])}{$SEARCH_INFO['searchValue']}{/if}" data-fieldinfo='{$FIELD_INFO|escape}'  data-field-type="{$FIELD_MODEL->getFieldDataType()}"/>
     </div>
 {/strip}
\ No newline at end of file

layouts/v7/modules/Vtiger/uitypes/Email.tpl

@@ -12,7 +12,7 @@
 {strip}
 {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
 {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
-{if (!$FIELD_NAME)}
+{if !isset($FIELD_NAME) || empty($FIELD_NAME)}
   {assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
 {/if}
 <input id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" class="inputElement" name="{$FIELD_NAME}" type="text"

layouts/v7/modules/Vtiger/uitypes/FieldSearchView.tpl

@@ -12,6 +12,6 @@
 {strip}
     {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
     <div class="">
-        <input type="text" name="{$FIELD_MODEL->get('name')}" class="listSearchContributor inputElement" value="{$SEARCH_INFO['searchValue']|escape}" data-field-type="{$FIELD_MODEL->getFieldDataType()}" data-fieldinfo='{$FIELD_INFO|escape}'/>
+        <input type="text" name="{$FIELD_MODEL->get('name')}" class="listSearchContributor inputElement" value="{if isset($SEARCH_INFO['searchValue'])}{$SEARCH_INFO['searchValue']|escape}{/if}" data-field-type="{$FIELD_MODEL->getFieldDataType()}" data-fieldinfo='{$FIELD_INFO|escape}'/>
     </div>
 {/strip}

layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl

@@ -13,12 +13,16 @@
     {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
 	{assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
 	{assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
-    {assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
+    {if isset($SEARCH_INFO['searchValue']) && $SEARCH_INFO['searchValue'] !== null}
+        {assign var=SEARCH_VALUES value=explode(',', $SEARCH_INFO['searchValue'])}
+    {else}
+        {assign var=SEARCH_VALUES value=array()}
+    {/if}
     <div class="select2_search_div">
         <input type="text" class="listSearchContributor inputElement select2_input_element"/>
         <select class="select2 listSearchContributor" name="{$FIELD_MODEL->get('name')}" multiple data-fieldinfo='{$FIELD_INFO|escape}' style="display:none">
         {foreach item=PICKLIST_LABEL key=PICKLIST_KEY from=$PICKLIST_VALUES}
-                <option value="{$PICKLIST_KEY}" {if in_array($PICKLIST_KEY,$SEARCH_VALUES) && ($PICKLIST_KEY neq "") } selected{/if}>{$PICKLIST_LABEL}</option>
+                <option value="{$PICKLIST_KEY}" {if isset($SEARCH_VALUES) && in_array($PICKLIST_KEY,$SEARCH_VALUES) && ($PICKLIST_KEY neq "") } selected{/if}>{$PICKLIST_LABEL}</option>
         {/foreach}
     </select>
     </div>

layouts/v7/modules/Vtiger/uitypes/Picklist.tpl

@@ -11,10 +11,10 @@
 {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
 {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
 {assign var=PICKLIST_VALUES value=$FIELD_INFO['editablepicklistvalues']}
-{assign var=PICKLIST_COLORS value=$FIELD_INFO['picklistColors']}
+{assign var=PICKLIST_COLORS value=(isset($FIELD_INFO['picklistColors'])) ? $FIELD_INFO['picklistColors'] : ''}
 <select data-fieldname="{$FIELD_MODEL->getFieldName()}" data-fieldtype="picklist" class="inputElement select2 {if $OCCUPY_COMPLETE_WIDTH} row {/if}" type="picklist" name="{$FIELD_MODEL->getFieldName()}" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if} data-selected-value='{$FIELD_MODEL->get('fieldvalue')}'
 	{if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if}
-	{if php7_count($FIELD_INFO['validator'])}
+	{if isset($FIELD_INFO['validator']) && php7_count($FIELD_INFO['validator'])}
 		data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
 	{/if}
 	>

layouts/v7/modules/Vtiger/uitypes/Reference.tpl

@@ -51,7 +51,7 @@
             <span class="input-group-addon relatedPopup cursorPointer" title="{vtranslate('LBL_SELECT', $MODULE)}">
                 <i id="{$MODULE}_editView_fieldName_{$FIELD_NAME}_select" class="fa fa-search"></i>
             </span>
-        {if (($REQ->get('view') eq 'Edit') or ($MODULE_NAME eq 'Webforms')) && !in_array($REFERENCE_LIST[0],$QUICKCREATE_RESTRICTED_MODULES)}
+        {if (($REQ->get('view') eq 'Edit') or ($MODULE_NAME eq 'Webforms')) && ($REFERENCE_LIST && !in_array($REFERENCE_LIST[0],$QUICKCREATE_RESTRICTED_MODULES))}
             <span class="input-group-addon createReferenceRecord cursorPointer clearfix" title="{vtranslate('LBL_CREATE', $MODULE)}">
             <i id="{$MODULE}_editView_fieldName_{$FIELD_NAME}_create" class="fa fa-plus"></i>
         </span>
@@ -59,4 +59,4 @@
     </div>
 
 </div>
-{/strip}
\ No newline at end of file
+{/strip}

layouts/v7/modules/Vtiger/uitypes/Salutation.tpl

@@ -8,7 +8,7 @@
 *************************************************************************************}
 
 {strip}
-	{if $SALUTATION_FIELD_MODEL}
+	{if isset($SALUTATION_FIELD_MODEL)}
 		{assign var=PICKLIST_VALUES value=$SALUTATION_FIELD_MODEL->getEditablePicklistValues()}
 		{assign var="SALUTATION_VALIDATOR" value=$SALUTATION_FIELD_MODEL->getValidator()}
 		<select class="inputElement select2" style="width:78px;" name="{$SALUTATION_FIELD_MODEL->get('name')}" >
@@ -32,4 +32,4 @@
 			{/if}
 	/>
 	{* TODO - Handler Ticker Symbol field *}
-{/strip}
\ No newline at end of file
+{/strip}

layouts/v7/modules/Vtiger/uitypes/Text.tpl

@@ -12,7 +12,7 @@
 {strip}
 {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
 {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
-{if !isset($FIELD_NAME)}
+{if !isset($FIELD_NAME) || !$FIELD_NAME}
   {assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
 {/if}
 {assign var="fieldValue" value=purifyHtmlEventAttributes($FIELD_MODEL->get('fieldvalue'),true)}

layouts/v7/resources/application.js

@@ -568,3 +568,13 @@ if (jQuery.ajaxPrefilter) {
     }
   });
 }
+
+/**
+ * JSON override to handle empty string to null.
+ * When values are picked from DOM attribute it could be empty.
+ */
+_JSONParse = JSON.parse
+JSON.parse = function(value) {
+	if (value == '') return null;
+	return _JSONParse(value);
+}

layouts/v7/resources/helper.js

@@ -203,7 +203,7 @@ jQuery.Class("Vtiger_Helper_Js",{
 		bootbox.confirm({
             title : title,
 			buttons: buttonsInfo,
-			message: data['message'],
+			message: typeof (data['message']) == "object" ? data.message : data['message'], /* error | string */
             htmlSupportEnable: data.hasOwnProperty('htmlSupportEnable') ? data['htmlSupportEnable'] : true,
 			callback: function(result) {
 				if (result) {
@@ -217,7 +217,7 @@ jQuery.Class("Vtiger_Helper_Js",{
         return aDeferred.promise();
     },
     showAlertBox: function(data, cb) {
-        var message = data['message'];
+        var message = typeof (data['message']) == "object" ? data.message : data['message'], /* error | string */
         if (typeof cb == 'function') {
             bootbox.alert(message, cb);
         }
@@ -560,6 +560,8 @@ jQuery.Class("Vtiger_Helper_Js",{
             'title' : app.vtranslate('JS_ALERT')
         }        
         options = jQuery.extend(defaultOptions,options);
+        
+        if (typeof (options['message']) == "object") { options.message = options['message'].message; }
         jQuery.notify(options,settings);
     },
     
@@ -574,6 +576,9 @@ jQuery.Class("Vtiger_Helper_Js",{
         }
         options = jQuery.extend(defaultOptions, options);
         settings = jQuery.extend(defaultSettings, settings);
+        
+        if (typeof (options['message']) == "object") { options.message = options['message'].message; }
+        
         jQuery.notify(options,settings);
     },
     
@@ -583,6 +588,8 @@ jQuery.Class("Vtiger_Helper_Js",{
             'title' : app.vtranslate('JS_SUCCESS')
         }
         options = jQuery.extend(defaultOptions, options);
+        
+        if (typeof (options['message']) == "object") { options.message = options['message'].message; }
         jQuery.notify(options,settings);
     },
     

layouts/v7/skins/contact/style.css

@@ -6228,6 +6228,8 @@ div.tooltip-inner {
 #lineItemTab .lineItemRow .listPrice {
   float: left;
   margin-right: 5px;
+  width: 75%;
+  /* make space for price-book */
 }
 /* Fix Text area in Line Items */
 table#lineItemTab textarea.lineItemCommentBox {

layouts/v7/skins/inventory/style.css

@@ -6228,6 +6228,8 @@ div.tooltip-inner {
 #lineItemTab .lineItemRow .listPrice {
   float: left;
   margin-right: 5px;
+  width: 75%;
+  /* make space for price-book */
 }
 /* Fix Text area in Line Items */
 table#lineItemTab textarea.lineItemCommentBox {

layouts/v7/skins/marketing/style.css

@@ -6228,6 +6228,8 @@ div.tooltip-inner {
 #lineItemTab .lineItemRow .listPrice {
   float: left;
   margin-right: 5px;
+  width: 75%;
+  /* make space for price-book */
 }
 /* Fix Text area in Line Items */
 table#lineItemTab textarea.lineItemCommentBox {

layouts/v7/skins/marketing_and_sales/style.css

@@ -6228,6 +6228,8 @@ div.tooltip-inner {
 #lineItemTab .lineItemRow .listPrice {
   float: left;
   margin-right: 5px;
+  width: 75%;
+  /* make space for price-book */
 }
 /* Fix Text area in Line Items */
 table#lineItemTab textarea.lineItemCommentBox {

layouts/v7/skins/project/style.css

@@ -6228,6 +6228,8 @@ div.tooltip-inner {
 #lineItemTab .lineItemRow .listPrice {
   float: left;
   margin-right: 5px;
+  width: 75%;
+  /* make space for price-book */
 }
 /* Fix Text area in Line Items */
 table#lineItemTab textarea.lineItemCommentBox {

layouts/v7/skins/sales/style.css

@@ -6228,6 +6228,8 @@ div.tooltip-inner {
 #lineItemTab .lineItemRow .listPrice {
   float: left;
   margin-right: 5px;
+  width: 75%;
+  /* make space for price-book */
 }
 /* Fix Text area in Line Items */
 table#lineItemTab textarea.lineItemCommentBox {

layouts/v7/skins/support/style.css

@@ -6228,6 +6228,8 @@ div.tooltip-inner {
 #lineItemTab .lineItemRow .listPrice {
   float: left;
   margin-right: 5px;
+  width: 75%;
+  /* make space for price-book */
 }
 /* Fix Text area in Line Items */
 table#lineItemTab textarea.lineItemCommentBox {

layouts/v7/skins/tools/style.css

@@ -6228,6 +6228,8 @@ div.tooltip-inner {
 #lineItemTab .lineItemRow .listPrice {
   float: left;
   margin-right: 5px;
+  width: 75%;
+  /* make space for price-book */
 }
 /* Fix Text area in Line Items */
 table#lineItemTab textarea.lineItemCommentBox {