When migrating custom fields don't care in which category fields are.

Author: mschering

www/go/core/model/FieldSet.php

@@ -199,7 +199,10 @@ public static function migrateCustomFields(string $fromEntityCls, string $toEnti
 			foreach($fields as $field) {
 
 //				echo "Migrating field " . $field->databaseName . "\n";
-				$newField = \go\core\model\Field::find()->where('fieldSetId', '=', $newFieldSet->id)->where(['databaseName' => $field->databaseName])->single();
+				$newField = \go\core\model\Field::find()
+					->join("core_customfields_field_set", "fs", "fs.id = f.fieldSetId")
+					->where('fs.entityId', '=', $toEntityType->getId())
+					->where(['databaseName' => $field->databaseName])->single();
 
 				if(!$newField) {
 					$newField = $field->copy();