Fix: Amlioration pb install sous IE
This commit is contained in:
Laurent Destailleur
parent
13715ea238
commit
967265d0e0
@ -46,10 +46,10 @@ dolibarr_install_syslog("Dolibarr install/upgrade process started");
|
||||
pHeader($langs->trans("DolibarrWelcome"),""); // Etape suivante = license
|
||||
|
||||
print '<center><img src="../theme/dolibarr_logo_2.png" alt="Dolibarr logo"></center><br>';
|
||||
print "<br>";
|
||||
print "<br>\n";
|
||||
|
||||
|
||||
print $langs->trans("InstallEasy")."<br>";
|
||||
print $langs->trans("InstallEasy")."<br>\n";
|
||||
|
||||
// Si fichier présent et lisible et renseigné
|
||||
clearstatcache();
|
||||
@ -107,7 +107,7 @@ else
|
||||
}
|
||||
print "<br />";
|
||||
print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php');
|
||||
print "<br />";
|
||||
print "<br />\n";
|
||||
|
||||
$allowinstall=0;
|
||||
}
|
||||
@ -124,7 +124,7 @@ else
|
||||
}
|
||||
print "<br />";
|
||||
print $langs->trans("ConfFileIsWritable",'conf.php');
|
||||
print "<br />";
|
||||
print "<br />\n";
|
||||
|
||||
$allowinstall=1;
|
||||
}
|
||||
@ -150,7 +150,7 @@ else
|
||||
print $langs->trans("InstallNotAllowed");
|
||||
}
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
print '</tr>'."\n";
|
||||
|
||||
print '<tr><td nowrap="nowrap"><b>'.$langs->trans("Upgrade").'</b></td><td>';
|
||||
print $langs->trans("UpgradeDesc").'</td>';
|
||||
@ -164,19 +164,14 @@ else
|
||||
print $langs->trans("NotAvailable");
|
||||
}
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
print '</tr>'."\n";
|
||||
|
||||
print '</table>';
|
||||
print "\n";
|
||||
|
||||
}
|
||||
|
||||
print '</div>';
|
||||
print '</div>';
|
||||
print '</form>';
|
||||
|
||||
|
||||
print '</body>';
|
||||
print '</html>';
|
||||
pFooter(1);
|
||||
|
||||
?>
|
||||
|
||||
@ -22,14 +22,14 @@ body {
|
||||
font-size:13px;
|
||||
font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
|
||||
background-color: #F4F4F4;
|
||||
margin-left: 5%;
|
||||
margin-right: 5%;
|
||||
margin-top: 2em;
|
||||
margin-bottom: 5%;
|
||||
margin-left: 20px;
|
||||
margin-right: 20px;
|
||||
margin-top: 20px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
div.titre {
|
||||
padding: 0.5em 0.5em 0.5em;
|
||||
padding: 5px 5px 5px 5px;
|
||||
margin: 0em 0em 0em 0em;
|
||||
}
|
||||
|
||||
@ -38,7 +38,7 @@ font-size:1.1em;
|
||||
font-weight: bold;
|
||||
background: #dcdcd3;
|
||||
color: #4965B3;
|
||||
padding: 0.5em 0.5em 0.5em;
|
||||
padding: 5px 5px 5px 5px;
|
||||
margin: 0em 0em 0em 0em;
|
||||
border: 1px solid #8CACBB;
|
||||
}
|
||||
@ -55,13 +55,13 @@ border-right: 1px solid #8CACBB;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
div.main {
|
||||
table.main {
|
||||
background: #dcdcd3;
|
||||
text-align: left;
|
||||
border: 1px solid #8CACBB;
|
||||
}
|
||||
|
||||
div.main-inside {
|
||||
table.main-inside {
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
margin-bottom: 40px;
|
||||
|
||||
@ -150,7 +150,7 @@ print $langs->trans("Examples").":<br>";
|
||||
<tr>
|
||||
<td colspan="3" align="center"><h2>
|
||||
<?php echo $langs->trans("DolibarrDatabase"); ?>
|
||||
<h2></td>
|
||||
</h2></td>
|
||||
</tr>
|
||||
<?php
|
||||
if (!isset($dolibarr_main_db_host))
|
||||
|
||||
@ -88,13 +88,17 @@ function pHeader($soutitre,$next,$action='set')
|
||||
print '</head>';
|
||||
print '<body>';
|
||||
print '<span class="titre"><a class="titre" href="index.php">'.$langs->trans("DolibarrSetup").'</a></span>';
|
||||
|
||||
print '<form action="'.$next.'.php" method="POST">';
|
||||
print '<input type="hidden" name="action" value="'.$action.'">';
|
||||
print '<div class="main">';
|
||||
|
||||
print '<table class="main" width="100%"><tr><td>';
|
||||
if ($soutitre) {
|
||||
print '<div class="soustitre">'.$soutitre.'</div>';
|
||||
}
|
||||
print '<div class="main-inside">';
|
||||
|
||||
print '<table class="main-inside" width="100%"><tr><td>';
|
||||
|
||||
}
|
||||
|
||||
function pFooter($nonext=0,$setuplang='')
|
||||
@ -103,7 +107,9 @@ function pFooter($nonext=0,$setuplang='')
|
||||
$langs->load("main");
|
||||
$langs->load("admin");
|
||||
|
||||
print '</div></div>';
|
||||
print '</td></tr></table>';
|
||||
print '</td></tr></table>';
|
||||
|
||||
if (! $nonext)
|
||||
{
|
||||
print '<div class="barrebottom"><input type="submit" value="'.$langs->trans("NextStep").' ->"></div>';
|
||||
@ -112,6 +118,7 @@ function pFooter($nonext=0,$setuplang='')
|
||||
{
|
||||
print '<input type="hidden" name="selectlang" value="'.$setuplang.'">';
|
||||
}
|
||||
|
||||
print '</form>';
|
||||
print '</body>';
|
||||
print '</html>';
|
||||
|
||||
@ -71,6 +71,7 @@ pHeader($langs->trans('DataMigration'),'etape5','upgrade');
|
||||
if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
|
||||
{
|
||||
print '<h2>'.$langs->trans('DataMigration').'</h2>';
|
||||
|
||||
print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
|
||||
|
||||
$conf = new Conf();// on pourrait s'en passer
|
||||
@ -142,7 +143,6 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
|
||||
|
||||
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'
|
||||
@ -159,8 +159,6 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
|
||||
|
||||
migrate_contracts_open($db,$langs,$conf);
|
||||
|
||||
migrate_paiementfourn_facturefourn($db,$langs,$conf);
|
||||
|
||||
migrate_modeles($db,$langs,$conf);
|
||||
|
||||
migrate_price_propal($db,$langs,$conf);
|
||||
@ -169,11 +167,14 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
|
||||
|
||||
migrate_price_facture($db,$langs,$conf);
|
||||
|
||||
migrate_paiementfourn_facturefourn($db,$langs,$conf);
|
||||
|
||||
// On commit dans tous les cas.
|
||||
// La procédure etant conçue pour pouvoir passer plusieurs fois quelquesoit la situation.
|
||||
$db->commit();
|
||||
|
||||
$db->close();
|
||||
|
||||
}
|
||||
|
||||
print '</table>';
|
||||
@ -196,6 +197,8 @@ pFooter($error,$setuplang);
|
||||
*/
|
||||
function migrate_paiements($db,$langs,$conf)
|
||||
{
|
||||
print '<tr><td colspan="4">';
|
||||
|
||||
print '<br>';
|
||||
print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
|
||||
|
||||
@ -258,7 +261,9 @@ function migrate_paiements($db,$langs,$conf)
|
||||
else
|
||||
{
|
||||
print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
|
||||
}
|
||||
}
|
||||
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
|
||||
@ -267,6 +272,8 @@ function migrate_paiements($db,$langs,$conf)
|
||||
*/
|
||||
function migrate_contracts_det($db,$langs,$conf)
|
||||
{
|
||||
print '<tr><td colspan="4">';
|
||||
|
||||
$nberr=0;
|
||||
|
||||
print '<br>';
|
||||
@ -346,7 +353,9 @@ function migrate_contracts_det($db,$langs,$conf)
|
||||
{
|
||||
print $langs->trans('MigrationContractsFieldDontExist')."<br>\n";
|
||||
// dolibarr_print_error($db);
|
||||
}
|
||||
}
|
||||
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
|
||||
@ -355,6 +364,8 @@ function migrate_contracts_det($db,$langs,$conf)
|
||||
*/
|
||||
function migrate_contracts_date1($db,$langs,$conf)
|
||||
{
|
||||
print '<tr><td colspan="4">';
|
||||
|
||||
print '<br>';
|
||||
print '<b>'.$langs->trans('MigrationContractsEmptyDatesUpdate')."</b><br>\n";
|
||||
|
||||
@ -373,6 +384,8 @@ function migrate_contracts_date1($db,$langs,$conf)
|
||||
print $langs->trans('MigrationContractsEmptyCreationDatesUpdateSuccess')."<br>\n";
|
||||
else
|
||||
print $langs->trans('MigrationContractsEmptyCreationDatesNothingToUpdate')."<br>\n";
|
||||
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
|
||||
@ -381,6 +394,8 @@ function migrate_contracts_date1($db,$langs,$conf)
|
||||
*/
|
||||
function migrate_contracts_date2($db,$langs,$conf)
|
||||
{
|
||||
print '<tr><td colspan="4">';
|
||||
|
||||
$nberr=0;
|
||||
|
||||
print '<br>';
|
||||
@ -433,6 +448,8 @@ function migrate_contracts_date2($db,$langs,$conf)
|
||||
{
|
||||
dolibarr_print_error($db);
|
||||
}
|
||||
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
|
||||
@ -441,6 +458,8 @@ function migrate_contracts_date2($db,$langs,$conf)
|
||||
*/
|
||||
function migrate_contracts_date3($db,$langs,$conf)
|
||||
{
|
||||
print '<tr><td colspan="4">';
|
||||
|
||||
print '<br>';
|
||||
print '<b>'.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')."</b><br>\n";
|
||||
|
||||
@ -451,6 +470,8 @@ function migrate_contracts_date3($db,$langs,$conf)
|
||||
print $langs->trans('MigrationContractsIncoherentCreationDateUpdateSuccess')."<br>\n";
|
||||
else
|
||||
print $langs->trans('MigrationContractsIncoherentCreationDateNothingToUpdate')."<br>\n";
|
||||
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
|
||||
@ -459,6 +480,8 @@ function migrate_contracts_date3($db,$langs,$conf)
|
||||
*/
|
||||
function migrate_contracts_open($db,$langs,$conf)
|
||||
{
|
||||
print '<tr><td colspan="4">';
|
||||
|
||||
print '<br>';
|
||||
print '<b>'.$langs->trans('MigrationReopeningContracts')."</b><br>\n";
|
||||
|
||||
@ -501,6 +524,8 @@ function migrate_contracts_open($db,$langs,$conf)
|
||||
}
|
||||
}
|
||||
else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
|
||||
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
|
||||
@ -600,6 +625,8 @@ function migrate_price_facture($db,$langs,$conf)
|
||||
|
||||
dolibarr_install_syslog("Upgrade data for invoice");
|
||||
|
||||
print '<tr><td colspan="4">';
|
||||
|
||||
print '<br>';
|
||||
print '<b>'.$langs->trans('MigrationInvoice')."</b><br>\n";
|
||||
|
||||
@ -686,8 +713,9 @@ function migrate_price_facture($db,$langs,$conf)
|
||||
$db->rollback();
|
||||
}
|
||||
|
||||
print '<br>';
|
||||
print '<br><br>';
|
||||
|
||||
print '</td></tr>';
|
||||
}
|
||||
}
|
||||
|
||||
@ -703,6 +731,8 @@ function migrate_price_propal($db,$langs,$conf)
|
||||
|
||||
dolibarr_install_syslog("Upgrade data for propal");
|
||||
|
||||
print '<tr><td colspan="4">';
|
||||
|
||||
print '<br>';
|
||||
print '<b>'.$langs->trans('MigrationProposal')."</b><br>\n";
|
||||
|
||||
@ -790,6 +820,8 @@ function migrate_price_propal($db,$langs,$conf)
|
||||
}
|
||||
|
||||
print '<br>';
|
||||
|
||||
print '</td></tr>';
|
||||
}
|
||||
}
|
||||
|
||||
@ -805,6 +837,8 @@ function migrate_price_commande($db,$langs,$conf)
|
||||
|
||||
dolibarr_install_syslog("Upgrade data for order");
|
||||
|
||||
print '<tr><td colspan="4">';
|
||||
|
||||
print '<br>';
|
||||
print '<b>'.$langs->trans('MigrationOrder')."</b><br>\n";
|
||||
|
||||
@ -899,6 +933,8 @@ function migrate_price_commande($db,$langs,$conf)
|
||||
}
|
||||
|
||||
print '<br>';
|
||||
|
||||
print '</td></tr>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -36,8 +36,8 @@ create table llx_facture
|
||||
remise_absolue real DEFAULT 0, -- remise absolue
|
||||
remise real DEFAULT 0, -- remise totale calculee
|
||||
|
||||
close_code varchar(12) after remise; -- Code motif cloture sans paiement complet
|
||||
close_note varchar(128) after close_code; -- Commentaire cloture sans paiement complet
|
||||
close_code varchar(12), -- Code motif cloture sans paiement complet
|
||||
close_note varchar(128), -- Commentaire cloture sans paiement complet
|
||||
|
||||
tva real DEFAULT 0, -- montant tva apres remise totale
|
||||
total real DEFAULT 0, -- montant total ht apres remise totale
|
||||
|
||||
Loading…
Reference in New Issue
Block a user