Merge branch 'master' into 566_Fix_Calendar_Issues

# Conflicts:
#	modules/Users/views/Calendar.php

modules/Migration/schema/700_to_701.php

@@ -31,4 +31,13 @@ if(defined('VTIGER_UPGRADE')) {
 				PRIMARY KEY (`scannerid`)
 			  ) ENGINE=InnoDB DEFAULT CHARSET=utf8", true);
 	}
+
+	$updateModulesList = array(	'Project'	=> 'packages/vtiger/optional/Projects.zip',
+								'Google'	=> 'packages/vtiger/optional/Google.zip');
+	foreach ($updateModulesList as $moduleName => $packagePath) {
+		$moduleInstance = Vtiger_Module::getInstance($moduleName);
+		if($moduleInstance) {
+			updateVtlibModule($moduleName, $packagepath);
+		}
+	}
 }
\ No newline at end of file

modules/Users/views/Calendar.php

@@ -38,7 +38,6 @@ class Users_Calendar_View extends Vtiger_Detail_View {
 
 	public function preProcess(Vtiger_Request $request, $display=true) {
 		if($this->checkPermission($request)) {
-			
 			$qualifiedModuleName = $request->getModule(false);
 			$currentUser = Users_Record_Model::getCurrentUserModel();
 			$recordId = $request->get('record');
@@ -98,7 +97,7 @@ class Users_Calendar_View extends Vtiger_Detail_View {
 			$viewer->assign('SKIN_PATH', Vtiger_Theme::getCurrentUserThemePath());
 			$viewer->assign('LANGUAGE', $currentUser->get('language'));
 			$viewer->assign('QUALIFIED_MODULE', $qualifiedModuleName);
-			
+			$viewer->assign('SELECTED_MENU_CATEGORY', 'MARKETING');
 			$settingsModel = Settings_Vtiger_Module_Model::getInstance();
 			$menuModels = $settingsModel->getMenus();
 

pkg/vtiger/modules/Projects/Project/layouts/v7/modules/Project/SummaryViewWidgets.tpl

@@ -213,7 +213,7 @@
 							{if $PROGRESS_FIELD_MODEL->isViewableInDetailView()}
 								<div class="pull-left marginRight15">
 									{assign var=FIELD_INFO value=$PROGRESS_FIELD_MODEL->getFieldInfo()}
-									{assign var=PICKLIST_VALUES value=$PROGRESS_FIELD_MODEL['picklistvalues']}
+									{assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
 									{assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
 									{assign var="SPECIAL_VALIDATOR" value=$PROGRESS_FIELD_MODEL->getValidator()}
 									<select class="select2" name="{$PROGRESS_FIELD_MODEL->get('name')}" data-validation-engine="validate[{if $PROGRESS_FIELD_MODEL->isMandatory() eq true} required,{/if}funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" data-fieldinfo='{$FIELD_INFO|escape}' {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if} >

vtigerversion.php

@@ -8,9 +8,9 @@
  * All Rights Reserved.
  ************************************************************************************/
 
-$patch_version = '20170530'; // -ve timestamp before release, +ve timestamp after release.
+$patch_version = '20170531'; // -ve timestamp before release, +ve timestamp after release.
 $modified_database = '';
-$vtiger_current_version = '7.0.0';
+$vtiger_current_version = '7.0.1';
 $_SESSION['vtiger_version'] = $vtiger_current_version;
 
 ?>
\ No newline at end of file