diff --git a/include/upgrade.inc.php b/include/upgrade.inc.php
index 877a5f32d..015fd82d2 100644
--- a/include/upgrade.inc.php
+++ b/include/upgrade.inc.php
@@ -39,13 +39,31 @@ if (!defined('ALLOWED'))
$sb= HtmlInput::default_value_get("sb", "none");
if ($sb === "upg_all" && (!defined('MULTI')||(defined('MULTI')&&MULTI==1)))
{
+ echo '
';
/* If multi folders */
$Resdossier=$rep->exec_sql("select dos_id, dos_name from ac_dossier");
$MaxDossier=$rep->size($Resdossier);
-
+
+ //----------------------------------------------------------------------
+ // Upgrade the account_repository
+ //----------------------------------------------------------------------
+ echo "
"._("Mise à jour de la base de données principale")."
";
+ $cn=new Database();
+ if (DEBUG==false)
+ ob_start();
+ $MaxVersion=DBVERSIONREPO-1;
+ for ($i=4; $i<=$MaxVersion; $i++)
+ {
+ if ($cn->get_version()<=$i)
+ {
+ $cn->execute_script('sql/patch/ac-upgrade'.$i.'.sql');
+ }
+ }
//----------------------------------------------------------------------
// Upgrade the folders
//----------------------------------------------------------------------
+ echo ""._("Mise à jour dossiers")."
";
+
for ($e=0; $e<$MaxDossier; $e++)
{
$db_row=Database::fetch_array($Resdossier, $e);
@@ -70,7 +88,7 @@ if ($sb === "upg_all" && (!defined('MULTI')||(defined('MULTI')&&MULTI==1)))
//----------------------------------------------------------------------
$Resdossier=$rep->exec_sql("select mod_id, mod_name from modeledef");
$MaxDossier=$rep->size();
- echo ""._("Mise à modèle")."
";
+ echo ""._("Mise à jour modèles")."
";
for ($e=0; $e<$MaxDossier; $e++)
{
@@ -88,20 +106,6 @@ if ($sb === "upg_all" && (!defined('MULTI')||(defined('MULTI')&&MULTI==1)))
echo_warning(_("Modèle inexistant")." $name");
}
}
- //----------------------------------------------------------------------
- // Upgrade the account_repository
- //----------------------------------------------------------------------
- echo ""._("Mise à jour de la base de données principale")."
";
- $cn=new Database();
- if (DEBUG==false)
- ob_start();
- $MaxVersion=DBVERSIONREPO-1;
- for ($i=4; $i<=$MaxVersion; $i++)
- {
- if ($cn->get_version()<=$i)
- {
- $cn->execute_script('sql/patch/ac-upgrade'.$i.'.sql');
- }
- }
+
}
?>