diff --git a/layouts/v7/modules/Calendar/ListViewRecordActions.tpl b/layouts/v7/modules/Calendar/ListViewRecordActions.tpl
index e98941b30b68515b8362b79d643c6caff65017ab..4940f5c959f73739e63368097d721875e05db5c4 100644
--- a/layouts/v7/modules/Calendar/ListViewRecordActions.tpl
+++ b/layouts/v7/modules/Calendar/ListViewRecordActions.tpl
@@ -22,7 +22,9 @@
{if $QUICK_PREVIEW_ENABLED eq 'true'}
<span class="quickView fa fa-eye icon action" title="{vtranslate('LBL_QUICK_VIEW', $MODULE)}"></span>
{/if}
- <span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span>
+ {if $MODULE_MODEL->isStarredEnabled()}
+ <span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span>
+ {/if}
{assign var=EDIT_VIEW_URL value={$LISTVIEW_ENTRY->getEditViewUrl()}}
{if $IS_MODULE_EDITABLE && $EDIT_VIEW_URL && $LISTVIEW_ENTRY->get('taskstatus') neq vtranslate('Held', $MODULE) && $LISTVIEW_ENTRY->get('taskstatus') neq vtranslate('Completed', $MODULE)}
<span class="fa fa-check icon action" title="{vtranslate('LBL_MARK_AS_HELD', $MODULE)}" onclick="Calendar_Calendar_Js.markAsHeld('{$LISTVIEW_ENTRY->getId()}');"></span>
diff --git a/layouts/v7/modules/Documents/ListViewRecordActions.tpl b/layouts/v7/modules/Documents/ListViewRecordActions.tpl
index ac0662fecdad58eac9520c8428154467a15b6779..81ea8da849e176117b52a2e1929b4d4d0c97291c 100644
--- a/layouts/v7/modules/Documents/ListViewRecordActions.tpl
+++ b/layouts/v7/modules/Documents/ListViewRecordActions.tpl
@@ -20,7 +20,9 @@
{else}
{assign var=STARRED value=false}
{/if}
- <span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span>
+ {if $MODULE_MODEL->isStarredEnabled()}
+ <span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span>
+ {/if}
<span class="more dropdown action">
<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v icon"></i></a>
<ul class="dropdown-menu">
diff --git a/layouts/v7/modules/Vtiger/ListViewRecordActions.tpl b/layouts/v7/modules/Vtiger/ListViewRecordActions.tpl
index 7edcd662866f16bc41adc28a1035e533a7279d8a..c50779526411eab6597fb1d1e83413d434805693 100644
--- a/layouts/v7/modules/Vtiger/ListViewRecordActions.tpl
+++ b/layouts/v7/modules/Vtiger/ListViewRecordActions.tpl
@@ -23,7 +23,9 @@
{if $QUICK_PREVIEW_ENABLED eq 'true'}
<span class="quickView fa fa-eye icon action" data-app="{$SELECTED_MENU_CATEGORY}" title="{vtranslate('LBL_QUICK_VIEW', $MODULE)}"></span>
{/if}
- <span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span>
+ {if $MODULE_MODEL->isStarredEnabled()}
+ <span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span>
+ {/if}
<span class="more dropdown action">
<span href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-ellipsis-v icon"></i></span>
diff --git a/modules/Migration/models/Module.php b/modules/Migration/models/Module.php
index b89d696452b6599e236bf08021d68344462da93b..5d7cdd3b61c6fef4d1b6498abfbd720b4d752437 100644
--- a/modules/Migration/models/Module.php
+++ b/modules/Migration/models/Module.php
@@ -37,6 +37,7 @@ class Migration_Module_Model extends Vtiger_Module_Model {
array('650' => '6.5.0'),
array('660' => '6.6.0'),
array('700' => '7.0.0'),
+ array('701' => '7.0.1'),
);
return $versions;
}
diff --git a/modules/Migration/schema/700_to_701.php b/modules/Migration/schema/700_to_701.php
new file mode 100644
index 0000000000000000000000000000000000000000..4f5b43e13815f525ea935c731e44c5451fae6e58
--- /dev/null
+++ b/modules/Migration/schema/700_to_701.php
@@ -0,0 +1,34 @@
+<?php
+/*+********************************************************************************
+ * The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is: vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ *********************************************************************************/
+
+if(defined('VTIGER_UPGRADE')) {
+ global $adb, $current_user;
+ $db = PearDatabase::getInstance();
+
+ if (!Vtiger_Utils::CheckTable('vtiger_mailscanner')) {
+ Vtiger_Utils::CreateTable('vtiger_mailscanner',
+ "(`scannerid` INT(11) NOT NULL AUTO_INCREMENT,
+ `scannername` VARCHAR(30) DEFAULT NULL,
+ `server` VARCHAR(100) DEFAULT NULL,
+ `protocol` VARCHAR(10) DEFAULT NULL,
+ `username` VARCHAR(255) DEFAULT NULL,
+ `password` VARCHAR(255) DEFAULT NULL,
+ `ssltype` VARCHAR(10) DEFAULT NULL,
+ `sslmethod` VARCHAR(30) DEFAULT NULL,
+ `connecturl` VARCHAR(255) DEFAULT NULL,
+ `searchfor` VARCHAR(10) DEFAULT NULL,
+ `markas` VARCHAR(10) DEFAULT NULL,
+ `isvalid` INT(1) DEFAULT NULL,
+ `scanfrom` VARCHAR(10) DEFAULT 'ALL',
+ `time_zone` VARCHAR(10) DEFAULT NULL,
+ PRIMARY KEY (`scannerid`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8", true);
+ }
+}
\ No newline at end of file
diff --git a/modules/Settings/MailConverter/models/Field.php b/modules/Settings/MailConverter/models/Field.php
index e5701016f94a68620b443ce1776cbbf8432ecdf4..e7fc94b093e474dd0e1a52290c5121cd52e3c0e5 100644
--- a/modules/Settings/MailConverter/models/Field.php
+++ b/modules/Settings/MailConverter/models/Field.php
@@ -92,6 +92,8 @@ class Settings_MailConverter_Field_Model extends Vtiger_Field_Model {
}
return $this->isEditable;
}
-
-
+
+ public function getPicklistColors() {
+ return array();
+ }
}
\ No newline at end of file
diff --git a/vtigerversion.php b/vtigerversion.php
index 4f00663a29b3c9d633ee47eb23304d092f3a05ae..cdec81d14db147eb4bab882fbb57952bc8eb2238 100644
--- a/vtigerversion.php
+++ b/vtigerversion.php
@@ -8,7 +8,7 @@
* All Rights Reserved.
************************************************************************************/
-$patch_version = '20170523'; // -ve timestamp before release, +ve timestamp after release.
+$patch_version = '20170525'; // -ve timestamp before release, +ve timestamp after release.
$modified_database = '';
$vtiger_current_version = '7.0.0';
$_SESSION['vtiger_version'] = $vtiger_current_version;