diff --git a/layouts/v7/modules/Inventory/PopupEntries.tpl b/layouts/v7/modules/Inventory/PopupEntries.tpl
index 8f121ba65e5433b725bb296baff62da19e3488c7..6a0805276a554fd4fa0122718cf7666e870f1f5d 100644
--- a/layouts/v7/modules/Inventory/PopupEntries.tpl
+++ b/layouts/v7/modules/Inventory/PopupEntries.tpl
@@ -83,7 +83,7 @@
</tr>
{/if}
{foreach item=LISTVIEW_ENTRY from=$LISTVIEW_ENTRIES name=popupListView}
- {assign var="RECORD_DATA" value="{$LISTVIEW_ENTRY->getRawData()}"}
+ {assign var="RECORD_DATA" value="{implode(' ',$LISTVIEW_ENTRY->getRawData())}"}
<tr class="listViewEntries" data-id="{$LISTVIEW_ENTRY->getId()}" data-name='{$LISTVIEW_ENTRY->getName()}' data-info='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($LISTVIEW_ENTRY->getRawData()))}'
{if $GETURL neq '' } data-url="{$LISTVIEW_ENTRY->$GETURL()|cat:'&sourceModule='|cat:$SOURCE_MODULE}" {/if} id="{$MODULE}_popUpListView_row_{$smarty.foreach.popupListView.index+1}">
{if $MULTI_SELECT}
diff --git a/layouts/v7/modules/Inventory/partials/LineItemsContent.tpl b/layouts/v7/modules/Inventory/partials/LineItemsContent.tpl
index 3882af4975fef32465707b27d38c38ba70685d8c..c383b93ef36aa6d2fda998b6a38edcc56be9bea5 100644
--- a/layouts/v7/modules/Inventory/partials/LineItemsContent.tpl
+++ b/layouts/v7/modules/Inventory/partials/LineItemsContent.tpl
@@ -46,7 +46,7 @@
{assign var="listPriceValues" value=Products_Record_Model::getListPriceValues($productId)}
{if $MODULE eq 'PurchaseOrder'}
{assign var="listPriceValues" value=array()}
- {assign var="purchaseCost" value="{if isset($data.$purchaseCost) && $data.$purchaseCost && $RECORD_CURRENCY_RATE && $data.$qty}{((float)$data.$purchaseCost) / ((float)$data.$qty * (float){$RECORD_CURRENCY_RATE})}{else}0{/if}"}
+ {assign var="purchaseCost" value="{if isset($data.$purchaseCost) && isset($data.$qty) && $data.$purchaseCost && $RECORD_CURRENCY_RATE && $data.$qty}{((float)$data.$purchaseCost) / ((float)$data.$qty * (float){$RECORD_CURRENCY_RATE})}{else}0{/if}"}
{foreach item=currency_details from=$CURRENCIES}
{append var='listPriceValues' value=$currency_details.conversionrate * $purchaseCost index=$currency_details.currency_id}
{/foreach}
diff --git a/layouts/v7/modules/PriceBooks/RelatedList.tpl b/layouts/v7/modules/PriceBooks/RelatedList.tpl
index 22ee8566bd1f6ceaef6b228750322500336eab65..28d5029aac85c67c06e323e0ae26d71240436ee2 100644
--- a/layouts/v7/modules/PriceBooks/RelatedList.tpl
+++ b/layouts/v7/modules/PriceBooks/RelatedList.tpl
@@ -59,9 +59,12 @@
{if $HEADER_FIELD->get('column') eq 'time_start' or $HEADER_FIELD->get('column') eq 'time_end' or $HEADER_FIELD->getFieldDataType() eq 'reference'}
{else}
{assign var=FIELD_UI_TYPE_MODEL value=$HEADER_FIELD->getUITypeModel()}
- {include file=vtemplate_path($FIELD_UI_TYPE_MODEL->getListSearchTemplateName(),$RELATED_MODULE_NAME)
- FIELD_MODEL= $HEADER_FIELD SEARCH_INFO=$SEARCH_DETAILS[$HEADER_FIELD->getName()] USER_MODEL=$USER_MODEL}
- <input type="hidden" class="operatorValue" value="{$SEARCH_DETAILS[$HEADER_FIELD->getName()]['comparator']}">
+ {assign var=FIELD_SEARCH_INFO value=array("searchValue" => "", "comparator" => "")}
+ {if isset($SEARCH_DETAILS[$HEADER_FIELD->getName()])}
+ {assign var=FIELD_SEARCH_INFO value=$SEARCH_DETAILS[$HEADER_FIELD->getName()]}
+ {/if}
+ {include file=vtemplate_path($FIELD_UI_TYPE_MODEL->getListSearchTemplateName(),$RELATED_MODULE_NAME) FIELD_MODEL= $HEADER_FIELD SEARCH_INFO= $FIELD_SEARCH_INFO USER_MODEL=$USER_MODEL}
+ <input type="hidden" class="operatorValue" value="{$FIELD_SEARCH_INFO['comparator']}">
{/if}
</th>
{/foreach}
diff --git a/layouts/v7/modules/PriceBooks/uitypes/Boolean.tpl b/layouts/v7/modules/PriceBooks/uitypes/Boolean.tpl
index f109723b41aed70cc86673d5b834187293c2a08f..c27a5e23aa212466b4af1225796655a0ecfe3fc4 100644
--- a/layouts/v7/modules/PriceBooks/uitypes/Boolean.tpl
+++ b/layouts/v7/modules/PriceBooks/uitypes/Boolean.tpl
@@ -14,11 +14,11 @@
{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
{assign var="FIELD_NAME" value=$FIELD_MODEL->get('name')}
-<input type="hidden" name="{$FIELD_MODEL->getFieldName()}" value="{if $IS_RELATION eq true}1{else}0{/if}" />
+<input type="hidden" name="{$FIELD_MODEL->getFieldName()}" value="{if isset($IS_RELATION) && $IS_RELATION eq true}1{else}0{/if}" />
<input id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" type="checkbox" name="{$FIELD_MODEL->getFieldName()}"
data-validation-engine="validate[funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" data-fieldinfo='{$FIELD_INFO}'
{if $FIELD_MODEL->get('fieldvalue') eq true} checked {/if}
-{if $IS_RELATION eq true} disabled="disabled" {/if}
+{if isset($IS_RELATION) && $IS_RELATION eq true} disabled="disabled" {/if}
{if !empty($SPECIAL_VALIDATOR)}data-validator={Zend_Json::encode($SPECIAL_VALIDATOR)}{/if}
/>
{/strip}
\ No newline at end of file
diff --git a/layouts/v7/modules/Products/DetailViewHeaderTitle.tpl b/layouts/v7/modules/Products/DetailViewHeaderTitle.tpl
index e61ac96177bafcfc9f9af1ebd705853f7bdf876c..db90294047d99b1df4655b954e9808c631101faa 100644
--- a/layouts/v7/modules/Products/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/Products/DetailViewHeaderTitle.tpl
@@ -13,7 +13,7 @@
<div class="col-sm-6 col-lg-6 col-md-6">
<div class="record-header clearfix">
{assign var=IMAGE_DETAILS value=$RECORD->getImageDetails()}
- <div class="recordImage bgproducts app-{$SELECTED_MENU_CATEGORY}" {if $IMAGE_DETAILS|@count gt 1}style = "display:block"{/if}>
+ <div class="recordImage bgproducts app-{(isset($SELECTED_MENU_CATEGORY)) ? $SELECTED_MENU_CATEGORY : ''}" {if $IMAGE_DETAILS|@count gt 1}style = "display:block"{/if}>
{foreach key=ITER item=IMAGE_INFO from=$IMAGE_DETAILS}
{if !empty($IMAGE_INFO.url)}
{if $IMAGE_DETAILS|@count eq 1}
diff --git a/layouts/v7/modules/Products/PriceBookProductPopup.tpl b/layouts/v7/modules/Products/PriceBookProductPopup.tpl
index f5a0fafcf0314c5230b38cc59354cde0876fd9f2..ffe6675bc284f3954958a6483775b471574dca6d 100644
--- a/layouts/v7/modules/Products/PriceBookProductPopup.tpl
+++ b/layouts/v7/modules/Products/PriceBookProductPopup.tpl
@@ -22,13 +22,13 @@
<input type="hidden" id="parent" value="{$PARENT_MODULE}"/>
<input type="hidden" id="sourceRecord" value="{$SOURCE_RECORD}"/>
<input type="hidden" id="sourceField" value="{$SOURCE_FIELD}"/>
- <input type="hidden" id="url" value="{$GETURL}" />
- <input type="hidden" id="multi_select" value="{$MULTI_SELECT}" />
- <input type="hidden" id="currencyId" value="{$CURRENCY_ID}" />
- <input type="hidden" id="relatedParentModule" value="{$RELATED_PARENT_MODULE}"/>
- <input type="hidden" id="relatedParentId" value="{$RELATED_PARENT_ID}"/>
+ <input type="hidden" id="url" value="{(isset($GETURL)) ? $GETURL : ''}" />
+ <input type="hidden" id="multi_select" value="{(isset($MULTI_SELECT)) ? $MULTI_SELECT : ''}" />
+ <input type="hidden" id="currencyId" value="{(isset($CURRENCY_ID)) ? $CURRENCY_ID : ''}" />
+ <input type="hidden" id="relatedParentModule" value="{(isset($RELATED_PARENT_MODULE)) ? $RELATED_PARENT_MODULE : ''}"/>
+ <input type="hidden" id="relatedParentId" value="{(isset($RELATED_PARENT_ID)) ? $RELATED_PARENT_ID : ''}"/>
<input type="hidden" id="view" value="{$VIEW}"/>
- <input type="hidden" id="relationId" value="{$RELATION_ID}" />
+ <input type="hidden" id="relationId" value="{(isset($RELATION_ID)) ? $RELATION_ID : ''}" />
<input type="hidden" id="selectedIds" name="selectedIds">
{if !empty($POPUP_CLASS_NAME)}
<input type="hidden" id="popUpClassName" value="{$POPUP_CLASS_NAME}"/>
diff --git a/layouts/v7/modules/Products/PriceBookProductPopupContents.tpl b/layouts/v7/modules/Products/PriceBookProductPopupContents.tpl
index eee71c50dd26e08932ae3a015e2781892a296c87..ffbd94eac0b171fddcb7e9d79b5344b4b77d7574 100644
--- a/layouts/v7/modules/Products/PriceBookProductPopupContents.tpl
+++ b/layouts/v7/modules/Products/PriceBookProductPopupContents.tpl
@@ -69,18 +69,22 @@
{foreach item=LISTVIEW_HEADER from=$LISTVIEW_HEADERS}
<td>
{assign var=FIELD_UI_TYPE_MODEL value=$LISTVIEW_HEADER->getUITypeModel()}
+ {assign var=FIELD_SEARCH_INFO value=array("searchValue" => "")}
+ {if isset($SEARCH_DETAILS[$LISTVIEW_HEADER->getName()])}
+ {{assign var=FIELD_SEARCH_INFO value=$SEARCH_DETAILS[$LISTVIEW_HEADER->getName()]}}
+ {/if}
{include file=vtemplate_path($FIELD_UI_TYPE_MODEL->getListSearchTemplateName(),$MODULE_NAME)
- FIELD_MODEL= $LISTVIEW_HEADER SEARCH_INFO=$SEARCH_DETAILS[$LISTVIEW_HEADER->getName()] USER_MODEL=$USER_MODEL}
+ FIELD_MODEL= $LISTVIEW_HEADER SEARCH_INFO=$FIELD_SEARCH_INFO USER_MODEL=$CURRENT_USER_MODEL}
</td>
{/foreach}
<td></td>
</tr>
{/if}
{foreach item=LISTVIEW_ENTRY from=$LISTVIEW_ENTRIES name=popupListView}
- {assign var="RECORD_DATA" value="{$LISTVIEW_ENTRY->getRawData()}"}
- {assign var=EDITED_VALUE value=$SELECTED_RECORDS[$LISTVIEW_ENTRY->getId()]}
+ {assign var="RECORD_DATA" value="{implode(' ',$LISTVIEW_ENTRY->getRawData())}"}
+ {assign var=EDITED_VALUE value=(isset($SELECTED_RECORDS[$LISTVIEW_ENTRY->getId()])) ? $SELECTED_RECORDS[$LISTVIEW_ENTRY->getId()] : ''}
<tr class="listViewEntries" data-id="{$LISTVIEW_ENTRY->getId()}" data-name='{$LISTVIEW_ENTRY->getName()}'
- {if $GETURL neq ''} data-url='{$LISTVIEW_ENTRY->$GETURL()}' {/if} id="{$MODULE}_popUpListView_row_{$smarty.foreach.popupListView.index+1}">
+ {if isset($GETURL) && $GETURL neq ''} data-url='{$LISTVIEW_ENTRY->$GETURL()}' {/if} id="{$MODULE}_popUpListView_row_{$smarty.foreach.popupListView.index+1}">
<td class="{$WIDTHTYPE}">
<input class="entryCheckBox" type="checkbox" {if $EDITED_VALUE}checked{/if}/>
</td>
diff --git a/layouts/v7/modules/Vtiger/DetailViewHeaderTitle.tpl b/layouts/v7/modules/Vtiger/DetailViewHeaderTitle.tpl
index 4032e90a20a862270d51a26cfe57298b502bfc76..992565fffefaecf94b49a2adc52ab19e08fbc616 100644
--- a/layouts/v7/modules/Vtiger/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/Vtiger/DetailViewHeaderTitle.tpl
@@ -13,7 +13,7 @@
{if !$MODULE}
{assign var=MODULE value=$MODULE_NAME}
{/if}
- <div class="recordImage bg_{$MODULE} app-{$SELECTED_MENU_CATEGORY}">
+ <div class="recordImage bg_{$MODULE} app-{(isset($SELECTED_MENU_CATEGORY)) ? $SELECTED_MENU_CATEGORY : ''}">
<div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
</div>
diff --git a/layouts/v7/modules/Vtiger/OverlayDetailView.tpl b/layouts/v7/modules/Vtiger/OverlayDetailView.tpl
index 26add60a04b2130f36116fecd4ecc82a93e3c629..420c193a43f03e45b1c09a742f2a7ee1cbc35090 100644
--- a/layouts/v7/modules/Vtiger/OverlayDetailView.tpl
+++ b/layouts/v7/modules/Vtiger/OverlayDetailView.tpl
@@ -53,7 +53,7 @@
<div class = "col-lg-2 col-md-2 col-sm-2">
<div class="clearfix">
<div class = "btn-group">
- <button class="btn btn-default fullDetailsButton" onclick="window.location.href = '{$RECORD->getFullDetailViewUrl()}&app={$SELECTED_MENU_CATEGORY}'">{vtranslate('LBL_DETAILS',$MODULE_NAME)}</button>
+ <button class="btn btn-default fullDetailsButton" onclick="window.location.href = '{$RECORD->getFullDetailViewUrl()}&app={(isset($SELECTED_MENU_CATEGORY)) ? $SELECTED_MENU_CATEGORY : ''}'">{vtranslate('LBL_DETAILS',$MODULE_NAME)}</button>
{if isset($DETAILVIEW_LINKS)}
{foreach item=DETAIL_VIEW_BASIC_LINK from=$DETAILVIEW_LINKS['DETAILVIEWBASIC']}
{if $DETAIL_VIEW_BASIC_LINK && $DETAIL_VIEW_BASIC_LINK->getLabel() == 'LBL_EDIT'}
diff --git a/layouts/v7/modules/Vtiger/uitypes/Currency.tpl b/layouts/v7/modules/Vtiger/uitypes/Currency.tpl
index 6fde653c42fdcce6b4ca6f5efaa32e98bec26f65..be680209b01e03f9fed1001fbe5be0ac19c57e03 100644
--- a/layouts/v7/modules/Vtiger/uitypes/Currency.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/Currency.tpl
@@ -38,7 +38,7 @@
{/if}
/>
<input type="hidden" name="base_currency" value="{$BASE_CURRENCY_NAME}">
- <input type="hidden" name="cur_{$BASE_CURRENCY_ID}_check" value="on">
+ <input type="hidden" name="cur_{(isset($BASE_CURRENCY_ID)) ? $BASE_CURRENCY_ID : ''}_check" value="on">
<input type="hidden" id="requstedUnitPrice" name="{$BASE_CURRENCY_NAME}" value="">
</div>
{if $REQ->get('view') eq 'Edit'}
diff --git a/modules/CustomView/models/Record.php b/modules/CustomView/models/Record.php
index b1fc12ef9b4fe545b335f99d2ad8d93a5e56a3aa..3066fef56a7e607c1a128b78ebf957ec80765008 100644
--- a/modules/CustomView/models/Record.php
+++ b/modules/CustomView/models/Record.php
@@ -552,7 +552,7 @@ class CustomView_Record_Model extends Vtiger_Base_Model {
*/
public function getStandardCriteria() {
$db = PearDatabase::getInstance();
-
+ $stdfilterlist = array();
$cvId = $this->getId();
if(empty($cvId)) {
return array();
diff --git a/modules/PriceBooks/views/Detail.php b/modules/PriceBooks/views/Detail.php
index 75d00e0f6bec76cda8336adfbf0c9c8950499d06..f6753f1df4b1a66abc463e8e741652ec086076af 100644
--- a/modules/PriceBooks/views/Detail.php
+++ b/modules/PriceBooks/views/Detail.php
@@ -21,6 +21,7 @@ class PriceBooks_Detail_View extends Vtiger_Detail_View {
$relatedModuleName = $request->get('relatedModule');
$parentId = $request->get('record');
$label = $request->get('tab_label');
+ $productIdsList =array();
$requestedPage = $request->get('page');
if(empty ($requestedPage)) {
diff --git a/modules/Products/Products.php b/modules/Products/Products.php
index 570da446870583381075ccec1040b1c624dafd24..f3ca58febd3a2272d0229d10b43cb047bac35677 100755
--- a/modules/Products/Products.php
+++ b/modules/Products/Products.php
@@ -209,6 +209,7 @@ class Products extends CRMEntity {
$actualPrice = $requestPrice;
$isQuickCreate = true;
}
+ $_REQUEST[$cur_checkname] = isset($_REQUEST[$cur_checkname]) ? $_REQUEST[$cur_checkname] :'';
if($_REQUEST[$cur_checkname] == 'on' || $_REQUEST[$cur_checkname] == 1 || $isQuickCreate)
{
$conversion_rate = $currency_details[$i]['conversionrate'];
diff --git a/modules/Vtiger/views/ComposeEmail.php b/modules/Vtiger/views/ComposeEmail.php
index b26e682fff6d1a296572fda0d4fcfdcb49e68992..d66dec4501e104eab25612c2b3d31d0789c484f6 100644
--- a/modules/Vtiger/views/ComposeEmail.php
+++ b/modules/Vtiger/views/ComposeEmail.php
@@ -205,10 +205,6 @@ class Vtiger_ComposeEmail_View extends Vtiger_Footer_View {
$to = $requestTo;
}
- if(is_array($to)) {
- $to = implode(',',$to);
- }
-
$documentsModel = Vtiger_Module_Model::getInstance('Documents');
$documentsURL = $documentsModel->getInternalDocumentsURL();
diff --git a/pkg/vtiger/modules/Services/modules/Services/Services.php b/pkg/vtiger/modules/Services/modules/Services/Services.php
index 7d69f5a982672f2dc827e7802e58dcdbf5c379b3..de5465ecf651ded31304d95114f31f10faca8359 100644
--- a/pkg/vtiger/modules/Services/modules/Services/Services.php
+++ b/pkg/vtiger/modules/Services/modules/Services/Services.php
@@ -112,6 +112,7 @@ class Services extends CRMEntity {
function save_module($module)
{
//Inserting into service_taxrel table
+ $_REQUEST['ajxaction'] = isset($_REQUEST['ajxaction']) ? $_REQUEST['ajxaction'] : '';
if($_REQUEST['ajxaction'] != 'DETAILVIEW'&& $_REQUEST['action'] != 'ProcessDuplicates' && !$this->isWorkFlowFieldUpdate)
{
$this->insertTaxInformation('vtiger_producttaxrel', 'Services');
@@ -155,6 +156,7 @@ class Services extends CRMEntity {
{
$tax_name = $tax_details[$i]['taxname'];
$tax_checkname = $tax_details[$i]['taxname']."_check";
+ $_REQUEST[$tax_checkname]=isset($_REQUEST[$tax_checkname]) ? $_REQUEST[$tax_checkname] : '';
if($_REQUEST[$tax_checkname] == 'on' || $_REQUEST[$tax_checkname] == 1)
{
$taxid = getTaxId($tax_name);