Merge branch 'import_enhancement' into '7.4.0'

Fixes #1483 #1484 field mapping supported for record id



See merge request !803

modules/Vtiger/models/ModuleMeta.php

@@ -85,8 +85,8 @@ class Vtiger_ModuleMeta_Model extends Vtiger_Base_Model {
 		$accessibleFields = $this->getAccessibleFields($this->moduleName);
 		$mergableFields = array();
 		foreach($accessibleFields as $fieldName => $fieldInstance) {
-			if($fieldInstance->getPresence() === 1) {
-				continue;
+			if(intval($fieldInstance->getPresence()) === 1) { 
+                            continue;
 			}
 			// We need to avoid Last Modified by or any such User reference field
 			// for now as Query Generator is not handling it well enough.
@@ -140,9 +140,8 @@ class Vtiger_ModuleMeta_Model extends Vtiger_Base_Model {
 			$moduleFields = $this->getAccessibleFields($moduleName);
 			$importableFields = array();
 			foreach($moduleFields as $fieldName => $fieldInstance) {
-				if(($this->isEditableField($fieldInstance)
-							&& ($fieldInstance->getTableName() != 'vtiger_crmentity' || $fieldInstance->getColumnName() != 'modifiedby')
-						) || ($fieldInstance->getUIType() == '70' && $fieldName != 'modifiedtime')) {
+				if(($this->isEditableField($fieldInstance)) || ($fieldInstance->getUIType() == 4) && ($fieldInstance->getTableName() != 'vtiger_crmentity' || $fieldInstance->getColumnName() != 'modifiedby')
+                                   || ($fieldInstance->getUIType() == '70' && $fieldName != 'modifiedtime')) {
 					$importableFields[$fieldName] = $fieldInstance;
 				}
 			}
@@ -216,4 +215,4 @@ class Vtiger_ModuleMeta_Model extends Vtiger_Base_Model {
 		}
 		return $mandatoryFields;
 	}
-}
\ No newline at end of file
+}