Fixes #436, #466

Fixes #436 (closed) - vt7 dev release - Import records fail

Fixes #466 - vt7 dev release - Missing quotation marks in Picklist.tpl

layouts/v7/modules/Calendar/uitypes/ActivityPicklistFieldSearchView.tpl

@@ -8,8 +8,9 @@
*************************************************************************************}
{strip}
-	{assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
-	{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
+	{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'])}
<div class="select2_search_div">
<input type="text" class="listSearchContributor inputElement select2_input_element"/>