diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index dcaaf87eda6..15f33a00180 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -264,7 +264,7 @@ if ($conf->facture->enabled) { $sql .= " AND f.fk_soc = $socidp"; } - $sql .= " GROUP BY f.facnumber"; + $sql .= " GROUP BY f.facnumber,f.rowid,s.nom, s.idp, f.total_ttc"; if ( $db->query($sql) ) { diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index f91746990f0..323c1bc806e 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -51,8 +51,11 @@ class DolibarrModules { // Insère les constantes $err = 0; - - $sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '".$this->const_name."', value='1', visible = 0"; + $sql_del = "delete from ".MAIN_DB_PREFIX."const where name = '".$this->const_name."';"; + $this->db->query($sql_del); + $sql ="insert into ".MAIN_DB_PREFIX."const (name,value,visible) values + ('".$this->const_name."','1',0);"; + //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '".$this->const_name."', value='1', visible = 0"; if (!$this->db->query($sql)) { @@ -101,16 +104,16 @@ class DolibarrModules if ($row[0] == 0) { - // Si non trouve + // Si non trouve // '$visible' if (strlen($note)){ - $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible) VALUES ('$name','$type','$val','$note','$visible')"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible) VALUES ('$name','$type','$val','$note',0);"; }elseif (strlen($val)) { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,visible) VALUES ('$name','$type','$val','$visible')"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,visible) VALUES ('$name','$type','$val',0);"; } else { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,visible) VALUES ('$name','$type','$visible')"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,visible) VALUES ('$name','$type',0);"; } if (! $this->db->query($sql) )