Fixed issue #8201: TSV-import - subquestions missing

DEV: subquestions were not imported when the same
DEV: codes were used on X and Y-scale in text/number
DEV: matrix questions

application/helpers/admin/import_helper.php

@@ -4775,7 +4775,7 @@ function TSVImportSurvey($sFullFilepath)
                     $insertdata['mandatory'] = (isset($row['mandatory']) ? $row['mandatory'] : '');
                     $insertdata['scale_id'] = $scale_id;
                     // For multi nueric language, qid is needed, why not gid. name is not unique.
-                    $fullsqname = "G{$gid}Q{$qid}_{$sqname}";
+                    $fullsqname = "G{$gid}Q{$qid}_{$scale_id}_{$sqname}";
                     if (isset($sqinfo[$fullsqname]))
                     {
                         $qseq = $sqinfo[$fullsqname]['question_order'];