Optimisation design install/migration
This commit is contained in:
Laurent Destailleur
parent
846bf38c1f
commit
9c2990c692
@ -64,7 +64,7 @@ border: 1px solid #8CACBB;
|
||||
table.main-inside {
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
margin-bottom: 40px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
<?php
|
||||
/* Copyright (C) 2004-2007 Cyrille de Lambert <cyrille.delambert@auguria.net>
|
||||
/* Copyright (C) 2007 Cyrille de Lambert <cyrille.delambert@auguria.net>
|
||||
* Copyright (C) 2007 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -106,13 +107,16 @@ if ($db->connected)
|
||||
{
|
||||
?>
|
||||
<table border="0" cellpadding="1" cellspacing="0">
|
||||
<tr><td valign="top" class="label" colspan="3"><?php echo $langs->trans("CharsetChoice");?></td></tr>
|
||||
|
||||
<tr><td align="center" class="label" colspan="3"><h3><?php echo $langs->trans("CharsetChoice");?></h3></td></tr>
|
||||
|
||||
<tr>
|
||||
<td valign="top" class="label"><?php echo $langs->trans("CharacterSetClient"); ?></td>
|
||||
<td valign="top" class="label"><select name="character_set_client">
|
||||
<option>ISO-8859-1</option>
|
||||
<option value="ISO-8859-1">ISO-8859-1</option>
|
||||
<option value="UTF-8">UTF-8 <?php echo $langs->trans("Experimental") ?></option>
|
||||
<!--
|
||||
<option>ISO-8859-15</option>
|
||||
<option>UTF-8</option>
|
||||
<option>cp866</option>
|
||||
<option>cp1251</option>
|
||||
<option>cp1252</option>
|
||||
@ -122,6 +126,7 @@ if ($db->connected)
|
||||
<option>BIG5-HKSCS</option>
|
||||
<option>Shift_JIS</option>
|
||||
<option>EUC-JP</option>
|
||||
-->
|
||||
</select></td>
|
||||
<td class="label"><div class="comment"><?php echo $langs->trans("CharacterSetClientComment"); ?></div></td>
|
||||
</tr>
|
||||
|
||||
@ -70,7 +70,7 @@ if (! $main_data_dir) { $main_data_dir="$main_dir/documents"; }
|
||||
if ($_POST["action"] == "set")
|
||||
{
|
||||
umask(0);
|
||||
print '<h2>'.$langs->trans("SaveConfigurationFile").'</h2>';
|
||||
print '<h3>'.$langs->trans("SaveConfigurationFile").'</h3>';
|
||||
print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
|
||||
|
||||
// Verification validite parametre main_dir
|
||||
|
||||
@ -62,7 +62,7 @@ pHeader($langs->trans("CreateDatabaseObjects"),"etape4");
|
||||
|
||||
if ($_POST["action"] == "set")
|
||||
{
|
||||
print '<h2>'.$langs->trans("Database").'</h2>';
|
||||
print '<h3>'.$langs->trans("Database").'</h3>';
|
||||
|
||||
print '<table cellspacing="0" cellpadding="4" border="0" width="100%">';
|
||||
$error=0;
|
||||
|
||||
@ -45,6 +45,13 @@ pHeader($langs->trans("ConfigurationFile"),"etape0");
|
||||
|
||||
print '<table border="0" cellpadding="1" cellspacing="0">';
|
||||
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="3" class="label" align="center"><h3>
|
||||
<?php echo $langs->trans("Main"); ?>
|
||||
</h3></td></tr>
|
||||
<?php
|
||||
|
||||
print '<tr>';
|
||||
print '<td valign="top" class="label">';
|
||||
print $langs->trans("WebPagesDirectory");
|
||||
@ -76,7 +83,7 @@ if(! isset($dolibarr_main_url_root) || strlen($dolibarr_main_url_root) == 0)
|
||||
$dolibarr_main_document_root = ereg_replace('[\\\/]+$','',$dolibarr_main_document_root);
|
||||
}
|
||||
}
|
||||
echo $PMA_MYSQL_INT_VERSION;
|
||||
//echo $PMA_MYSQL_INT_VERSION;
|
||||
?>
|
||||
<td class="label" valign="top"><input type="text" size="60" value="<?php print $dolibarr_main_document_root; ?>" name="main_dir">
|
||||
</td><td class="comment">
|
||||
@ -152,10 +159,12 @@ print $langs->trans("Examples").":<br>";
|
||||
<li>http://www.myserver.com:8180/dolibarr</li>
|
||||
</tr>
|
||||
|
||||
<!-- Dolibarr database -->
|
||||
|
||||
<tr>
|
||||
<td colspan="3" align="center"><h2>
|
||||
<td colspan="3" class="label" align="center"><br><h3>
|
||||
<?php echo $langs->trans("DolibarrDatabase"); ?>
|
||||
</h2></td>
|
||||
</h3></td>
|
||||
</tr>
|
||||
<?php
|
||||
if (!isset($dolibarr_main_db_host))
|
||||
@ -299,10 +308,13 @@ while (($file = readdir($handle))!==false)
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
<!-- Super access -->
|
||||
|
||||
<tr>
|
||||
<td colspan="3" align="center"><h2>
|
||||
<td colspan="3" class="label" align="center"><br><h3>
|
||||
<?php echo $langs->trans("DatabaseSuperUserAccess"); ?>
|
||||
</h2></td></tr>
|
||||
</h3></td></tr>
|
||||
|
||||
<tr>
|
||||
<td class="label" valign="top">
|
||||
|
||||
@ -116,16 +116,17 @@ function pHeader($soutitre,$next,$action='set')
|
||||
print '<title>'.$langs->trans("DolibarrSetup").'</title>';
|
||||
print '</head>';
|
||||
print '<body>';
|
||||
print '<span class="titre">'.$langs->trans("DolibarrSetup").'</span>';
|
||||
print '<span class="titre">'.$langs->trans("DolibarrSetup");
|
||||
if ($soutitre) {
|
||||
print ' - '.$soutitre;
|
||||
}
|
||||
print '</span>';
|
||||
|
||||
print '<form action="'.$next.'.php" method="POST">';
|
||||
print '<input type="hidden" name="testpost" value="ok">';
|
||||
print '<input type="hidden" name="action" value="'.$action.'">';
|
||||
|
||||
print '<table class="main" width="100%"><tr><td>';
|
||||
if ($soutitre) {
|
||||
print '<div class="soustitre">'.$soutitre.'</div>';
|
||||
}
|
||||
|
||||
print '<table class="main-inside" width="100%"><tr><td>';
|
||||
|
||||
|
||||
@ -40,9 +40,9 @@ dolibarr_install_syslog("licence: Entering licence.php page");
|
||||
|
||||
pHeader($langs->trans("License"),"fileconf");
|
||||
|
||||
print '<pre>';
|
||||
print '<pre style="align: center; font-size: 12px">';
|
||||
$langs->print_file("html/gpl.txt",1);
|
||||
print "</pre>";
|
||||
print '</pre>';
|
||||
|
||||
pFooter(0,$setuplang);
|
||||
|
||||
|
||||
@ -65,7 +65,7 @@ pHeader($langs->trans("DatabaseMigration"),"upgrade2","upgrade");
|
||||
|
||||
if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
|
||||
{
|
||||
print '<h2>'.$langs->trans("DatabaseMigration").'</h2>';
|
||||
print '<h3>'.$langs->trans("DatabaseMigration").'<h3>';
|
||||
|
||||
if (! $versionfrom && ! $versionto)
|
||||
{
|
||||
|
||||
@ -70,7 +70,7 @@ pHeader($langs->trans('DataMigration'),'etape5','upgrade');
|
||||
|
||||
if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
|
||||
{
|
||||
print '<h2>'.$langs->trans('DataMigration').'</h2>';
|
||||
print '<h3>'.$langs->trans('DataMigration').'</h3>';
|
||||
|
||||
print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
|
||||
|
||||
@ -145,8 +145,6 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
|
||||
|
||||
$db->begin();
|
||||
|
||||
print '<tr><td colspan="4" nowrap="nowrap"> </td></tr>';
|
||||
|
||||
// Chaque action de migration doit renvoyer une ligne sur 4 colonnes avec
|
||||
// dans la 1ere colonne, la description de l'action a faire
|
||||
// dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error'
|
||||
@ -329,13 +327,13 @@ function migrate_paiements_orphelins_1($db,$langs,$conf)
|
||||
|
||||
if (sizeof($row))
|
||||
{
|
||||
print $langs->trans('MigrationPaymentsNumberToUpdate', sizeof($row))."<br>\n";
|
||||
print $langs->trans('OrphelinsPaymentsDetectedByMethod', 1).': '.sizeof($row)."<br>\n";
|
||||
$db->begin();
|
||||
|
||||
$res = 0;
|
||||
for ($i = 0 ; $i < sizeof($row) ; $i++)
|
||||
{
|
||||
print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
|
||||
if ($conf->MAIN_ENABLE_DEVELOPMENT) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' pamount='.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' bamount='.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
|
||||
|
||||
// On cherche facture sans lien paiement et du meme montant et pour meme societe.
|
||||
$sql=" SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
|
||||
@ -373,14 +371,14 @@ function migrate_paiements_orphelins_1($db,$langs,$conf)
|
||||
}
|
||||
else
|
||||
{
|
||||
print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
|
||||
print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
|
||||
}
|
||||
|
||||
$db->commit();
|
||||
}
|
||||
else
|
||||
{
|
||||
print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
|
||||
print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
|
||||
}
|
||||
|
||||
print '</td></tr>';
|
||||
@ -437,13 +435,13 @@ function migrate_paiements_orphelins_2($db,$langs,$conf)
|
||||
|
||||
if (sizeof($row))
|
||||
{
|
||||
print $langs->trans('MigrationPaymentsNumberToUpdate', sizeof($row))."<br>\n";
|
||||
print $langs->trans('OrphelinsPaymentsDetectedByMethod', 2).': '.sizeof($row)."<br>\n";
|
||||
$db->begin();
|
||||
|
||||
$res = 0;
|
||||
for ($i = 0 ; $i < sizeof($row) ; $i++)
|
||||
{
|
||||
print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
|
||||
if ($conf->MAIN_ENABLE_DEVELOPMENT) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
|
||||
|
||||
// On cherche facture sans lien paiement et du meme montant et pour meme societe.
|
||||
$sql=" SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
|
||||
@ -481,14 +479,14 @@ function migrate_paiements_orphelins_2($db,$langs,$conf)
|
||||
}
|
||||
else
|
||||
{
|
||||
print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
|
||||
print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
|
||||
}
|
||||
|
||||
$db->commit();
|
||||
}
|
||||
else
|
||||
{
|
||||
print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
|
||||
print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
|
||||
}
|
||||
|
||||
print '</td></tr>';
|
||||
|
||||
@ -110,6 +110,7 @@ CharacterSetDatabase=Character set for database
|
||||
CharacterSetDatabaseComment=Choose character set wanted for database creation.<br/>This parameter can't be defined if database already exists.
|
||||
YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
|
||||
BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
|
||||
OrphelinsPaymentsDetectedByMethod=Orphelins payment detected by method %s
|
||||
|
||||
#########
|
||||
# upgrade
|
||||
@ -126,6 +127,7 @@ MigrationPaymentsUpdate=Payment data correction
|
||||
MigrationPaymentsNumberToUpdate=%s payment(s) to update
|
||||
MigrationProcessPaymentUpdate=Update payment(s) %s
|
||||
MigrationPaymentsNothingToUpdate=No more things to do
|
||||
MigrationPaymentsNothingUpdatable=No more payments that can be corrected
|
||||
|
||||
# Contracts Update
|
||||
MigrationContractsUpdate=Contract data correction
|
||||
|
||||
@ -110,7 +110,8 @@ CharacterSetDatabase=Codage utilis
|
||||
CharacterSetDatabaseComment=Veuillez choisir le codage que vous désirez choisir pour la création de la base de données.<br/> Ce paramètre n'est pas sélectionnable si votre base est déjà créée.
|
||||
YouAskDatabaseCreationSoDolibarrNeedToConnect=Vous avez demandé la création du login de base de donnée <b>%s</b>, mais pour cela, Dolibarr doit se connecter sur le serveur <b>%s</b> via le super utilisateur <b>%s</b>.
|
||||
BecauseConnectionFailedParametersMayBeWrong=La connexion ayant échoué, les paramètres du serveur ou du super utilisateur sont peut-etre incorrects.
|
||||
|
||||
OrphelinsPaymentsDetectedByMethod=Paiement orphelins detectés par la méthode %s
|
||||
|
||||
#########
|
||||
# upgrade
|
||||
#########
|
||||
@ -126,6 +127,7 @@ MigrationPaymentsUpdate=Mise a jour des paiments (lien n-n paiements-factures)
|
||||
MigrationPaymentsNumberToUpdate=%s paiement(s) à mettre à jour
|
||||
MigrationProcessPaymentUpdate=Mise a jour paiement(s) %s
|
||||
MigrationPaymentsNothingToUpdate=Pas ou plus de paiements orphelins à corriger.
|
||||
MigrationPaymentsNothingUpdatable=Pas ou plus de paiements orphelins corrigeable.
|
||||
|
||||
# Contracts Update
|
||||
MigrationContractsUpdate=Mise a jour des contrats sans details (gestion du contrat + detail de contrat)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user