Merge conflict resolved

include/Webservices/Utils.php

@@ -1291,7 +1291,7 @@ function vtws_filedetails($fileData){
         $fileName = $fileData['name'];
         $fileType = $fileData['type'];
         $fileName = html_entity_decode($fileName, ENT_QUOTES, vglobal('default_charset'));
-        $filenamewithpath = $fileData['path'].'_'.$fileData['encName'];
+        $filenamewithpath = $fileData['path'].$fileData['attachmentsid'].'_'.$fileData['storedname'];
         $filesize = filesize($filenamewithpath);
         $fileDetails['fileid'] = $fileData['attachmentsid'];
         $fileDetails['filename'] = $fileName;

vtigerversion.php

@@ -8,9 +8,9 @@
  * All Rights Reserved.
  ************************************************************************************/
 
-$patch_version = '20201013'; // -ve timestamp before release, +ve timestamp after release.
+$patch_version = '-20201019'; // -ve timestamp before release, +ve timestamp after release.
 $modified_database = '';
-$vtiger_current_version = '7.3.0';
+$vtiger_current_version = '7.4.0';
 $_SESSION['vtiger_version'] = $vtiger_current_version;
 
 ?>