diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 49ababf4a25..ac95b6062a8 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -296,8 +296,8 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
$newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : $conf->entity), $sql);
- // Ajout trace sur requete (eventuellement a commenter si beaucoup de requetes)
- if (!$silent) print '
| '.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."' |
\n";
+ // Add log of request
+ if (!$silent) print '| '.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."' |
\n";
dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG);
$sqlmodified = 0;
@@ -404,12 +404,34 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
if ($error == 0)
{
- if (!$silent) print '| '.$langs->trans("ProcessMigrateScript").' | ';
- if (!$silent) print ''.$langs->trans("OK").' |
'."\n";
+ if (!$silent) {
+ print '| '.$langs->trans("ProcessMigrateScript").' | ';
+ print ''.$langs->trans("OK");
+ //if (! empty($conf->use_javascript_ajax)) {
+ print '';
+ print ' - '.$langs->trans("ShowHideDetails").'';
+ //}
+ print ' |
'."\n";
+ }
$ok = 1;
} else {
- if (!$silent) print '| '.$langs->trans("ProcessMigrateScript").' | ';
- if (!$silent) print ''.$langs->trans("KO").' |
'."\n";
+ if (!$silent) {
+ print '| '.$langs->trans("ProcessMigrateScript").' | ';
+ print ''.$langs->trans("KO").'';
+ print ' |
'."\n";
+ }
$ok = 0;
}
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index af05fb374d2..5545c4a3bcf 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -146,11 +146,11 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
if ($db->connected)
{
print '| ';
- print $langs->trans("ServerConnection")." : $dolibarr_main_db_host | ".$langs->trans("OK")." |
\n";
+ print $langs->trans("ServerConnection")." : ".$dolibarr_main_db_host.''.$langs->trans("OK").' | '."\n";
dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection").": $dolibarr_main_db_host ".$langs->transnoentities("OK"));
$ok = 1;
} else {
- print "| ".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)." | ".$langs->transnoentities("Error")." |
\n";
+ print "| ".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name).' | '.$langs->transnoentities("Error")." |
\n";
dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
$ok = 0;
}
@@ -160,11 +160,11 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
if ($db->database_selected)
{
print '| ';
- print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name." | ".$langs->trans("OK")." |
\n";
+ print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name.''.$langs->trans("OK")." | \n";
dolibarr_install_syslog("upgrade: Database connection successful: ".$dolibarr_main_db_name);
$ok = 1;
} else {
- print "| ".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)." | ".$langs->trans("Error")." |
\n";
+ print "| ".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name).' | '.$langs->trans("Error")." |
\n";
dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
$ok = 0;
}
@@ -354,7 +354,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
{
if (in_array($dir.$file, $listoffileprocessed)) continue;
- print '
|
';
+ print '
|
';
print '| '.$langs->trans("ChoosedMigrateScript").' | '.$file.' |
'."\n";
// Run sql script
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e47390b9ce0..7c583329ef0 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -80,6 +80,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
JavascriptDisabled=JavaScript disabled
UsePreviewTabs=Use preview tabs
ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
PreviewNotAvailable=Preview not available
ThemeCurrentlyActive=Theme currently active
CurrentTimeZone=TimeZone PHP (server)