From 20c85b9ca87cf40a2a385dd31abdad4030dceca9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 16 Feb 2012 18:52:07 +0100
Subject: [PATCH] Avoid duplicate messages during upgrade
---
htdocs/install/upgrade2.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index a9ed6be5a45..c57a28febf1 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3285,6 +3285,7 @@ function migrate_mode_reglement($db,$langs,$conf)
'code' => array('VAD','TRA','LCR','FAC','PRO'),
'tables' => array('commande_fournisseur','commande','facture_rec','facture','propal')
);
+ $count=0;
foreach($elements['old_id'] as $key => $old_id)
{
@@ -3303,6 +3304,8 @@ function migrate_mode_reglement($db,$langs,$conf)
$num = $db->num_rows($resql);
if ($num)
{
+ $count++;
+
$db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."c_paiement SET ";
@@ -3344,13 +3347,12 @@ function migrate_mode_reglement($db,$langs,$conf)
$db->rollback();
}
}
- else
- {
- print $langs->trans('AlreadyDone')."<br>\n";
- }
}
}
+ if ($count == 0) print $langs->trans('AlreadyDone')."<br>\n";
+
+
print '</td></tr>';
}
--
GitLab