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/Settings/Workflows/AdvanceFilter.tpl

@@ -53,7 +53,7 @@
 				<button type="button" class="btn btn-default">{vtranslate('LBL_ADD_CONDITION',$MODULE)}</button>
 			</div>
 			<div class="groupCondition">
-				{assign var=GROUP_CONDITION value=$ALL_CONDITION_CRITERIA['condition']}
+				{assign var=GROUP_CONDITION value=(isset($ALL_CONDITION_CRITERIA['condition'])) ? $ALL_CONDITION_CRITERIA['condition'] : ''}
 				{if empty($GROUP_CONDITION)}
 					{assign var=GROUP_CONDITION value="and"}
 				{/if}

layouts/v7/modules/Settings/Workflows/AdvanceFilterCondition.tpl

@@ -26,7 +26,7 @@
 						{assign var=columnNameApi value=getCustomViewColumnName}
 					{/if}
 					<option value="{$FIELD_MODEL->$columnNameApi()}" data-fieldtype="{$FIELD_MODEL->getFieldType()}" data-field-name="{$FIELD_NAME}"
-					{if decode_html($FIELD_MODEL->$columnNameApi()) eq $CONDITION_INFO['columnname']}
+					{if isset($CONDITION_INFO['columnname']) && decode_html($FIELD_MODEL->$columnNameApi()) eq $CONDITION_INFO['columnname']}
 						{assign var=FIELD_TYPE value=$FIELD_MODEL->getFieldDataType()}
 						{assign var=SELECTED_FIELD_MODEL value=$FIELD_MODEL}
 						{$FIELD_INFO['value'] = decode_html($CONDITION_INFO['value'])}
@@ -68,18 +68,27 @@
 	<span class="conditionComparator col-lg-3 col-md-3 col-sm-3">
 		<select class="{if empty($NOCHOSEN)}select2{/if} col-lg-12" name="comparator" data-placeholder="{vtranslate('LBL_NONE',$QUALIFIED_MODULE)}">
 			 <option value="none">{vtranslate('LBL_NONE',$MODULE)}</option>
-			{assign var=ADVANCE_FILTER_OPTIONS value=$ADVANCED_FILTER_OPTIONS_BY_TYPE[$FIELD_TYPE]}
-			{foreach item=ADVANCE_FILTER_OPTION from=$ADVANCE_FILTER_OPTIONS}
+			 {if isset($FIELD_TYPE)}
+				{assign var=ADVANCE_FILTER_OPTIONS value=$ADVANCED_FILTER_OPTIONS_BY_TYPE[$FIELD_TYPE]}
+				{foreach item=ADVANCE_FILTER_OPTION from=$ADVANCE_FILTER_OPTIONS}
 				<option value="{$ADVANCE_FILTER_OPTION}"
                                 {if $ADVANCE_FILTER_OPTION === $CONDITION_INFO['comparator']}
                                         selected
                                 {/if}
                                 >{vtranslate($ADVANCED_FILTER_OPTIONS[$ADVANCE_FILTER_OPTION])}</option>
 			{/foreach}
+			 {/if}
+			
 		</select>
 	</span>
 	<span class="col-lg-4 col-md-4 col-sm-4  fieldUiHolder">
-		<input name="{if $SELECTED_FIELD_MODEL}{$SELECTED_FIELD_MODEL->get('name')}{/if}" data-value="value" class="inputElement col-lg-12" type="text" value="{$CONDITION_INFO['value']|escape}" />
+	{if isset($CONDITION_INFO['value'])}
+		{assign var=CONDITIONINFO value=$CONDITION_INFO['value'] }
+		
+		{else}
+			{assign var=CONDITIONINFO value=''}
+	{/if}
+		<input name="{if isset($SELECTED_FIELD_MODEL) && $SELECTED_FIELD_MODEL}{$SELECTED_FIELD_MODEL->get('name')}{/if}" data-value="value" class="inputElement col-lg-12" type="text" value="{$CONDITIONINFO|escape}" />
 	</span>
 	<span class="hide">
 		<!-- TODO : see if you need to respect CONDITION_INFO condition or / and  -->

layouts/v7/modules/Settings/Workflows/CreateEntity.tpl

@@ -10,7 +10,7 @@
 
 {* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
 <input type="hidden" id="fieldValueMapping" name="field_value_mapping" value='{$TASK_OBJECT->field_value_mapping}' />
-<input type="hidden" value="{if $TASK_ID}{$TASK_OBJECT->reference_field}{else}{$REFERENCE_FIELD_NAME}{/if}" name='reference_field' id='reference_field' />
+<input type="hidden" value="{if $TASK_ID}{$TASK_OBJECT->reference_field}{else}{(isset($REFERENCE_FIELD_NAME)) ? $REFERENCE_FIELD_NAME : ''}{/if}" name='reference_field' id='reference_field' />
 <div class="conditionsContainer" id="save_fieldvaluemapping">
 	{if $RELATED_MODULE_MODEL_NAME neq '' && getTabid($RELATED_MODULE_MODEL_NAME)}
 		<div>
@@ -56,7 +56,7 @@
 
 		{include file="FieldExpressions.tpl"|@vtemplate_path:$QUALIFIED_MODULE RELATED_MODULE_MODEL=$RELATED_MODULE_MODEL MODULE_MODEL=$MODULE_MODEL FIELD_EXPRESSIONS=$FIELD_EXPRESSIONS}
 	{else}
-		{if $RELATED_MODULE_MODEL}
+		{if isset($RELATED_MODULE_MODEL) && $RELATED_MODULE_MODEL}
 			<div>
 				<button type="button" class="btn btn-default" id="addFieldBtn">{vtranslate('LBL_ADD_FIELD',$QUALIFIED_MODULE)}</button>
 			</div><br>
@@ -94,7 +94,7 @@
 		{/if}
 	{/if}
 </div><br>
-{if $RELATED_MODULE_MODEL}
+{if isset($RELATED_MODULE_MODEL) && $RELATED_MODULE_MODEL}
 	<div class="row form-group basicAddFieldContainer hide">
 		<span class="col-lg-4">
 			<select name="fieldname" style="min-width: 250px">

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

@@ -50,7 +50,7 @@
                            {vtranslate('LBL_TARGET_MODULE', $QUALIFIED_MODULE)}
                         </label>
                      <div class="col-sm-5 controls">
-                         {if $MODE eq 'edit'}
+                         {if isset($MODE) && $MODE eq 'edit'}
                              <div class="pull-left">
                                 <input type='text' disabled='disabled' class="inputElement" value="{vtranslate($MODULE_MODEL->getName(), $MODULE_MODEL->getName())}" >
                                 <input type='hidden' id="module_name" name='module_name' value="{$MODULE_MODEL->get('name')}" >

layouts/v7/modules/Settings/Workflows/FieldExpressions.tpl

@@ -35,7 +35,7 @@
                             {/foreach}
                         </select>
                     </span>
-                    {if $RELATED_MODULE_MODEL neq ''}
+                    {if isset($RELATED_MODULE_MODEL) && $RELATED_MODULE_MODEL neq ''}
                         <span name="{$RELATED_MODULE_MODEL->get('name')}" class="useFieldElement">
                             {assign var=MODULE_FIELDS value=$RELATED_MODULE_MODEL->getFields()}
                             <select class="useField" data-placeholder="{vtranslate('LBL_USE_FIELD',$QUALIFIED_MODULE)}" style="min-width: 160px;">

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

@@ -27,7 +27,7 @@
 						<option value="" data-count='{$MODULES_COUNT['All']}'>{vtranslate('LBL_ALL', $QUALIFIED_MODULE)}&nbsp;{vtranslate('LBL_WORKFLOWS')}
 						</option>
 						{foreach item=MODULE_MODEL key=TAB_ID from=$SUPPORTED_MODULE_MODELS}
-							<option {if $SOURCE_MODULE eq $MODULE_MODEL->getName()} selected="" {/if} value="{$MODULE_MODEL->getName()}" data-count='{if $MODULES_COUNT[$TAB_ID]}{$MODULES_COUNT[$TAB_ID]}{else}0{/if}'>
+							<option {if $SOURCE_MODULE eq $MODULE_MODEL->getName()} selected="" {/if} value="{$MODULE_MODEL->getName()}" data-count='{if isset($MODULES_COUNT[$TAB_ID]) && $MODULES_COUNT[$TAB_ID]}{$MODULES_COUNT[$TAB_ID]}{else}0{/if}'>
 								{if $MODULE_MODEL->getName() eq 'Calendar'}
 									{vtranslate('LBL_TASK', $MODULE_MODEL->getName())}&nbsp;{vtranslate('LBL_WORKFLOWS')}
 								{else}
@@ -88,11 +88,11 @@
 										{assign var=LISTVIEW_HEADERNAME value=$LISTVIEW_HEADER->get('name')}
 										{assign var=LAST_COLUMN value=$LISTVIEW_HEADER@last}
 										{if $LISTVIEW_HEADERNAME neq 'summary' && $LISTVIEW_HEADERNAME neq 'module_name'}
-											<td class="listViewEntryValue {$WIDTHTYPE}" width="{$WIDTH}%" nowrap>
+											<td class="listViewEntryValue {$WIDTHTYPE}" width="{(isset($WIDTH)) ? $WIDTH : ''}%" nowrap>
 												{if $LISTVIEW_HEADERNAME eq 'test'}
 													{assign var=WORKFLOW_CONDITION value=$LISTVIEW_ENTRY->getConditonDisplayValue()}
-													{assign var=ALL_CONDITIONS value=$WORKFLOW_CONDITION['All']}
-													{assign var=ANY_CONDITIONS value=$WORKFLOW_CONDITION['Any']}
+													{assign var=ALL_CONDITIONS value=(isset($WORKFLOW_CONDITION['All'])) ? $WORKFLOW_CONDITION['All'] : ''}
+													{assign var=ANY_CONDITIONS value=(isset($WORKFLOW_CONDITION['Any'])) ? $WORKFLOW_CONDITION['Any'] : ''}
 													<span><strong>{vtranslate('All')}&nbsp;:&nbsp;&nbsp;&nbsp;</strong></span>
 													{if is_array($ALL_CONDITIONS) && !empty($ALL_CONDITIONS)}
 														{foreach item=ALL_CONDITION from=$ALL_CONDITIONS name=allCounter}
@@ -125,14 +125,14 @@
 												{/if}
 											</td>
 										{elseif $LISTVIEW_HEADERNAME eq 'module_name' && empty($SOURCE_MODULE)}
-											<td class="listViewEntryValue {$WIDTHTYPE}" width="{$WIDTH}%" nowrap>
+											<td class="listViewEntryValue {$WIDTHTYPE}" width="{(isset($WIDTH)) ? $WIDTH : ''}%" nowrap>
 												{assign var="MODULE_ICON_NAME" value="{strtolower($LISTVIEW_ENTRY->get('raw_module_name'))}"}
 												{Vtiger_Module_Model::getModuleIconPath($LISTVIEW_ENTRY->get('raw_module_name'))}
 											</td>
 										{else}
 										{/if}
 									{/foreach}
-									<td class="listViewEntryValue {$WIDTHTYPE}" width="{$WIDTH}%" nowrap>
+									<td class="listViewEntryValue {$WIDTHTYPE}" width="{(isset($WIDTH)) ? $WIDTH : ''}%" nowrap>
 										{assign var=ACTIONS value=$LISTVIEW_ENTRY->getActionsDisplayValue()}
 										{if is_array($ACTIONS) && !empty($ACTIONS)}
 											{foreach item=ACTION_COUNT key=ACTION_NAME from=$ACTIONS}

layouts/v7/modules/Settings/Workflows/Tasks/VTCreateEventTask.tpl

@@ -80,7 +80,7 @@
                         {if $TASK_OBJECT->time neq ''}
                             {assign var=TIME value=$TASK_OBJECT->time}
                         {/if}
-                        <input type="text" class="timepicker-default inputElement" data-format="{$timeFormat}" value="{$START_TIME}" name="startTime" />
+                        <input type="text" class="timepicker-default inputElement" data-format="{$timeFormat}" value="{(isset($START_TIME)) ? $START_TIME : ''}" name="startTime" />
                         <span  class="input-group-addon">
                             <i  class="fa fa-clock-o"></i>
                         </span>
@@ -123,7 +123,7 @@
                         {if $TASK_OBJECT->time neq ''}
                             {assign var=TIME value=$TASK_OBJECT->time}
                         {/if}
-                        <input type="text" class="timepicker-default inputElement" value="{$END_TIME}" name="endTime" />
+                        <input type="text" class="timepicker-default inputElement" value="{(isset($END_TIME)) ? $END_TIME : ''}" name="endTime" />
                         <span  class="input-group-addon">
                             <i  class="fa fa-clock-o"></i>
                         </span>

layouts/v7/modules/Settings/Workflows/Tasks/VTCreateTodoTask.tpl

@@ -77,7 +77,7 @@
                         {if $TASK_OBJECT->time neq ''}
                             {assign var=TIME value=$TASK_OBJECT->time}
                         {/if}
-                        <input type="text" class="timepicker-default inputElement" value="{$TIME}" name="time" />
+                        <input type="text" class="timepicker-default inputElement" value="{(isset($TIME)) ? $TIME : ''}" name="time" />
                         <span  class="input-group-addon">
                             <i  class="fa fa-clock-o"></i>
                         </span>

layouts/v7/modules/Settings/Workflows/Tasks/VTEmailTask.tpl

@@ -146,7 +146,7 @@
 					</div>
 				</div>
 				<div class="row from-group">
-					{if $EMAIL_TEMPLATES}
+					{if isset($EMAIL_TEMPLATES) && $EMAIL_TEMPLATES}
 						<div class="col-sm-6 col-xs-6">
 							<div class="row">
 								<div class="col-sm-3 col-xs-3">{vtranslate('LBL_EMAIL_TEMPLATES','EmailTemplates')}</div>

layouts/v7/modules/Settings/Workflows/WorkFlowTrigger.tpl

@@ -98,10 +98,10 @@
                             <div class='col-sm-3 controls'>
                                 <div class="input-group" style="margin-bottom: 3px">
                                     {assign var=specificDate value=Zend_Json::decode($WORKFLOW_MODEL_OBJ->schannualdates)}
-                                    {if $specificDate[0] neq ''} 
+                                    {if isset($specificDate[0]) && $specificDate[0] neq ''} 
                                         {assign var=specificDate1 value=DateTimeField::convertToUserFormat($specificDate[0])} 
                                     {/if}
-                                    <input type="text" class="dateField form-control" name="schdate" value="{$specificDate1}" data-date-format="{$CURRENT_USER->date_format}" data-rule-required="true"/>
+                                    <input type="text" class="dateField form-control" name="schdate" value="{(isset($specificDate1)) ? $specificDate1 : ''}" data-date-format="{$CURRENT_USER->date_format}" data-rule-required="true"/>
                                     <span class="input-group-addon"><i class="fa fa-calendar "></i></span>
                                 </div>
                             </div>
@@ -118,9 +118,12 @@
                                 <div>
                                     <input type=hidden id=hiddenAnnualDates value='{$WORKFLOW_MODEL_OBJ->schannualdates}' />
                                     <select multiple class="select2" id='annualDates' name='schannualdates[]' data-rule-required="true" style="min-width: 100px;">
+                                    {if isset($ANNUAL_DATES)}
                                         {foreach item=DATES from=$ANNUAL_DATES}
                                             <option value="{$DATES}" selected>{$DATES}</option>
                                         {/foreach}
+                                    {/if}
+                                        
                                     </select>
                                 </div>
                             </div>

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()}