diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index c9da4aa7c63..ec88ba51c19 100644 --- a/htdocs/admin/system/index.php +++ b/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 "
\n"; print ''; print "\n"; +if($dolibarr_main_db_type == "mysql") +{ $sql = "SHOW VARIABLES LIKE 'version'"; +} + $result = $db->query($sql); if ($result) { $row = $db->fetch_row(); } + print "\n"; print "\n"; print "\n"; diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index c05019a2628..166c4291895 100644 --- a/htdocs/facture.class.php +++ b/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 .= ", tva_tx='".$key."'"; + +$sql_del = "delete from ".MAIN_DB_PREFIX."facture_tva_sum where fk_facture =$this->id;"; +$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) ) { diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php index 7e382c450db..99bdc3c8f83 100644 --- a/htdocs/includes/modules/modAdherent.class.php +++ b/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);", diff --git a/htdocs/includes/modules/modBanque.class.php b/htdocs/includes/modules/modBanque.class.php index 941c3f1161b..cc534ea25b9 100644 --- a/htdocs/includes/modules/modBanque.class.php +++ b/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);", diff --git a/htdocs/includes/modules/modBoutique.class.php b/htdocs/includes/modules/modBoutique.class.php index bb005e7ff6c..74de324fdef 100644 --- a/htdocs/includes/modules/modBoutique.class.php +++ b/htdocs/includes/modules/modBoutique.class.php @@ -83,7 +83,7 @@ class modBoutique extends DolibarrModules */ $sql = array(); - + return $this->_init($sql); } /* diff --git a/htdocs/includes/modules/modCaisse.class.php b/htdocs/includes/modules/modCaisse.class.php index efc4b05f5b1..586eb8fd73a 100644 --- a/htdocs/includes/modules/modCaisse.class.php +++ b/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);", diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/includes/modules/modCommande.class.php index 03b13a4ffc6..dc525eca16b 100644 --- a/htdocs/includes/modules/modCommande.class.php +++ b/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);", diff --git a/htdocs/includes/modules/modComptabilite.class.php b/htdocs/includes/modules/modComptabilite.class.php index 5206d7e5939..32c30debec9 100644 --- a/htdocs/includes/modules/modComptabilite.class.php +++ b/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);", diff --git a/htdocs/includes/modules/modContrat.class.php b/htdocs/includes/modules/modContrat.class.php index 975b492fa6e..53b6f4076a4 100644 --- a/htdocs/includes/modules/modContrat.class.php +++ b/htdocs/includes/modules/modContrat.class.php @@ -77,7 +77,7 @@ class modContrat extends DolibarrModules $sql = array( ); - + return $this->_init($sql); } /* diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/includes/modules/modExpedition.class.php index c241126f1d5..da81cf5f119 100644 --- a/htdocs/includes/modules/modExpedition.class.php +++ b/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);", diff --git a/htdocs/includes/modules/modExternalRss.class.php b/htdocs/includes/modules/modExternalRss.class.php index e82e87d18f6..39100213e85 100644 --- a/htdocs/includes/modules/modExternalRss.class.php +++ b/htdocs/includes/modules/modExternalRss.class.php @@ -85,7 +85,7 @@ class modExternalRss extends DolibarrModules */ $sql = array(); - + return $this->_init($sql); } /* diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php index 9fe508db904..208a4c48fc9 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/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);", diff --git a/htdocs/includes/modules/modFicheinter.class.php b/htdocs/includes/modules/modFicheinter.class.php index 91b7fe4961c..b5a9f462e29 100644 --- a/htdocs/includes/modules/modFicheinter.class.php +++ b/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);", diff --git a/htdocs/includes/modules/modFournisseur.class.php b/htdocs/includes/modules/modFournisseur.class.php index a30c59fb5a7..c1c554173c9 100644 --- a/htdocs/includes/modules/modFournisseur.class.php +++ b/htdocs/includes/modules/modFournisseur.class.php @@ -78,7 +78,7 @@ class modFournisseur extends DolibarrModules * Permissions */ $sql = array(); - + return $this->_init($sql); } /** suppression du module diff --git a/htdocs/includes/modules/modLdap.class.php b/htdocs/includes/modules/modLdap.class.php index b94874affb2..48d965cd2f9 100644 --- a/htdocs/includes/modules/modLdap.class.php +++ b/htdocs/includes/modules/modLdap.class.php @@ -77,7 +77,7 @@ class modLdap extends DolibarrModules $sql = array( ); - + return $this->_init($sql); } /* diff --git a/htdocs/includes/modules/modProduit.class.php b/htdocs/includes/modules/modProduit.class.php index c0c7a9ed169..915d21f0d24 100644 --- a/htdocs/includes/modules/modProduit.class.php +++ b/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);", diff --git a/htdocs/includes/modules/modProjet.class.php b/htdocs/includes/modules/modProjet.class.php index 91593013d9b..1bb5f2386a2 100644 --- a/htdocs/includes/modules/modProjet.class.php +++ b/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);", diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/includes/modules/modPropale.class.php index 22e2a7901c7..d461aa33c9a 100644 --- a/htdocs/includes/modules/modPropale.class.php +++ b/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);", diff --git a/htdocs/includes/modules/modService.class.php b/htdocs/includes/modules/modService.class.php index 0b752be8105..50be337fee0 100644 --- a/htdocs/includes/modules/modService.class.php +++ b/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);", diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php index 3cb98e87ae3..46db860d33c 100644 --- a/htdocs/includes/modules/modSociete.class.php +++ b/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);",
".$langs->trans("Database")."
".$langs->trans("Version")."" . $row[1] . "
".$langs->trans("Type")."" . $conf->db->type . "
".$langs->trans("Host")."" . $conf->db->host . "