lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Permet le passage de requete de nettoyage depandante de la version de la base

Browse Source
This commit is contained in:
Laurent Destailleur 2005-12-03 17:50:57 +00:00
parent 58b189d0d1
commit 542494344b
6 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/install/etape2.php
View File

@ -108,7 +108,15 @@ if ($_POST["action"] == "set")
}
/***************************************************************************************
// Affiche version
if ($ok)
{
$version=$db->getVersion();
print '<tr><td>';
print $langs->trans("DatabaseVersion").'</td><td>'.$version.'</td></tr>';
}
/**************************************************************************************
*
* Chargement fichiers tables/*.sql (non *.key.sql)
* A faire avant les fichiers *.key.sql
@ -175,7 +183,7 @@ if ($_POST["action"] == "set")
}
}
/***************************************************************************************
*
* Chargement fichiers tables/*.key.sql
@ -203,10 +211,19 @@ if ($_POST["action"] == "set")
while (!feof ($fp))
{
$buf = fgets($fp, 4096);
if (substr($buf, 0, 2) <> '--')
// Cas special de lignes autorisees pour certaines versions uniquement
if (eregi('^-- V([0-9]+)',$buf,$reg))
{
$buffer .= $buf;
if ($reg[1] && $reg[1] <= $version)
{
$buf=eregi_replace('^-- V([0-9]+)','',$buf);
//print $buf.'<br>';
}
}
// Ajout ligne si non commentaire
if (! eregi('^--',$buf)) $buffer .= $buf;
}
fclose($fp);
}
@ -260,7 +277,7 @@ if ($_POST["action"] == "set")
if ($ok)
{
// Droits sur les tables
$grant_query=$db->getGrantForUser($dolibarr_main_db_user);
$grant_query=$db->getGrantForUserQuery($dolibarr_main_db_user);
if ($grant_query) // Seules les bases qui en ont besoin le definisse
{

1
htdocs/langs/en_US/bills.lang
View File

@ -11,6 +11,7 @@ BillsStatistics=Invoices statistics
CardBill=Invoice card
SupplierBill=Supplier invoice
SupplierBills=suppliers invoices
BillContacts=Invoice contacts
Payment=Payment
Payments=Payments
ReceivedPayments=Received payments

3
htdocs/langs/en_US/install.lang
View File

@ -77,4 +77,5 @@ InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
NotAvailable=Not available
YouMustCreateWithPermission=You must create file %s and set write permissions on it for web server during install process.
CorrectProblemAndReloadPage=Correct problem and <a href="index.php">reload page</a> (Press F5 key).
AlreadyDone=Already migrated
AlreadyDone=Already migrated
DatabaseVersion=Database version

1
htdocs/langs/fr_FR/bills.lang
View File

@ -11,6 +11,7 @@ BillsStatistics=Statistiques factures
CardBill=Fiche facture
SupplierBill=Facture fournisseur
SupplierBills=Factures fournisseurs
BillContacts=Contacts facture
Payment=Paiement
Payments=Paiements
ReceivedPayments=Paiements reçus

3
htdocs/langs/fr_FR/install.lang
View File

@ -77,4 +77,5 @@ InstallNotAllowed=Installation non autoris
NotAvailable=Non disponible
YouMustCreateWithPermission=Vous devez créer un fichier %s et donner les droits d'écriture dans celui-ci au serveur web durant le processus d'installation.
CorrectProblemAndReloadPage=Corrigez le problème et <a href="index.php">rechargez la page</a> (Touche F5).
AlreadyDone=Déjà migré
AlreadyDone=Déjà migré
DatabaseVersion=Version de la base

1
mysql/tables/llx_contrat.key.sql
View File

@ -23,6 +23,7 @@
-- Supprimme orhpelins pour permettre montée de la clé
-- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.idp WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.idp IS NULL;
-- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.idp WHERE llx_societe.idp IS NULL;
-- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL;