suite de l'adaptation a postgresql

htdocs/admin/system/index.php

@@ -36,6 +36,7 @@
 //session_register("fix_left_menu");
 
 require("./pre.inc.php");
+include_once $dolibarr_main_document_root."/lib/${dolibarr_main_db_type}.lib.php";
 //include_once("../../allpre.inc.php");
 
 $langs->load("admin");
@@ -89,12 +90,17 @@ print "<br>\n";
 
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Database")."</td></tr>\n";
+if($dolibarr_main_db_type == "mysql")
+{
 $sql = "SHOW VARIABLES LIKE 'version'";
+}
+
 $result = $db->query($sql);
 if ($result)  
 {
   $row = $db->fetch_row();
 }
+
 print "<tr $bc[0]><td>".$langs->trans("Version")."</td><td>" . $row[1] . "</td></tr>\n";
 print "<tr $bc[1]><td width=\"240\">".$langs->trans("Type")."</td><td>" . $conf->db->type . "</td></tr>\n";
 print "<tr $bc[0]><td>".$langs->trans("Host")."</td><td>" . $conf->db->host . "</td></tr>\n";

htdocs/facture.class.php

@@ -757,9 +757,16 @@ class Facture
 		{
 		  foreach ($tvas as $key => $value)
 		    {
-		      $sql = "REPLACE INTO ".MAIN_DB_PREFIX."facture_tva_sum SET fk_facture=".$this->id;
+				
-		      $sql .= ", amount = '".$tvas[$key]."'";
+$sql_del = "delete from ".MAIN_DB_PREFIX."facture_tva_sum where fk_facture =$this->id;";
-		      $sql .= ", tva_tx='".$key."'";
+$this->db->query($sql_del);
+		
+$sql = "insert into ".MAIN_DB_PREFIX."facture_tva_sum (fk_facture,amount,tva_tx) 
+		values ($this->id,'".$tvas[$key]."','".$key."');";
+		
+		    //  $sql = "REPLACE INTO ".MAIN_DB_PREFIX."facture_tva_sum SET fk_facture=".$this->id;
+//		      $sql .= ", amount = '".$tvas[$key]."'";
+	//	      $sql .= ", tva_tx='".$key."'";
 		      
 		      if (! $this->db->query($sql) )
 			{

htdocs/includes/modules/modAdherent.class.php

@@ -114,6 +114,7 @@ class modAdherent extends DolibarrModules
     /*
      * Permissions
      */
+		 $this->remove();
     $sql = array(
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (70,'Tous les droits sur les adherents','adherent','a',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (71,'Lire les fiche adherents','adherent','r',1);",

htdocs/includes/modules/modBanque.class.php

@@ -74,6 +74,7 @@ class modBanque extends DolibarrModules
     /*
      * Permissions
      */    
+		 $this->remove();
     $sql = array(
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (110,'Tous les droits sur les comptes bancaires','banque','a',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (111,'Lire les comptes','banque','r',1);",

htdocs/includes/modules/modCaisse.class.php

@@ -73,6 +73,7 @@ class modCaisse extends DolibarrModules
     /*
      * Permissions
      */    
+		 $this->remove();
     $sql = array(
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (130,'Tous les droits sur les caisses','caisse','a',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (131,'Lire les caisses liquide','caisse','r',1);",

htdocs/includes/modules/modCommande.class.php

@@ -79,6 +79,7 @@ class modCommande extends DolibarrModules
     /*
      * Permissions
      */
+		 $this->remove();
     $sql = array(
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (80,'Tous les droits sur les commandes','commande','a',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (81,'Lire les commandes','commande','r',1);",

htdocs/includes/modules/modComptabilite.class.php

@@ -77,6 +77,7 @@ class modComptabilite extends DolibarrModules
     /*
      * Permissions
      */    
+		 $this->remove();
     $sql = array(
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (90,'Tous les droits sur la compta','compta','a',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (91,'Lire les charges','compta','r',1);",

htdocs/includes/modules/modExpedition.class.php

@@ -77,6 +77,7 @@ class modExpedition extends DolibarrModules
     /*
      * Permissions
      */
+		 $this->remove();
     $sql = array(
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (100,'Tous les droits sur les expeditions','expedition','a',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (101,'Lire les expeditions','expedition','r',1);",

htdocs/includes/modules/modFacture.class.php

@@ -118,6 +118,7 @@ class modFacture extends DolibarrModules
     */
   function init()
   {
+	  $this->remove();
     $sql = array(
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (10,'Tous les droits sur les factures','facture','a',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (11,'Lire les factures','facture','r',1);",

htdocs/includes/modules/modFicheinter.class.php

@@ -81,6 +81,7 @@ class modFicheinter  extends DolibarrModules
     /*
      * Permissions
      */
+		 $this->remove();
     $sql = array(
 		 "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (60,'Tous les droits sur les fiches d\'intervention','ficheinter','a',0);",
 		 "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (61,'Lire les fiches d\'intervention','ficheinter','r',1);",

htdocs/includes/modules/modProduit.class.php

@@ -79,7 +79,7 @@ class modProduit extends DolibarrModules
     /*
      * Permissions
      */
-
+		$this->remove();
     $sql = array(
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (30,'Tous les droits sur les produits/services','produit','a',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (31,'Lire les produits/services','produit','r',1);",

htdocs/includes/modules/modProjet.class.php

@@ -77,6 +77,7 @@ class modProjet extends DolibarrModules
     /*
      * Permissions
      */
+		 $this->remove();
     $sql = array(
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (40,'Tous les droits sur les projets','projet','a',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (41,'Lire les projets','projet','r',1);",

htdocs/includes/modules/modPropale.class.php

@@ -95,6 +95,7 @@ class modPropale extends DolibarrModules
     /*
      * Permissions et valeurs par défaut
      */
+		 $this->remove();
     $sql = array(
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (20,'Tous les droits sur les propositions commerciales','propale','a',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (21,'Lire les propositions commerciales','propale','r',1);",
@@ -103,7 +104,9 @@ class modPropale extends DolibarrModules
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (25,'Envoyer les propositions commerciales aux clients','propale','d',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (26,'Clôturer les propositions commerciales','propale','d',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (27,'Supprimer les propositions commerciales','propale','d',0);",
-		 "REPLACE INTO ".MAIN_DB_PREFIX."propal_model_pdf SET nom = '".$this->const[0][2]."'",
+		 "delete from ".MAIN_DB_PREFIX."propal_model_pdf where nom = '".$this->const[0][2]."'",
+		 "insert INTO ".MAIN_DB_PREFIX."propal_model_pdf (nom) 
+		 values('".$this->const[0][2]."');",
 		 );
     //"insert into ".MAIN_DB_PREFIX."rights_def values (23,'Modifier les propositions commerciales d\'autrui','propale','m',0);",
     

htdocs/includes/modules/modService.class.php

@@ -80,7 +80,7 @@ class modService extends DolibarrModules
     /*
      * Permissions
      */
-
+		$this->remove();
     $sql = array(
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (30,'Tous les droits sur les produits/services','produit','a',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (31,'Lire les produits/services','produit','r',1);",

htdocs/includes/modules/modSociete.class.php

@@ -73,6 +73,7 @@ class modSociete extends DolibarrModules
     /*
      * Permissions
      */
+		 $this->remove();
     $sql = array(
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (120,'Tous les droits sur les sociétés','societe','a',0);",
 		 "insert into ".MAIN_DB_PREFIX."rights_def values (121,'Lire les societes','societe','r',1);",