";
print '';
@@ -275,9 +277,10 @@ if ($conf->commande->enabled)
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " ORDER BY c.rowid DESC";
- if ( $db->query($sql) )
+ $resql=$db->query($sql);
+ if ($resql)
{
- $num = $db->num_rows();
+ $num = $db->num_rows($resql);
print '';
print '';
@@ -290,7 +293,7 @@ if ($conf->commande->enabled)
while ($i < $num)
{
$var=!$var;
- $obj = $db->fetch_object();
+ $obj = $db->fetch_object($resql);
print " ";
print '| ';
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 9dfb79ec921..2178009a904 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -79,9 +79,10 @@ if ($mode == 'search') {
$sql.= " AND s.entity = ".$conf->entity;
}
- if ( $db->query($sql) ) {
- if ( $db->num_rows() == 1) {
- $obj = $db->fetch_object();
+ $resql=$db->query($sql);
+ if ($resql) {
+ if ( $db->num_rows($resql) == 1) {
+ $obj = $db->fetch_object($resql);
$socid = $obj->rowid;
}
$db->free();
@@ -143,10 +144,10 @@ if ($socid)
$sql.= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
-$result = $db->query($sql);
-if ($result)
+$resql = $db->query($sql);
+if ($resql)
{
- $num = $db->num_rows();
+ $num = $db->num_rows($resql);
$i = 0;
if ($action == 'facturer') {
@@ -193,7 +194,7 @@ if ($result)
while ($i < min($num,$conf->liste_limit))
{
- $obj = $db->fetch_object();
+ $obj = $db->fetch_object($resql);
$var=!$var;
@@ -212,7 +213,7 @@ if ($result)
print '';
- $db->free();
+ $db->free($resql);
}
else
{
diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php
index efa555d60d2..4b801f4e525 100644
--- a/htdocs/compta/fiche.php
+++ b/htdocs/compta/fiche.php
@@ -54,11 +54,12 @@ if ($mode == 'search')
$sql .= " WHERE lower(s.nom) like '%".strtolower($socname)."%'";
}
- if ( $db->query($sql) )
+ $resql=$db->query($sql);
+ if ($resql)
{
- if ( $db->num_rows() == 1)
+ if ( $db->num_rows($resql) == 1)
{
- $obj = $db->fetch_object();
+ $obj = $db->fetch_object($resql);
$socid = $obj->rowid;
}
$db->free();
diff --git a/htdocs/compta/prelevement/class/bon-prelevement.class.php b/htdocs/compta/prelevement/class/bon-prelevement.class.php
index a7f876ef597..e7dd686d438 100644
--- a/htdocs/compta/prelevement/class/bon-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/bon-prelevement.class.php
@@ -233,7 +233,7 @@ class BonPrelevement extends CommonObject
{
if ($this->db->num_rows($result))
{
- $obj = $this->db->fetch_object();
+ $obj = $this->db->fetch_object($result);
$this->id = $obj->rowid;
$this->ref = $obj->ref;
diff --git a/htdocs/compta/prelevement/class/ligne-prelevement.class.php b/htdocs/compta/prelevement/class/ligne-prelevement.class.php
index b468465ffc4..d7ed63915df 100644
--- a/htdocs/compta/prelevement/class/ligne-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligne-prelevement.class.php
@@ -21,11 +21,11 @@
*/
/*
- \file htdocs/compta/prelevement/ligne-prelevement.class.php
- \ingroup prelevement
- \brief Fichier de la classe des lignes de prelevements
- \version $Revision$
-*/
+ \file htdocs/compta/prelevement/ligne-prelevement.class.php
+ \ingroup prelevement
+ \brief Fichier de la classe des lignes de prelevements
+ \version $Revision$
+ */
/**
@@ -35,77 +35,77 @@
class LignePrelevement
{
- var $id;
- var $db;
+ var $id;
+ var $db;
- var $statuts = array();
+ var $statuts = array();
- /**
- * \brief Constructeur de la classe
- * \param DB Handler acces base de donnees
- * \param user Objet user
- */
- function LignePrelevement($DB, $user)
- {
- $this->db = $DB ;
- $this->user = $user;
+ /**
+ * \brief Constructeur de la classe
+ * \param DB Handler acces base de donnees
+ * \param user Objet user
+ */
+ function LignePrelevement($DB, $user)
+ {
+ $this->db = $DB ;
+ $this->user = $user;
- // List of language codes for status
- /*$this->statuts[0] = "Waiting";
- $this->statuts[2] = "Credited";
- $this->statuts[3] = "Refused";*/
- }
+ // List of language codes for status
+ /*$this->statuts[0] = "Waiting";
+ $this->statuts[2] = "Credited";
+ $this->statuts[3] = "Refused";*/
+ }
- /**
- * \brief Recupere l'objet prelevement
- * \param rowid id de la facture a recuperer
- */
- function fetch($rowid)
- {
- global $conf;
+ /**
+ * \brief Recupere l'objet prelevement
+ * \param rowid id de la facture a recuperer
+ */
+ function fetch($rowid)
+ {
+ global $conf;
- $result = 0;
+ $result = 0;
- $sql = "SELECT pl.rowid, pl.amount, p.ref, p.rowid as bon_rowid";
- $sql.= ", pl.statut, pl.fk_soc";
- $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
- $sql.= ", ".MAIN_DB_PREFIX."prelevement_bons as p";
- $sql.= " WHERE pl.rowid=".$rowid;
- $sql.= " AND p.rowid = pl.fk_prelevement_bons";
- $sql.= " AND p.entity = ".$conf->entity;
+ $sql = "SELECT pl.rowid, pl.amount, p.ref, p.rowid as bon_rowid";
+ $sql.= ", pl.statut, pl.fk_soc";
+ $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+ $sql.= ", ".MAIN_DB_PREFIX."prelevement_bons as p";
+ $sql.= " WHERE pl.rowid=".$rowid;
+ $sql.= " AND p.rowid = pl.fk_prelevement_bons";
+ $sql.= " AND p.entity = ".$conf->entity;
- if ($this->db->query($sql))
- {
- if ($this->db->num_rows())
- {
- $obj = $this->db->fetch_object();
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ if ($this->db->num_rows($resql))
+ {
+ $obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
- $this->amount = $obj->amount;
- $this->socid = $obj->fk_soc;
- $this->statut = $obj->statut;
- $this->bon_ref = $obj->ref;
- $this->bon_rowid = $obj->bon_rowid;
- }
- else
- {
- $result++;
- dol_syslog("LignePrelevement::Fetch rowid=$rowid numrows=0");
- }
+ $this->id = $obj->rowid;
+ $this->amount = $obj->amount;
+ $this->socid = $obj->fk_soc;
+ $this->statut = $obj->statut;
+ $this->bon_ref = $obj->ref;
+ $this->bon_rowid = $obj->bon_rowid;
+ }
+ else
+ {
+ $result++;
+ dol_syslog("LignePrelevement::Fetch rowid=$rowid numrows=0");
+ }
- $this->db->free();
- }
- else
- {
- $result++;
- dol_syslog("LignePrelevement::Fetch rowid=$rowid");
- dol_syslog($this->db->error());
- }
+ $this->db->free($resql);
+ }
+ else
+ {
+ $result++;
+ dol_syslog("LignePrelevement::Fetch rowid=$rowid");
+ dol_syslog($this->db->error());
+ }
- return $result;
-
- }
+ return $result;
+ }
}
?>
diff --git a/htdocs/compta/prelevement/class/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejet-prelevement.class.php
index 1ae7ada15f3..02ad1361120 100644
--- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejet-prelevement.class.php
@@ -21,312 +21,312 @@
*/
/**
- \file htdocs/compta/prelevement/class/rejet-prelevement.class.php
- \ingroup prelevement
- \brief File of class to manage standing orders rejects
- \version $Revision$
-*/
+ \file htdocs/compta/prelevement/class/rejet-prelevement.class.php
+ \ingroup prelevement
+ \brief File of class to manage standing orders rejects
+ \version $Revision$
+ */
/**
- \class RejetPrelevement
- \brief Class to manage standing orders rejects
-*/
+ \class RejetPrelevement
+ \brief Class to manage standing orders rejects
+ */
class RejetPrelevement
{
- var $id;
- var $db;
+ var $id;
+ var $db;
- /**
- * \brief Constructeur de la classe
- * \param DB Handler acces base de donnees
- * \param user Utilisateur
- */
- function RejetPrelevement($DB, $user)
- {
- $this->db = $DB ;
- $this->user = $user;
+ /**
+ * \brief Constructeur de la classe
+ * \param DB Handler acces base de donnees
+ * \param user Utilisateur
+ */
+ function RejetPrelevement($DB, $user)
+ {
+ $this->db = $DB ;
+ $this->user = $user;
- $this->motifs = array();
- /* $this->motifs[0] = "Non renseigne";
- $this->motifs[1] = "Provision insuffisante";
- $this->motifs[2] = "Tirage conteste";
- $this->motifs[3] = "Pas de bon � payer";
- $this->motifs[4] = "Opposition sur compte";
- $this->motifs[5] = "RIB inexploitable";
- $this->motifs[6] = "Compte solde";
- $this->motifs[7] = "Decision judiciaire";
- $this->motifs[8] = "Autre motif";*/
- }
+ $this->motifs = array();
+ /* $this->motifs[0] = "Non renseigne";
+ $this->motifs[1] = "Provision insuffisante";
+ $this->motifs[2] = "Tirage conteste";
+ $this->motifs[3] = "Pas de bon � payer";
+ $this->motifs[4] = "Opposition sur compte";
+ $this->motifs[5] = "RIB inexploitable";
+ $this->motifs[6] = "Compte solde";
+ $this->motifs[7] = "Decision judiciaire";
+ $this->motifs[8] = "Autre motif";*/
+ }
- function create($user, $id, $motif, $date_rejet, $bonid, $facturation=0)
- {
- $error = 0;
- $this->id = $id;
- $this->bon_id = $bonid;
+ function create($user, $id, $motif, $date_rejet, $bonid, $facturation=0)
+ {
+ $error = 0;
+ $this->id = $id;
+ $this->bon_id = $bonid;
- dol_syslog("RejetPrelevement::Create id $id");
+ dol_syslog("RejetPrelevement::Create id $id");
- $facs = $this->_get_list_factures();
+ $facs = $this->_get_list_factures();
- $this->db->begin();
+ $this->db->begin();
- /* Insert la ligne de rejet dans la base */
+ /* Insert la ligne de rejet dans la base */
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_rejet (";
- $sql.= "fk_prelevement_lignes";
- $sql.= ", date_rejet";
- $sql.= ", motif";
- $sql.= ", fk_user_creation";
- $sql.= ", date_creation";
- $sql.= ", afacturer";
- $sql.= ") VALUES (";
- $sql.= $id;
- $sql.= ", '".$this->db->idate($date_rejet)."'";
- $sql.= ", ".$motif;
- $sql.= ", ".$user->id;
- $sql.= ", ".$this->db->idate(mktime());
- $sql.= ", ".$facturation;
- $sql.= ")";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_rejet (";
+ $sql.= "fk_prelevement_lignes";
+ $sql.= ", date_rejet";
+ $sql.= ", motif";
+ $sql.= ", fk_user_creation";
+ $sql.= ", date_creation";
+ $sql.= ", afacturer";
+ $sql.= ") VALUES (";
+ $sql.= $id;
+ $sql.= ", '".$this->db->idate($date_rejet)."'";
+ $sql.= ", ".$motif;
+ $sql.= ", ".$user->id;
+ $sql.= ", ".$this->db->idate(mktime());
+ $sql.= ", ".$facturation;
+ $sql.= ")";
- $result=$this->db->query($sql);
+ $result=$this->db->query($sql);
- if (!$result)
- {
- dol_syslog("RejetPrelevement::create Erreur 4");
- dol_syslog("RejetPrelevement::create Erreur 4 $sql");
- $error++;
- }
+ if (!$result)
+ {
+ dol_syslog("RejetPrelevement::create Erreur 4");
+ dol_syslog("RejetPrelevement::create Erreur 4 $sql");
+ $error++;
+ }
- /* Tag la ligne de prev comme rejetee */
+ /* Tag la ligne de prev comme rejetee */
- $sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes ";
- $sql.= " SET statut = 3";
- $sql.= " WHERE rowid = ".$id;
+ $sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes ";
+ $sql.= " SET statut = 3";
+ $sql.= " WHERE rowid = ".$id;
- if (! $this->db->query($sql))
- {
- dol_syslog("RejetPrelevement::create Erreur 5");
- $error++;
- }
+ if (! $this->db->query($sql))
+ {
+ dol_syslog("RejetPrelevement::create Erreur 5");
+ $error++;
+ }
- for ($i = 0 ; $i < sizeof($facs) ; $i++)
- {
- $fac = new Facture($this->db);
- $fac->fetch($facs[$i]);
+ for ($i = 0 ; $i < sizeof($facs) ; $i++)
+ {
+ $fac = new Facture($this->db);
+ $fac->fetch($facs[$i]);
- /* Emet un paiement negatif */
+ /* Emet un paiement negatif */
- $pai = new Paiement($this->db);
+ $pai = new Paiement($this->db);
- $pai->amounts = array();
- // On remplace la virgule eventuelle par un point sinon
- // certaines install de PHP renvoie uniquement la partie
- // entiere negative
+ $pai->amounts = array();
+ // On remplace la virgule eventuelle par un point sinon
+ // certaines install de PHP renvoie uniquement la partie
+ // entiere negative
- $pai->amounts[$facs[$i]] = price2num($fac->total_ttc * -1);
- $pai->datepaye = $this->db->idate($date_rejet);
- $pai->paiementid = 3; // prelevement
- $pai->num_paiement = "Rejet";
+ $pai->amounts[$facs[$i]] = price2num($fac->total_ttc * -1);
+ $pai->datepaye = $this->db->idate($date_rejet);
+ $pai->paiementid = 3; // prelevement
+ $pai->num_paiement = "Rejet";
- if ($pai->create($this->user, 1) == -1) // on appelle en no_commit
+ if ($pai->create($this->user, 1) == -1) // on appelle en no_commit
{
- $error++;
- dol_syslog("RejetPrelevement::Create Erreur creation paiement facture ".$facs[$i]);
+ $error++;
+ dol_syslog("RejetPrelevement::Create Erreur creation paiement facture ".$facs[$i]);
}
- /* Valide le paiement */
+ /* Valide le paiement */
- if ($pai->valide() < 0)
+ if ($pai->valide() < 0)
{
- $error++;
- dol_syslog("RejetPrelevement::Create Erreur validation du paiement");
+ $error++;
+ dol_syslog("RejetPrelevement::Create Erreur validation du paiement");
}
- /* Tag la facture comme impayee */
- dol_syslog("RejetPrelevement::Create set_unpaid fac ".$fac->ref);
- $fac->set_unpaid($fac->id, $user);
+ /* Tag la facture comme impayee */
+ dol_syslog("RejetPrelevement::Create set_unpaid fac ".$fac->ref);
+ $fac->set_unpaid($fac->id, $user);
- /* Envoi un email � l'emetteur de la demande de prev */
- $this->_send_email($fac);
- }
+ /* Envoi un email � l'emetteur de la demande de prev */
+ $this->_send_email($fac);
+ }
- if ($error == 0)
- {
- dol_syslog("RejetPrelevement::Create Commit");
- $this->db->commit();
- }
- else
- {
- dol_syslog("RejetPrelevement::Create Rollback");
- $this->db->rollback();
- }
+ if ($error == 0)
+ {
+ dol_syslog("RejetPrelevement::Create Commit");
+ $this->db->commit();
+ }
+ else
+ {
+ dol_syslog("RejetPrelevement::Create Rollback");
+ $this->db->rollback();
+ }
- }
+ }
- /**
- * \brief Envoi mail
- * \param fac Invoice object
- */
- function _send_email($fac)
- {
- global $langs;
+ /**
+ * \brief Envoi mail
+ * \param fac Invoice object
+ */
+ function _send_email($fac)
+ {
+ global $langs;
- $userid = 0;
+ $userid = 0;
- $sql = "SELECT fk_user_demande";
- $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
- $sql.= " WHERE pfd.fk_prelevement_bons = ".$this->bon_id;
- $sql.= " AND pfd.fk_facture = ".$fac->id;
+ $sql = "SELECT fk_user_demande";
+ $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+ $sql.= " WHERE pfd.fk_prelevement_bons = ".$this->bon_id;
+ $sql.= " AND pfd.fk_facture = ".$fac->id;
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
- if ($num > 0)
- {
- $row = $this->db->fetch_row($resql);
- $userid = $row[0];
- }
- }
- else
- {
- dol_syslog("RejetPrelevement::_send_email Erreur lecture user");
- }
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $num = $this->db->num_rows($resql);
+ if ($num > 0)
+ {
+ $row = $this->db->fetch_row($resql);
+ $userid = $row[0];
+ }
+ }
+ else
+ {
+ dol_syslog("RejetPrelevement::_send_email Erreur lecture user");
+ }
- if ($userid > 0)
- {
- $emuser = new User($this->db);
- $emuser->fetch($userid);
+ if ($userid > 0)
+ {
+ $emuser = new User($this->db);
+ $emuser->fetch($userid);
- $soc = new Societe($this->db);
- $soc->fetch($fac->socid);
+ $soc = new Societe($this->db);
+ $soc->fetch($fac->socid);
- require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
+ require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
- $subject = "Prelevement rejete";
- $sendto = $emuser->getFullName($langs)." <".$emuser->email.">";
- $from = $this->user->getFullName($langs)." <".$this->user->email.">";
- $msgishtml=0;
+ $subject = "Prelevement rejete";
+ $sendto = $emuser->getFullName($langs)." <".$emuser->email.">";
+ $from = $this->user->getFullName($langs)." <".$this->user->email.">";
+ $msgishtml=0;
- $arr_file = array();
- $arr_mime = array();
- $arr_name = array();
+ $arr_file = array();
+ $arr_mime = array();
+ $arr_name = array();
- $message = "Bonjour,\n";
- $message .= "\nLe prelevement de la facture ".$fac->ref." pour le compte de la societe ".$soc->nom." d'un montant de ".price($fac->total_ttc)." a ete rejete par la banque.";
- $message .= "\n\n--\n".$this->user->getFullName($langs);
+ $message = "Bonjour,\n";
+ $message .= "\nLe prelevement de la facture ".$fac->ref." pour le compte de la societe ".$soc->nom." d'un montant de ".price($fac->total_ttc)." a ete rejete par la banque.";
+ $message .= "\n\n--\n".$this->user->getFullName($langs);
- $mailfile = new CMailFile($subject,$sendto,$from,$message,
- $arr_file,$arr_mime,$arr_name,
+ $mailfile = new CMailFile($subject,$sendto,$from,$message,
+ $arr_file,$arr_mime,$arr_name,
'', '', 0, $msgishtml,$this->user->email);
- $result=$mailfile->sendfile();
- if ($result)
- {
- dol_syslog("RejetPrelevement::_send_email email envoye");
- }
- else
- {
- dol_syslog("RejetPrelevement::_send_email Erreur envoi email");
- }
- }
- else
- {
- dol_syslog("RejetPrelevement::_send_email Userid invalide");
- }
- }
+ $result=$mailfile->sendfile();
+ if ($result)
+ {
+ dol_syslog("RejetPrelevement::_send_email email envoye");
+ }
+ else
+ {
+ dol_syslog("RejetPrelevement::_send_email Erreur envoi email");
+ }
+ }
+ else
+ {
+ dol_syslog("RejetPrelevement::_send_email Userid invalide");
+ }
+ }
- /**
- * \brief Recupere la liste des factures concernees
- */
- function _get_list_factures()
- {
- global $conf;
+ /**
+ * \brief Recupere la liste des factures concernees
+ */
+ function _get_list_factures()
+ {
+ global $conf;
- $arr = array();
- /*
- * Renvoie toutes les factures associ�e � un pr�l�vement
- *
- */
+ $arr = array();
+ /*
+ * Renvoie toutes les factures associ�e � un pr�l�vement
+ *
+ */
- $sql = "SELECT f.rowid as facid";
- $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_facture as pf";
- $sql.= ", ".MAIN_DB_PREFIX."facture as f";
- $sql.= " WHERE pf.fk_prelevement_lignes = ".$this->id;
- $sql.= " AND pf.fk_facture = f.rowid";
- $sql.= " AND f.entity = ".$conf->entity;
+ $sql = "SELECT f.rowid as facid";
+ $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_facture as pf";
+ $sql.= ", ".MAIN_DB_PREFIX."facture as f";
+ $sql.= " WHERE pf.fk_prelevement_lignes = ".$this->id;
+ $sql.= " AND pf.fk_facture = f.rowid";
+ $sql.= " AND f.entity = ".$conf->entity;
- $result=$this->db->query($sql);
- if ($result)
- {
- $num = $this->db->num_rows();
+ $result=$this->db->query($sql);
+ if ($result)
+ {
+ $num = $this->db->num_rows();
- if ($num)
+ if ($num)
{
- $i = 0;
- while ($i < $num)
- {
- $row = $this->db->fetch_row();
- $arr[$i] = $row[0];
- $i++;
- }
+ $i = 0;
+ while ($i < $num)
+ {
+ $row = $this->db->fetch_row();
+ $arr[$i] = $row[0];
+ $i++;
+ }
}
- $this->db->free();
- }
- else
- {
- dol_syslog("RejetPrelevement Erreur");
- }
+ $this->db->free();
+ }
+ else
+ {
+ dol_syslog("RejetPrelevement Erreur");
+ }
- return $arr;
+ return $arr;
- }
+ }
- /**
- * \brief Recupere l'objet prelevement
- * \param rowid id de la facture a recuperer
- */
- function fetch($rowid)
- {
+ /**
+ * \brief Recupere l'objet prelevement
+ * \param rowid id de la facture a recuperer
+ */
+ function fetch($rowid)
+ {
- $sql = "SELECT pr.date_rejet as dr, motif";
- $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_rejet as pr";
- $sql.= " WHERE pr.fk_prelevement_lignes =".$rowid;
+ $sql = "SELECT pr.date_rejet as dr, motif";
+ $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_rejet as pr";
+ $sql.= " WHERE pr.fk_prelevement_lignes =".$rowid;
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ if ($this->db->num_rows($resql))
+ {
+ $obj = $this->db->fetch_object($resql);
- if ($this->db->query($sql))
- {
- if ($this->db->num_rows())
- {
- $obj = $this->db->fetch_object();
+ $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();
-
- return 0;
- }
- else
- {
- dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid numrows=0");
- return -1;
- }
- }
- else
- {
- dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid");
- return -2;
- }
- }
+ return 0;
+ }
+ else
+ {
+ dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid numrows=0");
+ return -1;
+ }
+ }
+ else
+ {
+ dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid");
+ return -2;
+ }
+ }
}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 36ba129042d..b4796620d61 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -194,9 +194,10 @@ $sql.= " AND pfd.traite = 0";
$sql.= " AND pfd.fk_facture = f.rowid";
if ($socid) $sql.= " AND f.fk_soc = ".$socid;
-if ( $db->query($sql) )
+$resql=$db->query($sql);
+if ($resql)
{
- $num = $db->num_rows();
+ $num = $db->num_rows($resql);
$i = 0;
if ($num)
@@ -207,7 +208,7 @@ if ( $db->query($sql) )
$var = True;
while ($i < $num && $i < 20)
{
- $obj = $db->fetch_object();
+ $obj = $db->fetch_object($resql);
$var=!$var;
print ' | | ';
$invoicestatic->id=$obj->rowid;
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 8fdbda22fcc..0069468a9a9 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -210,10 +210,9 @@ class ChargeSociales extends CommonObject
}
$result = $this->db->query($sql);
-
if ($result) {
- if ($this->db->num_rows()) {
- $obj = $this->db->fetch_object();
+ if ($this->db->num_rows($result)) {
+ $obj = $this->db->fetch_object($result);
return $obj->amount;
} else {
return 0;
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index ceb8c2e19db..b21867036c1 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -326,9 +326,10 @@ print " | ";
}
$sql .= " GROUP BY f.facnumber,f.rowid,s.nom, s.rowid, f.total_ttc";
- if ( $db->query($sql) )
+ $resql=$db->query($sql);
+ if ($resql)
{
- $num = $db->num_rows();
+ $num = $db->num_rows($resql);
$i = 0;
if ($num)
@@ -337,7 +338,7 @@ print " |