Merge branch 'migration_issue' into '7.4.0'

Fixes #1630 Migration issue to update userlabel fixed

See merge request !831

modules/Migration/schema/730_to_740.php

@@ -38,7 +38,7 @@ if (defined('VTIGER_UPGRADE')) {
     
     $entityFields = Vtiger_Functions::getEntityModuleInfo($moduleName);
     $entityFieldNames  = explode(',', $entityFields['fieldname']);
-    $sql = "UPDATE vtiger_users SET $fieldName = TRIM(CONCAT(".implode(' ', $entityFieldNames)."))";
+    $sql = "UPDATE vtiger_users SET $fieldName = TRIM(CONCAT_WS(' ',".implode(',', $entityFieldNames)."))";
     $db->pquery($sql, array());
     
     Vtiger_Access::syncSharingAccess();

modules/Migration/schema/73_to_740.php

@@ -10,4 +10,4 @@
 
 //7.3_to_7.4.0 (to overcome 730 package glitch, where DB version set to 7.3 instead 7.3.0)
 
-include_once dirname(__FILE__)."730_to_740.php";
+include_once dirname(__FILE__)."/730_to_740.php";
\ No newline at end of file

vtigerversion.php

@@ -8,7 +8,7 @@
  * All Rights Reserved.
  ************************************************************************************/
 
-$patch_version = '20210721'; // -ve timestamp before release, +ve timestamp after release.
+$patch_version = '20210723'; // -ve timestamp before release, +ve timestamp after release.
 $modified_database = '';
 $vtiger_current_version = '7.4.0';
 $_SESSION['vtiger_version'] = $vtiger_current_version;