lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Database compatibility

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-09 16:07:24 +00:00
parent d3536e3d42
commit 186622e235
17 changed files with 173 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/adherents/class/adherent_type.class.php
View File

@ -149,9 +149,10 @@ class AdherentType extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type WHERE rowid = $rowid"; $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; return 1;
} }

6
htdocs/compta/bank/class/account.class.php
View File

@ -759,10 +759,9 @@ class Account extends CommonObject
$sql.= " WHERE rowid = ".$rowid; $sql.= " WHERE rowid = ".$rowid;
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
if ($this->db->affected_rows()) if ($this->db->affected_rows($result))
{ {
return 1; return 1;
} }
@ -784,10 +783,9 @@ class Account extends CommonObject
$sql.= " WHERE rowid = ".$rowid; $sql.= " WHERE rowid = ".$rowid;
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
if ($this->db->affected_rows()) if ($this->db->affected_rows($result))
{ {
return 1; return 1;
} }

20
htdocs/compta/dons/class/don.class.php
View File

@ -401,9 +401,10 @@ class Don extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."don WHERE rowid = $rowid AND fk_statut = 0;"; $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; 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;"; $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; return 1;
} }
@ -519,9 +521,10 @@ class Don extends CommonObject
} }
$sql .= " WHERE rowid = $rowid AND fk_statut = 1;"; $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; 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;"; $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; return 1;
} }

52
htdocs/compta/prelevement/class/rejet-prelevement.class.php
View File

@ -261,22 +261,22 @@ class RejetPrelevement
$sql.= " AND pf.fk_facture = f.rowid"; $sql.= " AND pf.fk_facture = f.rowid";
$sql.= " AND f.entity = ".$conf->entity; $sql.= " AND f.entity = ".$conf->entity;
$result=$this->db->query($sql); $resql=$this->db->query($sql);
if ($result) if ($resql)
{ {
$num = $this->db->num_rows(); $num = $this->db->num_rows($resql);
if ($num) if ($num)
{ {
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$row = $this->db->fetch_row(); $row = $this->db->fetch_row($resql);
$arr[$i] = $row[0]; $arr[$i] = $row[0];
$i++; $i++;
} }
} }
$this->db->free(); $this->db->free($resql);
} }
else else
{ {
@ -304,22 +304,22 @@ class RejetPrelevement
if ($resql) if ($resql)
{ {
if ($this->db->num_rows($resql)) if ($this->db->num_rows($resql))
{ {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$this->id = $rowid; $this->id = $rowid;
$this->date_rejet = $this->db->jdate($obj->dr); $this->date_rejet = $this->db->jdate($obj->dr);
$this->motif = $this->motifs[$obj->motif]; $this->motif = $this->motifs[$obj->motif];
$this->db->free($resql); $this->db->free($resql);
return 0; return 0;
} }
else else
{ {
dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid numrows=0"); dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid numrows=0");
return -1; return -1;
} }
} }
else else
{ {

184
htdocs/compta/prelevement/stats.php
View File

@ -23,7 +23,7 @@
* \file htdocs/compta/prelevement/stats.php * \file htdocs/compta/prelevement/stats.php
* \brief Page de stats des prelevements * \brief Page de stats des prelevements
* \version $Id$ * \version $Id$
*/ */
require('../../main.inc.php'); require('../../main.inc.php');
@ -52,17 +52,18 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
$sql.= " WHERE pl.fk_soc = s.rowid"; $sql.= " WHERE pl.fk_soc = s.rowid";
$sql.= " AND s.entity = ".$conf->entity; $sql.= " AND s.entity = ".$conf->entity;
if ($db->query($sql)) $resql=$db->query($sql);
if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
$i = 0; $i = 0;
if ( $num >0 ) if ( $num >0 )
{ {
$row = $db->fetch_row(); $row = $db->fetch_row($resql);
$total = $row[0]; $total = $row[0];
$nbtotal = $row[1]; $nbtotal = $row[1];
} }
} }
/* /*
@ -76,59 +77,60 @@ $sql.= " WHERE pl.fk_soc = s.rowid";
$sql.= " AND s.entity = ".$conf->entity; $sql.= " AND s.entity = ".$conf->entity;
$sql.= " GROUP BY pl.statut"; $sql.= " GROUP BY pl.statut";
if ($db->query($sql)) $resql=$db->query($sql);
if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
$i = 0; $i = 0;
print"\n<!-- debut table -->\n"; print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>'; print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>';
print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>'; print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
$var=True; $var=True;
$st[0] = $langs->trans("StatusWaiting"); $st[0] = $langs->trans("StatusWaiting");
$st[1] = $langs->trans("StatusWaiting"); $st[1] = $langs->trans("StatusWaiting");
$st[2] = $langs->trans("StatusCredited"); $st[2] = $langs->trans("StatusCredited");
$st[3] = $langs->trans("StatusRefused"); $st[3] = $langs->trans("StatusRefused");
while ($i < $num) while ($i < $num)
{ {
$row = $db->fetch_row(); $row = $db->fetch_row($resql);
print "<tr $bc[$var]><td>"; print "<tr $bc[$var]><td>";
print $st[$row[2]]; print $st[$row[2]];
print '</td><td align="center">'; print '</td><td align="center">';
print $row[1]; print $row[1];
print '</td><td align="right">'; print '</td><td align="right">';
print round($row[1]/$nbtotal*100,2)." %"; print round($row[1]/$nbtotal*100,2)." %";
print '</td><td align="right">'; print '</td><td align="right">';
print price($row[0]); print price($row[0]);
print '</td><td align="right">'; print '</td><td align="right">';
print round($row[0]/$total*100,2)." %"; print round($row[0]/$total*100,2)." %";
print '</td></tr>'; print '</td></tr>';
$var=!$var; $var=!$var;
$i++; $i++;
} }
print '<tr class="liste_total"><td align="right">'.$langs->trans("Total").'</td>'; print '<tr class="liste_total"><td align="right">'.$langs->trans("Total").'</td>';
print '<td align="center">'.$nbtotal.'</td><td>&nbsp;</td><td align="right">'; print '<td align="center">'.$nbtotal.'</td><td>&nbsp;</td><td align="right">';
print price($total); print price($total);
print '</td><td align="right">&nbsp;</td>'; print '</td><td align="right">&nbsp;</td>';
print "</tr></table>"; print "</tr></table>";
$db->free(); $db->free();
} }
else 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.= " WHERE pl.fk_soc = s.rowid";
$sql.= " AND s.entity = ".$conf->entity; $sql.= " AND s.entity = ".$conf->entity;
$sql.= " WHERE pl.statut = 3"; $sql.= " WHERE pl.statut = 3";
if ($db->query($sql)) $resql=$db->query($sql);
if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
$i = 0; $i = 0;
if ( $num > 0 ) if ( $num > 0 )
{ {
$row = $db->fetch_row(); $row = $db->fetch_row($resql);
$total = $row[0]; $total = $row[0];
$nbtotal = $row[1]; $nbtotal = $row[1];
} }
} }
/* /*
@ -175,57 +178,58 @@ $sql.= " AND pr.fk_prelevement_lignes = pl.rowid";
$sql.= " GROUP BY pr.motif"; $sql.= " GROUP BY pr.motif";
$sql.= " ORDER BY cc DESC"; $sql.= " ORDER BY cc DESC";
if ($db->query($sql)) $resql=$db->query($sql);
if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
$i = 0; $i = 0;
print"\n<!-- debut table -->\n"; print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td>'; print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td>';
print '<td align="right">%</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>'; print '<td align="right">%</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
$var=True; $var=True;
require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php";
$Rejet = new RejetPrelevement($db, $user); $Rejet = new RejetPrelevement($db, $user);
while ($i < $num) while ($i < $num)
{ {
$row = $db->fetch_row(); $row = $db->fetch_row($resql);
print "<tr $bc[$var]><td>"; print "<tr $bc[$var]><td>";
print $Rejet->motifs[$row[2]]; print $Rejet->motifs[$row[2]];
print '</td><td align="center">'.$row[1]; print '</td><td align="center">'.$row[1];
print '</td><td align="right">'; print '</td><td align="right">';
print round($row[1]/$nbtotal*100,2)." %"; print round($row[1]/$nbtotal*100,2)." %";
print '</td><td align="right">'; print '</td><td align="right">';
print price($row[0]); print price($row[0]);
print '</td><td align="right">'; print '</td><td align="right">';
print round($row[0]/$total*100,2)." %"; print round($row[0]/$total*100,2)." %";
print '</td></tr>'; print '</td></tr>';
$var=!$var; $var=!$var;
$i++; $i++;
} }
print '<tr class="liste_total"><td align="right">'.$langs->trans("Total").'</td><td align="center">'.$nbtotal.'</td>'; print '<tr class="liste_total"><td align="right">'.$langs->trans("Total").'</td><td align="center">'.$nbtotal.'</td>';
print '<td>&nbsp;</td><td align="right">'; print '<td>&nbsp;</td><td align="right">';
print price($total); print price($total);
print '</td><td align="right">&nbsp;</td>'; print '</td><td align="right">&nbsp;</td>';
print "</tr></table>"; print "</tr></table>";
$db->free(); $db->free();
} }
else else
{ {
dol_print_error($db); dol_print_error($db);
} }

9
htdocs/fourn/class/fournisseur.class.php
View File

@ -65,15 +65,14 @@ class Fournisseur extends Societe
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf"; $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
$sql .= " WHERE cf.fk_soc = ".$this->id; $sql .= " WHERE cf.fk_soc = ".$this->id;
$result = $this->db->query($sql) ; $resql = $this->db->query($sql);
if ($resql)
if ( $result )
{ {
$num = $this->db->num_rows(); $num = $this->db->num_rows($resql);
if ($num == 1) if ($num == 1)
{ {
$row = $this->db->fetch_row(); $row = $this->db->fetch_row($resql);
$this->single_open_commande = $row[0]; $this->single_open_commande = $row[0];
} }

21
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -50,9 +50,9 @@ class CommandeFournisseur extends Commande
var $ref; var $ref;
var $brouillon; var $brouillon;
var $statut; // 0=Draft -> 1=Validated -> 2=Approved -> 3=Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially 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 // -> 7=Canceled/Never received -> (reopen) 3=Process runing
// -> 6=Canceled -> (reopen) 2=Approved // -> 6=Canceled -> (reopen) 2=Approved
// -> 9=Refused -> (reopen) 1=Validated // -> 9=Refused -> (reopen) 1=Validated
/** \brief Constructeur /** \brief Constructeur
@ -1079,20 +1079,21 @@ class CommandeFournisseur extends Commande
$sql.= " FROM ".MAIN_DB_PREFIX."c_methode_commande_fournisseur"; $sql.= " FROM ".MAIN_DB_PREFIX."c_methode_commande_fournisseur";
$sql.= " WHERE active = 1"; $sql.= " WHERE active = 1";
if ($this->db->query($sql)) $resql=$this->db->query($sql);
if ($resql)
{ {
$i = 0; $i = 0;
$num = $this->db->num_rows(); $num = $this->db->num_rows();
$this->methodes_commande = array(); $this->methodes_commande = array();
while ($i < $num) 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++; $i++;
} }
return 0; return 0;
} }
else else
{ {

2
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -391,7 +391,7 @@ class ProductFournisseur extends Product
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;
if ($result) if ($result)
{ {
$result = $this->db->fetch_array(); $result = $this->db->fetch_array($result);
$this->ref_fourn = $result["ref_fourn"]; $this->ref_fourn = $result["ref_fourn"];
$this->product_fourn_id = $result["rowid"]; $this->product_fourn_id = $result["rowid"];
return 1; return 1;

7
htdocs/includes/modules/modFournisseur.class.php
View File

@ -288,13 +288,14 @@ class modFournisseur extends DolibarrModules
{ {
$sql = "SELECT count(rowid) FROM ".MAIN_DB_PREFIX."c_methode_commande_fournisseur"; $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) if ($row[0] == 0)
{ {
$this->db->free(); $this->db->free($resql);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_methode_commande_fournisseur"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_methode_commande_fournisseur";
$sql .= " (code,libelle) VALUES ('OrderByMail','Courrier')"; $sql .= " (code,libelle) VALUES ('OrderByMail','Courrier')";

2
htdocs/lib/databases/mssql.lib.php
View File

@ -452,7 +452,7 @@ class DoliDb
\param resultset Curseur de la requete voulue \param resultset Curseur de la requete voulue
\return int Nombre de lignes \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 // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->results; }

2
htdocs/lib/databases/mysql.lib.php
View File

@ -447,7 +447,7 @@ class DoliDb
* \param resultset Curseur de la requete voulue * \param resultset Curseur de la requete voulue
* \return int Nombre de lignes * \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 // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->results; }

2
htdocs/lib/databases/mysqli.lib.php
View File

@ -461,7 +461,7 @@ class DoliDb
* \return int Nombre de lignes * \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 // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->results; }

2
htdocs/lib/databases/pgsql.lib.php
View File

@ -541,7 +541,7 @@ class DoliDb
* \param resultset Curseur de la requete voulue * \param resultset Curseur de la requete voulue
* \return int Nombre de lignes * \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 // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->results; }

2
htdocs/product/class/product.class.php
View File

@ -972,7 +972,7 @@ class Product extends CommonObject
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ( $result ) if ( $result )
{ {
$result = $this->db->fetch_array(); $result = $this->db->fetch_array($result);
$this->id = $result["rowid"]; $this->id = $result["rowid"];
$this->ref = $result["ref"]; $this->ref = $result["ref"];

8
htdocs/societe/class/client.class.php
View File

@ -58,15 +58,15 @@ class Client extends Societe
$sql .= " WHERE f.fk_soc = ".$this->id; $sql .= " WHERE f.fk_soc = ".$this->id;
$sql .= " ORDER BY datef DESC"; $sql .= " ORDER BY datef DESC";
$result = $this->db->query($sql) ;
$i = 0; $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 ) while ($i < $num )
{ {
$row = $this->db->fetch_row(); $row = $this->db->fetch_row($resql);
$this->factures[$i][0] = $row[0]; $this->factures[$i][0] = $row[0];
$this->factures[$i][1] = $row[1]; $this->factures[$i][1] = $row[1];

5
htdocs/societe/class/companybankaccount.class.php
View File

@ -67,9 +67,10 @@ class CompanyBankAccount
function create() function create()
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec) values ($this->socid, ".$this->db->idate(mktime()).")"; $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; return 1;
} }

7
htdocs/user/class/usergroup.class.php
View File

@ -408,13 +408,14 @@ class UserGroup extends CommonObject
$sql.= " AND r.entity = ".$conf->entity; $sql.= " AND r.entity = ".$conf->entity;
$sql.= " AND u.fk_usergroup = ".$this->id; $sql.= " AND u.fk_usergroup = ".$this->id;
$sql.= " AND r.perms IS NOT NULL"; $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; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$row = $this->db->fetch_row(); $row = $this->db->fetch_row($resql);
if (strlen($row[1]) > 0) if (strlen($row[1]) > 0)
{ {