From 542494344bf75051f944c3c83769d9d78128a64b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 3 Dec 2005 17:50:57 +0000
Subject: [PATCH] Permet le passage de requete de nettoyage depandante de la
 version de la base

---
 htdocs/install/etape2.php        | 27 ++++++++++++++++++++++-----
 htdocs/langs/en_US/bills.lang    |  1 +
 htdocs/langs/en_US/install.lang  |  3 ++-
 htdocs/langs/fr_FR/bills.lang    |  1 +
 htdocs/langs/fr_FR/install.lang  |  3 ++-
 mysql/tables/llx_contrat.key.sql |  1 +
 6 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index dd30b52cfae..eaff3897738 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -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
         {
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 21f702202ba..9fb00f33a08 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -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
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 5e8c15353fa..e80be8cf9dd 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -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
\ No newline at end of file
+AlreadyDone=Already migrated
+DatabaseVersion=Database version
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index c6031bb84aa..4d38a324b7c 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -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
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 34cdb62116f..e4fe175a2fb 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -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é
\ No newline at end of file
+AlreadyDone=Déjà migré
+DatabaseVersion=Version de la base
\ No newline at end of file
diff --git a/mysql/tables/llx_contrat.key.sql b/mysql/tables/llx_contrat.key.sql
index e1a0e6dadf7..575b468ceac 100644
--- a/mysql/tables/llx_contrat.key.sql
+++ b/mysql/tables/llx_contrat.key.sql
@@ -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;