diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 463c2b2df4c..bbb12e8693e 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -5160,9 +5160,10 @@ function migrate_contractdet_rank() $db->begin(); print ''; + print ''.$langs->trans('MigrationContractLineRank')."
\n"; - $sql = "SELECT c.rowid as cid ,cd.rowid as cdid,cd.rang FROM ".$db->prefix()."contratdet as cd INNER JOIN ".$db->prefix()."contrat as c ON c.rowid=cd.fk_contrat AND cd.rang=0"; - $sql .=" ORDER BY c.rowid,cd.rowid"; + $sql = "SELECT c.rowid as cid ,cd.rowid as cdid,cd.rang FROM ".$db->prefix()."contratdet as cd INNER JOIN ".$db->prefix()."contrat as c ON c.rowid=cd.fk_contrat AND cd.rang=0"; + $sql .=" ORDER BY c.rowid,cd.rowid"; $resql = $db->query($sql); if ($resql) { @@ -5176,7 +5177,8 @@ function migrate_contractdet_rank() } $sqlUpd = "UPDATE ".$db->prefix()."contratdet SET rang=".(int) $currentRank." WHERE rowid=".(int) $obj->cdid; - $resultstring .= ''.$sqlUpd."\n"; + $resultstring = '.'; + print $resultstring; $resqlUpd = $db->query($sqlUpd); if (!$resqlUpd) { dol_print_error($db); @@ -5194,12 +5196,9 @@ function migrate_contractdet_rank() $db->rollback(); } - print ''.$langs->trans('MigrationContractLineRank')."
\n"; print ''; - if ($resultstring) { - print $resultstring; - } else { + if (!$resultstring) { print ''.$langs->trans("NothingToDo")."\n"; } }