layouts/v7/modules/Settings/CronTasks/EditAjax.tpl

@@ -50,7 +50,7 @@
 							{assign var=FIELD_VALUE value=($VALUES[0]*60)+$VALUES[1]}
 						{/if}
 						<div class="controls fieldValue col-xs-2">
-							<input type="text" class="inputElement" value="{$FIELD_VALUE}" {if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if} id="frequencyValue"/>&nbsp;
+							<input type="text" class="inputElement" value="{$FIELD_VALUE}" {if isset($FIELD_INFO["mandatory"]) && $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if} id="frequencyValue"/>&nbsp;
 						</div>
 						<div class="controls fieldValue col-xs-3" style="padding-left: 0px;">
 							<select class="select2 inputElement" id="time_format">

layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl

@@ -167,7 +167,7 @@
 															<div class="defaultValue col-sm-12 {if !$FIELD_MODEL->hasDefaultValue()}disabled{/if} 
 																 {if $FIELD_MODEL->isDefaultValueOptionDisabled()} cursorPointerNotAllowed {/if}">
 																{assign var=DEFAULT_VALUE value=$FIELD_MODEL->getDefaultFieldValueToViewInV7FieldsLayOut()}
-																{if $DEFAULT_VALUE}
+																{if isset($DEFAULT_VALUE) && $DEFAULT_VALUE !== ''}
 																	{if is_array($DEFAULT_VALUE)}
 																		{foreach key=DEFAULT_FIELD_NAME item=DEFAULT_FIELD_VALUE from=$DEFAULT_VALUE}
 																			<div class="row">
@@ -341,7 +341,7 @@
 															<div class="defaultValue col-sm-12 {if !$FIELD_MODEL->hasDefaultValue()}disabled{/if} 
 																 {if $FIELD_MODEL->isDefaultValueOptionDisabled()} cursorPointerNotAllowed {/if}">
 																{assign var=DEFAULT_VALUE value=$FIELD_MODEL->getDefaultFieldValueToViewInV7FieldsLayOut()}
-																{if $DEFAULT_VALUE}
+																{if isset($DEFAULT_VALUE) && $DEFAULT_VALUE !== ''}
 																	{if is_array($DEFAULT_VALUE)}
 																		{foreach key=DEFAULT_FIELD_NAME item=DEFAULT_FIELD_VALUE from=$DEFAULT_VALUE}
 																			<div class="row defaultValueContent">

layouts/v7/modules/Settings/MailConverter/resources/Edit.js

@@ -22,6 +22,13 @@ Settings_Vtiger_Index_Js('Settings_MailConverter_Edit_Js', {
 		form.submit(function (e) {
 			e.preventDefault();
 		});
+
+		jQuery('[name="server"]', form).on('blur', function(ev){
+			if (((this.value||"").toLowerCase()).indexOf("imap.gmail.com") != -1) {
+				// TODO disable submit and clear button
+				location.href = "oauth2callback/index.php?authfor=MailConverter&authservice=Google"
+			}
+		});
 	},
 
 	saveMailBox: function (form) {
@@ -133,4 +140,4 @@ Settings_Vtiger_Index_Js('Settings_MailConverter_Edit_Js', {
 		Settings_MailConverter_Edit_Js.firstStep();
 		Settings_MailConverter_Edit_Js.activateHeader();
 	}
-});
\ No newline at end of file
+});

layouts/v7/modules/Settings/Roles/EditView.tpl

@@ -68,6 +68,11 @@
                                 <div class="radio">
                                     <label>
                                     <input type="radio" value="2" {if $RECORD_MODEL->get('allowassignedrecordsto') eq '2'} checked="" {/if} name="allowassignedrecordsto" data-handler="new" class="alignTop"/>
+                                    &nbsp;{vtranslate('LBL_USERS_WITH_SAME_LEVEL_AND_SUBORDINATES',$QUALIFIED_MODULE)}</label>
+                                </div>
+                                <div class="radio">
+                                    <label>
+                                    <input type="radio" value="4" {if $RECORD_MODEL->get('allowassignedrecordsto') eq '4'} checked="" {/if} name="allowassignedrecordsto" data-handler="new" class="alignTop"/>
                                     &nbsp;{vtranslate('LBL_USERS_WITH_SAME_OR_LOWER_LEVEL',$QUALIFIED_MODULE)}</label>
                                 </div>
                                 <div class="radio">

layouts/v7/modules/Settings/Vtiger/ListViewContents.tpl

@@ -13,12 +13,12 @@
 	<input type="hidden" id="previousPageExist" value="{$PAGING_MODEL->isPrevPageExists()}" />
 	<input type="hidden" id="nextPageExist" value="{$PAGING_MODEL->isNextPageExists()}" />
 	<input type="hidden" id="totalCount" value="{$LISTVIEW_COUNT}" />
-	<input type="hidden" value="{$ORDER_BY}" id="orderBy">
-	<input type="hidden" value="{$SORT_ORDER}" id="sortOrder">
+	<input type="hidden" value="{(isset($ORDER_BY)) ? $ORDER_BY : ''}" id="orderBy">
+	<input type="hidden" value="{(isset($SORT_ORDER)) ? $SORT_ORDER : ''}" id="sortOrder">
 	<input type="hidden" id="totalCount" value="{$LISTVIEW_COUNT}" />
-	<input type='hidden' value="{$PAGE_NUMBER}" id='pageNumber'>
+	<input type='hidden' value="{(isset($PAGE_NUMBER)) ? $PAGE_NUMBER : ''}" id='pageNumber'>
 	<input type='hidden' value="{$PAGING_MODEL->getPageLimit()}" id='pageLimit'>
-	<input type="hidden" value="{$LISTVIEW_ENTRIES_COUNT}" id="noOfEntries">
+	<input type="hidden" value="{(isset($LISTVIEW_ENTRIES_COUNT)) ? $LISTVIEW_ENTRIES_COUNT : ''}" id="noOfEntries">
 
 	<div class="col-sm-12 col-xs-12 ">
 		<div id="listview-actions" class="listview-actions-container">
@@ -48,7 +48,7 @@
 											{vtranslate('LBL_ACTIONS', $QUALIFIED_MODULE)}
 										</th>
 									{else if $MODULE neq 'Currency'}
-										{if $SHOW_LISTVIEW_CHECKBOX eq true}
+										{if isset($SHOW_LISTVIEW_CHECKBOX) && $SHOW_LISTVIEW_CHECKBOX eq true}
 											<th>
 												<span class="input">
 													<input class="listViewEntriesMainCheckBox" type="checkbox">
@@ -63,8 +63,8 @@
 									{/if}
 									{foreach item=LISTVIEW_HEADER from=$LISTVIEW_HEADERS}
 										<th nowrap>
-											<a {if !($LISTVIEW_HEADER->has('sort'))} class="listViewHeaderValues cursorPointer" data-nextsortorderval="{if $COLUMN_NAME eq $LISTVIEW_HEADER->get('name')}{$NEXT_SORT_ORDER}{else}ASC{/if}" data-columnname="{$LISTVIEW_HEADER->get('name')}" {/if}>{vtranslate($LISTVIEW_HEADER->get('label'), $QUALIFIED_MODULE)}
-												&nbsp;{if $COLUMN_NAME eq $LISTVIEW_HEADER->get('name')}<img class="{$SORT_IMAGE} icon-white">{/if}</a>&nbsp;
+											<a {if !($LISTVIEW_HEADER->has('sort'))} class="listViewHeaderValues cursorPointer" data-nextsortorderval="{if isset($COLUMN_NAME) && $COLUMN_NAME eq $LISTVIEW_HEADER->get('name')}{$NEXT_SORT_ORDER}{else}ASC{/if}" data-columnname="{$LISTVIEW_HEADER->get('name')}" {/if}>{vtranslate($LISTVIEW_HEADER->get('label'), $QUALIFIED_MODULE)}
+												&nbsp;{if isset($COLUMN_NAME) && $COLUMN_NAME eq $LISTVIEW_HEADER->get('name')}<img class="{$SORT_IMAGE} icon-white">{/if}</a>&nbsp;
 										</th>
 									{/foreach}
 								</tr>
@@ -89,7 +89,7 @@
 										{/foreach}
 									</tr>
 								{/foreach}
-								{if $LISTVIEW_ENTRIES_COUNT eq '0'}
+								{if isset($LISTVIEW_ENTRIES_COUNT) && $LISTVIEW_ENTRIES_COUNT eq '0'}
 									<tr class="emptyRecordsDiv">
 										{assign var=COLSPAN_WIDTH value={php7_count($LISTVIEW_HEADERS)+1}}
 										<td colspan="{$COLSPAN_WIDTH}" style="vertical-align:inherit !important;">

layouts/v7/modules/Settings/Vtiger/OutgoingServerEdit.tpl

@@ -43,7 +43,9 @@
 										<div class=" col-lg-6 col-md-6 col-sm-12">
 											<select class="select2 inputElement col-lg-12 col-md-12 col-lg-12" name="serverType">
 												<option value="">{vtranslate('LBL_SELECT_OPTION','Vtiger')}</option>
-												<option value="{"ssl://smtp.gmail.com:465"}" {if {$MODEL->get('server')} eq "ssl://smtp.gmail.com:465"} selected {/if}>{vtranslate('LBL_GMAIL', $QUALIFIED_MODULE)} </option>
+												<option value="google-oauth2" {if {$MODEL->get('server')} eq "ssl://smtp.gmail.com:465" and {$MODEL->get('smtp_auth_type')} eq "XOAUTH2"} selected {/if}>{vtranslate('LBL_GMAIL', $QUALIFIED_MODULE)} OAuth2</option>
+												{* Google disabled Password based from Sep 30, 2024 *}
+												{* <option value="{"ssl://smtp.gmail.com:465"}" {if {$MODEL->get('server')} eq "ssl://smtp.gmail.com:465" and {$MODEL->get('smtp_auth_type')} neq "XOAUTH2"} selected {/if}>{vtranslate('LBL_GMAIL', $QUALIFIED_MODULE)}</option> *}
 												<option value="{"smtp.live.com"}" {if {$MODEL->get('server')} eq "smtp.live.com"} selected {/if}>{vtranslate('LBL_HOTMAIL', $QUALIFIED_MODULE)}</option>
 												<option value="{"smtp-mail.outlook.com"}" {if {$MODEL->get('server')} eq "smtp.live.com"} selected {/if}>{vtranslate('LBL_OFFICE365', $QUALIFIED_MODULE)}</option>
 												<option value="{"smtp.mail.yahoo.com"}" {if {$MODEL->get('server')} eq "smtp.mail.yahoo.com"} selected {/if}>{vtranslate('LBL_YAHOO', $QUALIFIED_MODULE)}</option>

layouts/v7/modules/Settings/Vtiger/resources/OutgoingServer.js

@@ -170,15 +170,9 @@ Vtiger.Class("Settings_Vtiger_OutgoingServer_Js",{},{
             form.find('[name="serverType"]').on('change',function(e){
                 
                 var servertypevalue=form.find('[name="serverType"]').val();
-				form.find('[name="server"]').val(servertypevalue);
-                
-                if(servertypevalue === "mail.od1.vtiger.com"){
-                   var vtigerUser= form.find('[name="vtigerServer"]').data("username");
-                   var vtigerpassword= form.find('[name="vtigerServer"]').data("password");
-                   var vtigeremail= form.find('[name="vtigerServer"]').data("email");
-                    form.find('[name="server_username"]').val(vtigerUser);
-                    form.find('[name="server_password"]').val(vtigerpassword);
-                    form.find('[name="from_email_field"]').val(vtigeremail);
+				              
+                if(servertypevalue === "google-oauth2"){
+                   window.location.href = "oauth2callback/index.php?authfor=OutgoingServer&authservice=Google";
                 }else{
 					form.find('[name="server_username"]').val("");
 					form.find('[name="server_password"]').val("");

layouts/v7/modules/Users/Login.tpl

@@ -62,11 +62,14 @@
 		input:focus ~ .bar:before, input:focus ~ .bar:after {
 			width: 50%;
 		}
+		select {
+			font-size: 16px;
+		}
 		#page {
 			padding-top: 86px;
 		}
 		.widgetHeight {
-			height: 410px;
+			height: 460px;
 			margin-top: 20px !important;
 		}
 		.loginDiv {
@@ -230,7 +233,18 @@
 							<span class="bar"></span>
 							<label>Password</label>
 						</div>
-						<div class="group">
+						{assign var="CUSTOM_SKINS" value=Vtiger_Theme::getAllSkins()}
+						{if !empty($CUSTOM_SKINS)}
+						<div class="group" style="margin-bottom: 10px;">
+							<select id="skin" name="skin" placeholder="Skin" style="text-transform: capitalize; width:100%;height:30px;">
+								<option value="">Default Skin</option>
+								{foreach item=CUSTOM_SKIN from=$CUSTOM_SKINS}
+								<option value="{$CUSTOM_SKIN}">{$CUSTOM_SKIN}</option>
+								{/foreach}
+							</select>
+						</div>
+						{/if}
+					<div class="group">
 							<button type="submit" class="button buttonBlue">Sign in</button><br>
 							<a class="forgotPasswordLink" style="color: #15c;">forgot password?</a>
 						</div>
@@ -421,4 +435,4 @@
 			});
 		</script>
 		</div>
-	{/strip}
\ No newline at end of file
+	{/strip}

layouts/v7/modules/Vtiger/AddCommentForm.tpl

@@ -21,7 +21,7 @@
             <input type="hidden" name="search_key" value= "{(isset($SEARCH_KEY)) ? $SEARCH_KEY : ''}" />
             <input type="hidden" name="operator" value="{$OPERATOR}" />
             <input type="hidden" name="search_value" value="{(isset($ALPHABET_VALUE)) ? $ALPHABET_VALUE : ''}" />
-            <input type="hidden" name="search_params" value='{(isset($SEARCH_PARAMS)) ? Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($SEARCH_PARAMS)) : ''}' />
+            <input type="hidden" name="search_params" value='{(isset($SEARCH_PARAMS)) ? Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($SEARCH_PARAMS)) : ""}' />
             <input type="hidden" name="tag_params" value={ZEND_JSON::encode($TAG_PARAMS)}>
 
             {assign var=HEADER_TITLE value={vtranslate('LBL_ADDING_COMMENT', $MODULE)}}

layouts/v7/modules/Vtiger/AdvanceFilter.tpl

@@ -10,8 +10,8 @@
  ********************************************************************************/
 -->*}
 {strip}
-	{assign var=ALL_CONDITION_CRITERIA value=(isset($ADVANCE_CRITERIA[1])?$ADVANCE_CRITERIA[1]:[])}
-	{assign var=ANY_CONDITION_CRITERIA value=(isset($ADVANCE_CRITERIA[2])?$ADVANCE_CRITERIA[2]:[])}
+	{assign var=ALL_CONDITION_CRITERIA value=(isset($ADVANCE_CRITERIA[1]))?$ADVANCE_CRITERIA[1]:[]}
+	{assign var=ANY_CONDITION_CRITERIA value=(isset($ADVANCE_CRITERIA[2]))?$ADVANCE_CRITERIA[2]:[]}
 
 	{if empty($ALL_CONDITION_CRITERIA) }
 		{assign var=ALL_CONDITION_CRITERIA value=array()}

layouts/v7/modules/Vtiger/ComposeEmailForm.tpl

@@ -145,7 +145,7 @@
                                                 {assign var=FILE_TYPE value="file"}
                                             {/if}
                                             <div class="MultiFile-label customAttachment" data-file-id="{(isset($ATTACHMENT['fileid'])) ? $ATTACHMENT['fileid'] : ''}" data-file-type="{$FILE_TYPE}"  data-file-size="{$ATTACHMENT['size']}" {if $FILE_TYPE eq "document"} data-document-id="{$DOCUMENT_ID}"{/if}>
-                                                {if $ATTACHMENT['nondeletable'] neq true}
+                                                {if isset($ATTACHMENT['nondeletable']) && $ATTACHMENT['nondeletable'] neq true}
                                                     <a name="removeAttachment" class="cursorPointer">x </a>
                                                 {/if}
                                                 <span>{$ATTACHMENT['attachment']}</span>
@@ -175,14 +175,14 @@
                     </div>         
                     <div class="row templateContent">
                         <div class="col-lg-12">
-                            <textarea style="width:390px;height:200px;" id="description" name="description">{if !empty($DESCRIPTION)}{$DESCRIPTION|escape:html}{/if}</textarea>
+                            <textarea style="width:390px;height:200px;" id="description" name="description">{if !empty($DESCRIPTION)}{$DESCRIPTION}{/if}</textarea>
                         </div>
                     </div>
                     
                     {if isset($RELATED_LOAD) && $RELATED_LOAD eq true}
                         <input type="hidden" name="related_load" value={$RELATED_LOAD} />
                     {/if}
-                    <input type="hidden" name="attachments" value="{if isset($ATTACHMENTS)}{ZEND_JSON::encode($ATTACHMENTS)}{/if}" />
+                    <input type="hidden" name="attachments" value="{if isset($ATTACHMENTS)}{ZEND_JSON::encode($ATTACHMENTS)}{else}null{/if}" />
                     <div id="emailTemplateWarningContent" style="display: none;">
                         {vtranslate('LBL_EMAILTEMPLATE_WARNING_CONTENT',$MODULE)}
                     </div>

layouts/v7/modules/Vtiger/DetailViewBlockView.tpl

@@ -55,7 +55,7 @@
 											<span class='muted'>{vtranslate($tax.taxlabel, $MODULE)}(%)</span>
 										</td>
 										<td class="fieldValue {$WIDTHTYPE}">
-											<span class="value textOverflowEllipsis" data-field-type="{$FIELD_MODEL->getFieldDataType()}" >
+											<span class="value textOverflowEllipsis" data-field-type="{$fieldDataType}" >
 												{if $tax.check_value eq 1}
 													{$tax.percentage}
 												{else}
@@ -115,10 +115,10 @@
 											{assign var=FIELD_DISPLAY_VALUE value=Vtiger_Util_Helper::toSafeHTML($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue')))}
 										{/if}
 
-										<span class="value" data-field-type="{$FIELD_MODEL->getFieldDataType()}" {if $FIELD_MODEL->get('uitype') eq '19' or $FIELD_MODEL->get('uitype') eq '21'} style="white-space:normal;" {/if}>
+										<span class="value" data-field-type="{$fieldDataType}" {if $FIELD_MODEL->get('uitype') eq '19' or $FIELD_MODEL->get('uitype') eq '21'} style="white-space:normal;" {/if}>
 											{include file=vtemplate_path($FIELD_MODEL->getUITypeModel()->getDetailViewTemplateName(),$MODULE_NAME) FIELD_MODEL=$FIELD_MODEL USER_MODEL=$USER_MODEL MODULE=$MODULE_NAME RECORD=$RECORD}
 										</span>
-										{if $IS_AJAX_ENABLED && $FIELD_MODEL->isEditable() eq 'true' && $FIELD_MODEL->isAjaxEditable() eq 'true'}
+										{if isset($IS_AJAX_ENABLED) && $IS_AJAX_ENABLED && $FIELD_MODEL->isEditable() eq 'true' && $FIELD_MODEL->isAjaxEditable() eq 'true'}
 											<span class="hide edit pull-left">
 												{if $fieldDataType eq 'multipicklist'}
 													<input type="hidden" class="fieldBasicData" data-name='{$FIELD_MODEL->get('name')}[]' data-type="{$fieldDataType}" data-displayvalue='{$FIELD_DISPLAY_VALUE}' data-value="{$FIELD_VALUE}" />

layouts/v7/modules/Vtiger/ListViewActions.tpl

@@ -27,13 +27,13 @@
         <div class = "row">
             <div class=" col-md-3">
             <div class="btn-group listViewActionsContainer" role="group" aria-label="...">
-                {if $editAction}
+                {if isset($editAction) && $editAction}
                     <button type="button" class="btn btn-default" id={$MODULE}_listView_massAction_{$editAction->getLabel()} 
                             {if stripos($editAction->getUrl(), 'javascript:')===0} href="javascript:void(0);" onclick='{$editAction->getUrl()|substr:strlen("javascript:")}'{else} href='{$editAction->getUrl()}' {/if} title="{vtranslate('LBL_EDIT', $MODULE)}" disabled="disabled">
                         <i class="fa fa-pencil"></i>
                     </button>
                 {/if}
-                {if $deleteAction}
+                {if isset($deleteAction) && $deleteAction}
                     <button type="button" class="btn btn-default" id={$MODULE}_listView_massAction_{$deleteAction->getLabel()} 
                             {if stripos($deleteAction->getUrl(), 'javascript:')===0} href="javascript:void(0);" onclick='{$deleteAction->getUrl()|substr:strlen("javascript:")}'{else} href='{$deleteAction->getUrl()}' {/if} title="{vtranslate('LBL_DELETE', $MODULE)}" disabled="disabled">
                         <i class="fa fa-trash"></i>
@@ -98,7 +98,7 @@
                             {if $PRINT_TEMPLATE}
                                 <li class="hide"><a id="{$MODULE}_listView_advancedAction_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($PRINT_TEMPLATE->getLabel())}" {if stripos($PRINT_TEMPLATE->getUrl(), 'javascript:')===0} href="javascript:void(0);" onclick='{$PRINT_TEMPLATE->getUrl()|substr:strlen("javascript:")};'{else} href='{$PRINT_TEMPLATE->getUrl()}' {/if}>{vtranslate($PRINT_TEMPLATE->getLabel(), $MODULE)}</a></li>
                             {/if}
-                            {if isset($FIND_DUPLICATES_EXISTS)}
+                            {if isset($FIND_DUPLICATES_EXISTS) && $FIND_DUPLICATES_EXISTS}
                                 <li class="hide"><a id="{$MODULE}_listView_advancedAction_MERGE_RECORD"  href="javascript:void(0);" onclick='Vtiger_List_Js.triggerMergeRecord()'>{vtranslate('LBL_MERGE_SELECTED_RECORDS', $MODULE)}</a></li>
                             {/if}
                             {foreach item=LISTVIEW_ADVANCEDACTIONS from=$LISTVIEW_LINKS['LISTVIEW']}

layouts/v7/modules/Vtiger/ListViewContents.tpl

@@ -39,7 +39,7 @@
 	<input type="hidden" name="noFilterCache" value="{(isset($NO_SEARCH_PARAMS_CACHE)) ? $NO_SEARCH_PARAMS_CACHE : ''}" id="noFilterCache" >
 	<input type="hidden" name="orderBy" value="{(isset($ORDER_BY)) ? $ORDER_BY : ''}" id="orderBy">
 	<input type="hidden" name="sortOrder" value="{(isset($SORT_ORDER)) ? $SORT_ORDER : ''}" id="sortOrder">
-	<input type="hidden" name="list_headers" value='{(isset($LIST_HEADER_FIELDS)) ? $LIST_HEADER_FIELDS : ''}'/>
+	<input type="hidden" name="list_headers" value='{(isset($LIST_HEADER_FIELDS)) ? $LIST_HEADER_FIELDS : ""}'/>
 	<input type="hidden" name="tag" value="{(isset($CURRENT_TAG)) ? $CURRENT_TAG : ''}" />
 	<input type="hidden" name="folder_id" value="{$FOLDER_ID}" />
 	<input type="hidden" name="folder_value" value="{$FOLDER_VALUE}" />

layouts/v7/modules/Vtiger/PopupContents.tpl

@@ -84,7 +84,7 @@
                     {assign var="RECORD_DATA" value=$LISTVIEW_ENTRY->getRawData()}
                     <tr class="listViewEntries" data-id="{$LISTVIEW_ENTRY->getId()}" {if $MODULE eq 'EmailTemplates'} data-name="{$RECORD_DATA['subject']}" data-info="{$LISTVIEW_ENTRY->get('body')}" {else} data-name="{$LISTVIEW_ENTRY->getName()}" data-info='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($LISTVIEW_ENTRY->getRawData()))}' {/if}
                     {if isset($GETURL) && $GETURL neq ''} data-url='{$LISTVIEW_ENTRY->$GETURL()}' {/if}  id="{$MODULE}_popUpListView_row_{$smarty.foreach.popupListView.index+1}">
-                    {if isset($MULTI_SELECT)}
+                    {if isset($MULTI_SELECT) && $MULTI_SELECT}
                         <td class="{$WIDTHTYPE}">
                             <input class="entryCheckBox" type="checkbox" />
                         </td>

layouts/v7/modules/Vtiger/PopupNavigation.tpl

@@ -11,7 +11,7 @@
 
 {strip}
     <div class="col-md-2">
-        {if isset($MULTI_SELECT)}
+        {if isset($MULTI_SELECT) && $MULTI_SELECT}
             {if !empty($LISTVIEW_ENTRIES)}<button class="select btn btn-default" disabled="disabled"><strong>{vtranslate('LBL_ADD', $MODULE)}</strong></button>{/if}
         {else}
             &nbsp;
@@ -21,4 +21,4 @@
         {assign var=RECORD_COUNT value=$LISTVIEW_ENTRIES_COUNT}
         {include file="Pagination.tpl"|vtemplate_path:$MODULE SHOWPAGEJUMP=true}
     </div>
-{/strip}
\ No newline at end of file
+{/strip}

layouts/v7/modules/Vtiger/ProjectTaskSummaryWidgetContents.tpl

@@ -71,7 +71,7 @@
 													{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
 													<li class="editTaskDetails emptyOption" value=""><a>{vtranslate('LBL_SELECT_OPTION',$MODULE_NAME)}</a></li>
 													{foreach item=PICKLIST_VALUE key=PICKLIST_NAME from=$PICKLIST_VALUES}
-														<li class="editTaskDetails" value="{$PICKLIST_VALUE}"><a>{$PICKLIST_VALUE}</a></li>
+														<li class="editTaskDetails" data-value="{$PICKLIST_NAME}"><a>{$PICKLIST_VALUE}</a></li>
 													{/foreach}
 												</ul>
 											</div>
@@ -96,4 +96,4 @@
 			</div>
 		</div>
 	{/if}
-{/strip}
\ No newline at end of file
+{/strip}

layouts/v7/modules/Vtiger/SelectEmailFields.tpl

@@ -27,7 +27,7 @@
                     {if isset($ALPHABET_VALUE)}
                         <input type="hidden" name="search_value" value="{$ALPHABET_VALUE}" />
                     {/if}
-                    <input type="hidden" name="tag_params" value={ZEND_JSON::encode($TAG_PARAMS)}>
+                    <input type="hidden" name="tag_params" value={if isset($TAG_PARAMS)}{ZEND_JSON::encode($TAG_PARAMS)}{else}''{/if}>
                     {if isset($SEARCH_PARAMS)}
                         <input type="hidden" name="search_params" value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($SEARCH_PARAMS))}' />
                     {/if}

layouts/v7/modules/Vtiger/dashboards/DashBoardWidgetContents.tpl

@@ -12,7 +12,7 @@
 {strip}
     {if php7_count($DATA) gt 0 }
         <input class="widgetData" type=hidden value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($DATA))}' />
-        <input class="yAxisFieldType" type="hidden" value="{$YAXIS_FIELD_TYPE}" />
+        <input class="yAxisFieldType" type="hidden" value="{if isset($YAXIS_FIELD_TYPE)}$YAXIS_FIELD_TYPE{/if}" />
         <div class="row" style="margin:0px 10px;">
             <div class="col-lg-11">
                 <div class="widgetChartContainer" name='chartcontent' style="height:220px;min-width:300px; margin: 0 auto"></div>
@@ -25,4 +25,4 @@
             {vtranslate('LBL_NO')} {vtranslate($MODULE_NAME, $MODULE_NAME)} {vtranslate('LBL_MATCHED_THIS_CRITERIA')}
         </span>
     {/if}
-{/strip}
\ No newline at end of file
+{/strip}

layouts/v7/modules/Vtiger/partials/SidebarEssentials.tpl

@@ -38,7 +38,8 @@
                                 </h6>
                                 <input type="hidden" name="allCvId" value="{CustomView_Record_Model::getAllFilterByModule($MODULE)->get('cvid')}" />
                                 <ul class="lists-menu">
-								{assign var=count value=0}
+								{assign var=shown_count value=0}
+								{assign var=hidden_count value=0}
 								{assign var=LISTVIEW_URL value=$MODULE_MODEL->getListViewUrl()}
                                 {foreach item="CUSTOM_VIEW" from=$GROUP_CUSTOM_VIEWS name="customView"}
                                     {assign var="IS_DEFAULT" value=$CUSTOM_VIEW->isDefault()}
@@ -50,7 +51,12 @@
 										{assign var="SHARED_MEMBER_COUNT" value=1}
 										{/if}
 									{/foreach}
-									<li style="font-size:12px;" class='listViewFilter {if $VIEWID eq $CUSTOM_VIEW->getId() && (isset($CURRENT_TAG) && $CURRENT_TAG eq '')} active {if $smarty.foreach.customView.iteration gt 10} {assign var=count value=1} {/if} {else if $smarty.foreach.customView.iteration gt 10} filterHidden hide{/if} '> 
+                                    {if $smarty.foreach.customView.iteration lte 10} 
+                                        {assign var=shown_count value=$shown_count+1}
+                                    {else} 
+                                        {assign var=hidden_count value=$hidden_count+1} 
+                                    {/if}
+									<li style="font-size:12px;" class='listViewFilter {if $VIEWID eq $CUSTOM_VIEW->getId() && (isset($CURRENT_TAG) && $CURRENT_TAG eq '')} active{else if $smarty.foreach.customView.iteration gt 10} filterHidden hide{/if}'> 
                                         {assign var=VIEWNAME value={vtranslate($CUSTOM_VIEW->get('viewname'), $MODULE)}}
 										{append var="CUSTOM_VIEW_NAMES" value=$VIEWNAME}
                                          <a class="filterName listViewFilterElipsis" href="{$LISTVIEW_URL|cat:'&viewname='|cat:$CUSTOM_VIEW->getId()|cat:'&app='|cat:$SELECTED_MENU_CATEGORY}" oncontextmenu="return false;" data-filter-id="{$CUSTOM_VIEW->getId()}" title="{$VIEWNAME|@escape:'html'}">{$VIEWNAME|@escape:'html'}</a> 
@@ -80,11 +86,9 @@
                                         {/foreach}
                                     </ul>
 								<div class='clearfix'> 
-									{if $smarty.foreach.customView.iteration - 10 - $count} 
-										<a class="toggleFilterSize" data-more-text=" {$smarty.foreach.customView.iteration - 10 - $count} {vtranslate('LBL_MORE',Vtiger)|@strtolower}" data-less-text="Show less">
-											{if $smarty.foreach.customView.iteration gt 10} 
-												{$smarty.foreach.customView.iteration - 10 - $count} {vtranslate('LBL_MORE',Vtiger)|@strtolower} 
-											{/if} 
+									{if $hidden_count} 
+										<a class="toggleFilterSize" data-more-text="{$hidden_count} {vtranslate('LBL_MORE',Vtiger)|@strtolower}" data-less-text="Show less">
+												{$hidden_count} {vtranslate('LBL_MORE',Vtiger)|@strtolower} 
 										</a>{/if} 
 									</div>
                              </div>