diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 05f47a98069..102f03d9a72 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -149,9 +149,10 @@ class AdherentType extends CommonObject $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type WHERE rowid = $rowid"; - if ( $this->db->query( $sql) ) + $resql=$this->db->query($sql); + if ($resql) { - if ( $this->db->affected_rows() ) + if ( $this->db->affected_rows($resql) ) { return 1; } diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index fae5657155f..682c5d4808d 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -759,10 +759,9 @@ class Account extends CommonObject $sql.= " WHERE rowid = ".$rowid; $result = $this->db->query($sql); - if ($result) { - if ($this->db->affected_rows()) + if ($this->db->affected_rows($result)) { return 1; } @@ -784,10 +783,9 @@ class Account extends CommonObject $sql.= " WHERE rowid = ".$rowid; $result = $this->db->query($sql); - if ($result) { - if ($this->db->affected_rows()) + if ($this->db->affected_rows($result)) { return 1; } diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index 704c91af48c..b9ba4bdb52b 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -401,9 +401,10 @@ class Don extends CommonObject $sql = "DELETE FROM ".MAIN_DB_PREFIX."don WHERE rowid = $rowid AND fk_statut = 0;"; - if ( $this->db->query( $sql) ) + $resql=$this->db->query($sql); + if ($resql) { - if ( $this->db->affected_rows() ) + if ( $this->db->affected_rows($resql) ) { return 1; } @@ -486,9 +487,10 @@ class Don extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 1, fk_user_valid = $userid WHERE rowid = $rowid AND fk_statut = 0;"; - if ( $this->db->query( $sql) ) + $resql=$this->db->query($sql); + if ($resql) { - if ( $this->db->affected_rows() ) + if ( $this->db->affected_rows($resql) ) { return 1; } @@ -519,9 +521,10 @@ class Don extends CommonObject } $sql .= " WHERE rowid = $rowid AND fk_statut = 1;"; - if ( $this->db->query( $sql) ) + $resql=$this->db->query($sql); + if ($resql) { - if ( $this->db->affected_rows() ) + if ($this->db->affected_rows($resql)) { return 1; } @@ -548,9 +551,10 @@ class Don extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 3 WHERE rowid = $rowid AND fk_statut = 2;"; - if ( $this->db->query( $sql) ) + $resql=$this->db->query($sql); + if ($resql) { - if ( $this->db->affected_rows() ) + if ( $this->db->affected_rows($resql) ) { return 1; } diff --git a/htdocs/compta/prelevement/class/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejet-prelevement.class.php index 02ad1361120..c619c51345d 100644 --- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php +++ b/htdocs/compta/prelevement/class/rejet-prelevement.class.php @@ -261,22 +261,22 @@ class RejetPrelevement $sql.= " AND pf.fk_facture = f.rowid"; $sql.= " AND f.entity = ".$conf->entity; - $result=$this->db->query($sql); - if ($result) + $resql=$this->db->query($sql); + if ($resql) { - $num = $this->db->num_rows(); + $num = $this->db->num_rows($resql); if ($num) - { - $i = 0; - while ($i < $num) - { - $row = $this->db->fetch_row(); - $arr[$i] = $row[0]; - $i++; - } - } - $this->db->free(); + { + $i = 0; + while ($i < $num) + { + $row = $this->db->fetch_row($resql); + $arr[$i] = $row[0]; + $i++; + } + } + $this->db->free($resql); } else { @@ -304,22 +304,22 @@ class RejetPrelevement if ($resql) { if ($this->db->num_rows($resql)) - { - $obj = $this->db->fetch_object($resql); + { + $obj = $this->db->fetch_object($resql); - $this->id = $rowid; - $this->date_rejet = $this->db->jdate($obj->dr); - $this->motif = $this->motifs[$obj->motif]; + $this->id = $rowid; + $this->date_rejet = $this->db->jdate($obj->dr); + $this->motif = $this->motifs[$obj->motif]; - $this->db->free($resql); + $this->db->free($resql); - return 0; - } - else - { - dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid numrows=0"); - return -1; - } + return 0; + } + else + { + dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid numrows=0"); + return -1; + } } else { diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 039b8edd584..637b52039ee 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -23,7 +23,7 @@ * \file htdocs/compta/prelevement/stats.php * \brief Page de stats des prelevements * \version $Id$ -*/ + */ require('../../main.inc.php'); @@ -52,17 +52,18 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s"; $sql.= " WHERE pl.fk_soc = s.rowid"; $sql.= " AND s.entity = ".$conf->entity; -if ($db->query($sql)) +$resql=$db->query($sql); +if ($resql) { - $num = $db->num_rows(); - $i = 0; + $num = $db->num_rows($resql); + $i = 0; - if ( $num >0 ) - { - $row = $db->fetch_row(); - $total = $row[0]; - $nbtotal = $row[1]; - } + if ( $num >0 ) + { + $row = $db->fetch_row($resql); + $total = $row[0]; + $nbtotal = $row[1]; + } } /* @@ -76,59 +77,60 @@ $sql.= " WHERE pl.fk_soc = s.rowid"; $sql.= " AND s.entity = ".$conf->entity; $sql.= " GROUP BY pl.statut"; -if ($db->query($sql)) +$resql=$db->query($sql); +if ($resql) { - $num = $db->num_rows(); - $i = 0; + $num = $db->num_rows($resql); + $i = 0; - print"\n\n"; - print ''; - print ''; - print ''; - print ''; + print"\n\n"; + print '
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
'; + print ''; + print ''; + print ''; - $var=True; + $var=True; - $st[0] = $langs->trans("StatusWaiting"); - $st[1] = $langs->trans("StatusWaiting"); - $st[2] = $langs->trans("StatusCredited"); - $st[3] = $langs->trans("StatusRefused"); + $st[0] = $langs->trans("StatusWaiting"); + $st[1] = $langs->trans("StatusWaiting"); + $st[2] = $langs->trans("StatusCredited"); + $st[3] = $langs->trans("StatusRefused"); - while ($i < $num) - { - $row = $db->fetch_row(); + while ($i < $num) + { + $row = $db->fetch_row($resql); - print "'; + print ''; - $var=!$var; - $i++; - } + $var=!$var; + $i++; + } - print ''; - print ''; - print "
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
"; + print "
"; - print $st[$row[2]]; - print ''; - print $row[1]; + print $st[$row[2]]; + print ''; + print $row[1]; - print ''; - print round($row[1]/$nbtotal*100,2)." %"; + print ''; + print round($row[1]/$nbtotal*100,2)." %"; - print ''; + print ''; - print price($row[0]); + print price($row[0]); - print ''; - print round($row[0]/$total*100,2)." %"; - print '
'; + print round($row[0]/$total*100,2)." %"; + print '
'.$langs->trans("Total").''.$nbtotal.' '; - print price($total); - print ' 
"; - $db->free(); + print ''.$langs->trans("Total").''; + print ''.$nbtotal.' '; + print price($total); + print ' '; + print ""; + $db->free(); } else { - dol_print_error($db); + dol_print_error($db); } @@ -147,17 +149,18 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s"; $sql.= " WHERE pl.fk_soc = s.rowid"; $sql.= " AND s.entity = ".$conf->entity; $sql.= " WHERE pl.statut = 3"; -if ($db->query($sql)) +$resql=$db->query($sql); +if ($resql) { - $num = $db->num_rows(); - $i = 0; + $num = $db->num_rows($resql); + $i = 0; - if ( $num > 0 ) - { - $row = $db->fetch_row(); - $total = $row[0]; - $nbtotal = $row[1]; - } + if ( $num > 0 ) + { + $row = $db->fetch_row($resql); + $total = $row[0]; + $nbtotal = $row[1]; + } } /* @@ -175,57 +178,58 @@ $sql.= " AND pr.fk_prelevement_lignes = pl.rowid"; $sql.= " GROUP BY pr.motif"; $sql.= " ORDER BY cc DESC"; -if ($db->query($sql)) +$resql=$db->query($sql); +if ($resql) { - $num = $db->num_rows(); - $i = 0; + $num = $db->num_rows($resql); + $i = 0; - print"\n\n"; - print ''; - print ''; - print ''; - print ''; + print"\n\n"; + print '
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
'; + print ''; + print ''; + print ''; - $var=True; + $var=True; - require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"; - $Rejet = new RejetPrelevement($db, $user); + require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"; + $Rejet = new RejetPrelevement($db, $user); - while ($i < $num) - { - $row = $db->fetch_row(); + while ($i < $num) + { + $row = $db->fetch_row($resql); - print "'; + print ''; - $var=!$var; - $i++; - } + $var=!$var; + $i++; + } - print ''; - print ''; - print "
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
"; - print $Rejet->motifs[$row[2]]; + print "
"; + print $Rejet->motifs[$row[2]]; - print ''.$row[1]; + print ''.$row[1]; - print ''; - print round($row[1]/$nbtotal*100,2)." %"; + print ''; + print round($row[1]/$nbtotal*100,2)." %"; - print ''; - print price($row[0]); + print ''; + print price($row[0]); - print ''; - print round($row[0]/$total*100,2)." %"; + print ''; + print round($row[0]/$total*100,2)." %"; - print '
'.$langs->trans("Total").''.$nbtotal.' '; - print price($total); - print ' 
"; - $db->free(); + print ''.$langs->trans("Total").''.$nbtotal.''; + print ' '; + print price($total); + print ' '; + print ""; + $db->free(); } else { - dol_print_error($db); + dol_print_error($db); } diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php index 01466ba8ea7..cea327c9b49 100644 --- a/htdocs/fourn/class/fournisseur.class.php +++ b/htdocs/fourn/class/fournisseur.class.php @@ -65,15 +65,14 @@ class Fournisseur extends Societe $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf"; $sql .= " WHERE cf.fk_soc = ".$this->id; - $result = $this->db->query($sql) ; - - if ( $result ) + $resql = $this->db->query($sql); + if ($resql) { - $num = $this->db->num_rows(); + $num = $this->db->num_rows($resql); if ($num == 1) { - $row = $this->db->fetch_row(); + $row = $this->db->fetch_row($resql); $this->single_open_commande = $row[0]; } diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index bd93074b9c4..f904a63c0ac 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -50,9 +50,9 @@ class CommandeFournisseur extends Commande var $ref; var $brouillon; var $statut; // 0=Draft -> 1=Validated -> 2=Approved -> 3=Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially - // -> 7=Canceled/Never received -> (reopen) 3=Process runing - // -> 6=Canceled -> (reopen) 2=Approved - // -> 9=Refused -> (reopen) 1=Validated + // -> 7=Canceled/Never received -> (reopen) 3=Process runing + // -> 6=Canceled -> (reopen) 2=Approved + // -> 9=Refused -> (reopen) 1=Validated /** \brief Constructeur @@ -1079,20 +1079,21 @@ class CommandeFournisseur extends Commande $sql.= " FROM ".MAIN_DB_PREFIX."c_methode_commande_fournisseur"; $sql.= " WHERE active = 1"; - if ($this->db->query($sql)) + $resql=$this->db->query($sql); + if ($resql) { $i = 0; $num = $this->db->num_rows(); $this->methodes_commande = array(); while ($i < $num) - { - $row = $this->db->fetch_row(); + { + $row = $this->db->fetch_row($resql); - $this->methodes_commande[$row[0]] = $row[1]; + $this->methodes_commande[$row[0]] = $row[1]; - $i++; - } - return 0; + $i++; + } + return 0; } else { diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 444484d81c6..9836594f38f 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -391,7 +391,7 @@ class ProductFournisseur extends Product $result = $this->db->query($sql) ; if ($result) { - $result = $this->db->fetch_array(); + $result = $this->db->fetch_array($result); $this->ref_fourn = $result["ref_fourn"]; $this->product_fourn_id = $result["rowid"]; return 1; diff --git a/htdocs/includes/modules/modFournisseur.class.php b/htdocs/includes/modules/modFournisseur.class.php index e499f618517..3fb3c954f74 100644 --- a/htdocs/includes/modules/modFournisseur.class.php +++ b/htdocs/includes/modules/modFournisseur.class.php @@ -288,13 +288,14 @@ class modFournisseur extends DolibarrModules { $sql = "SELECT count(rowid) FROM ".MAIN_DB_PREFIX."c_methode_commande_fournisseur"; - if ($this->db->query($sql)) + $resql=$this->db->query($sql); + if ($resql) { - $row = $this->db->fetch_row(); + $row = $this->db->fetch_row($resql); if ($row[0] == 0) { - $this->db->free(); + $this->db->free($resql); $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_methode_commande_fournisseur"; $sql .= " (code,libelle) VALUES ('OrderByMail','Courrier')"; diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php index 17316766e02..80ce179621f 100644 --- a/htdocs/lib/databases/mssql.lib.php +++ b/htdocs/lib/databases/mssql.lib.php @@ -452,7 +452,7 @@ class DoliDb \param resultset Curseur de la requete voulue \return int Nombre de lignes */ - function affected_rows($resultset=0) + function affected_rows($resultset) { // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion if (! is_resource($resultset)) { $resultset=$this->results; } diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php index ae9290486a7..4c8d16d6a28 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.lib.php @@ -447,7 +447,7 @@ class DoliDb * \param resultset Curseur de la requete voulue * \return int Nombre de lignes */ - function affected_rows($resultset=0) + function affected_rows($resultset) { // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion if (! is_resource($resultset)) { $resultset=$this->results; } diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index e1387478369..be906a4d88d 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.php @@ -461,7 +461,7 @@ class DoliDb * \return int Nombre de lignes */ - function affected_rows($resultset=0) + function affected_rows($resultset) { // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion if (! is_object($resultset)) { $resultset=$this->results; } diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php index 87cc48bb55c..dd880069b21 100644 --- a/htdocs/lib/databases/pgsql.lib.php +++ b/htdocs/lib/databases/pgsql.lib.php @@ -541,7 +541,7 @@ class DoliDb * \param resultset Curseur de la requete voulue * \return int Nombre de lignes */ - function affected_rows($resultset=0) + function affected_rows($resultset) { // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion if (! is_resource($resultset)) { $resultset=$this->results; } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index b71638b4e2a..e25f35a66a0 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -972,7 +972,7 @@ class Product extends CommonObject $result = $this->db->query($sql); if ( $result ) { - $result = $this->db->fetch_array(); + $result = $this->db->fetch_array($result); $this->id = $result["rowid"]; $this->ref = $result["ref"]; diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php index 6d6d10ea92f..f05779bb64e 100644 --- a/htdocs/societe/class/client.class.php +++ b/htdocs/societe/class/client.class.php @@ -58,15 +58,15 @@ class Client extends Societe $sql .= " WHERE f.fk_soc = ".$this->id; $sql .= " ORDER BY datef DESC"; - $result = $this->db->query($sql) ; $i = 0; - if ( $result ) + $resql = $this->db->query($sql); + if ($resql) { - $num = $this->db->num_rows(); + $num = $this->db->num_rows($resql); while ($i < $num ) { - $row = $this->db->fetch_row(); + $row = $this->db->fetch_row($resql); $this->factures[$i][0] = $row[0]; $this->factures[$i][1] = $row[1]; diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index d670b575f75..366e88cc825 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -67,9 +67,10 @@ class CompanyBankAccount function create() { $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec) values ($this->socid, ".$this->db->idate(mktime()).")"; - if ($this->db->query($sql)) + $resql=$this->db->query($sql); + if ($resql) { - if ($this->db->affected_rows()) + if ($this->db->affected_rows($resql)) { return 1; } diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 44e8344a21a..0f2a7d5b9e8 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -408,13 +408,14 @@ class UserGroup extends CommonObject $sql.= " AND r.entity = ".$conf->entity; $sql.= " AND u.fk_usergroup = ".$this->id; $sql.= " AND r.perms IS NOT NULL"; - if ($this->db->query($sql)) + $resql=$this->db->query($sql); + if ($resql) { - $num = $this->db->num_rows(); + $num = $this->db->num_rows($resql); $i = 0; while ($i < $num) { - $row = $this->db->fetch_row(); + $row = $this->db->fetch_row($resql); if (strlen($row[1]) > 0) {