Merge branch '9.4/bugfixes' into 9.5/bugfixes

inc/location.class.php

@@ -351,7 +351,7 @@ class Location extends CommonTreeDropdown {
          $criteria = [
             'SELECT' => [
                "$table.id",
-               "$crit AS type"
+               new \QueryExpression($DB->quoteValue($crit) . ' AS ' . $DB->quoteName('type')),
             ],
             'FROM'   => $table,
             'WHERE'  => [
@@ -366,7 +366,7 @@ class Location extends CommonTreeDropdown {
             $union->addQuery([
                'SELECT' => [
                   'id',
-                  new \QueryExpression("'$type' AS type")
+                  new \QueryExpression($DB->quoteValue($type) . ' AS ' . $DB->quoteName('type')),
                ],
                'FROM'   => $table,
                'WHERE'  => [

inc/software.class.php

@@ -1034,7 +1034,7 @@ class Software extends CommonDBTM {
                );
 
                $DB->update(
-                  'glpi_computers_softwareversions', [
+                  'glpi_softwarelicenses', [
                      'softwareversions_id_use' => $dest['id']
                   ], [
                      'softwareversions_id_use' => $from['id']

inc/transfer.class.php

@@ -906,7 +906,7 @@ class Transfer extends CommonDBTM {
                   'glpi_contacts'  => [
                      'ON' => [
                         'glpi_contacts_suppliers'  => 'contacts_id',
-                        'glpi_suppliers'           => 'id'
+                        'glpi_contacts'            => 'id'
                      ]
                   ]
                ],