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

Better postgresql compatibility

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-14 02:44:07 +00:00
parent 5f1310a325
commit 98a4430d5f
25 changed files with 174 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dev/initdata/generate-produit.php
View File

@ -60,17 +60,25 @@ $user->getrights();
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array(); $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
if ($db->query($sql)) { $resql=$db->query($sql);
$num = $db->num_rows(); $i = 0; if ($resql) {
while ($i < $num) { $row = $db->fetch_row($i); $productsid[$i] = $row[0]; $i++; } } $num = $db->num_rows($resql); $i = 0;
while ($i < $num) { $row = $db->fetch_row($resql); $productsid[$i] = $row[0]; $i++; }
}
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array(); $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
if ($db->query($sql)) { $num = $db->num_rows(); $i = 0; $resql=$db->query($sql);
while ($i < $num) { $row = $db->fetch_row($i); $societesid[$i] = $row[0]; $i++; } } else { print "err"; } if ($resql) {
$num = $db->num_rows($resql); $i = 0;
while ($i < $num) { $row = $db->fetch_row($resql); $societesid[$i] = $row[0]; $i++; }
} else { print "err"; }
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array(); $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
if ($db->query($sql)) { $num = $db->num_rows(); $i = 0; $resql=$db->query($sql);
while ($i < $num) { $row = $db->fetch_row($i); $commandesid[$i] = $row[0]; $i++; } } else { print "err"; } if ($resql) {
$num = $db->num_rows($resql); $i = 0;
while ($i < $num) { $row = $db->fetch_row($resql); $commandesid[$i] = $row[0]; $i++; }
} else { print "err"; }
print "Generates ".GEN_NUMBER_PRODUIT." products\n"; print "Generates ".GEN_NUMBER_PRODUIT." products\n";

22
dev/initdata/generate-societe.php
View File

@ -63,17 +63,25 @@ $user->getrights();
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array(); $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
if ($db->query($sql)) { $resql=$db->query($sql);
$num = $db->num_rows(); $i = 0; if ($resql) {
while ($i < $num) { $row = $db->fetch_row($i); $productsid[$i] = $row[0]; $i++; } } $num = $db->num_rows($resql); $i = 0;
while ($i < $num) { $row = $db->fetch_row($resql); $productsid[$i] = $row[0]; $i++; }
}
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array(); $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
if ($db->query($sql)) { $num = $db->num_rows(); $i = 0; $resql=$db->query($sql);
while ($i < $num) { $row = $db->fetch_row($i); $societesid[$i] = $row[0]; $i++; } } else { print "err"; } if ($resql) {
$num = $db->num_rows($resql); $i = 0;
while ($i < $num) { $row = $db->fetch_row($resql); $societesid[$i] = $row[0]; $i++; }
} else { print "err"; }
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array(); $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
if ($db->query($sql)) { $num = $db->num_rows(); $i = 0; $resql=$db->query($sql);
while ($i < $num) { $row = $db->fetch_row($i); $commandesid[$i] = $row[0]; $i++; } } else { print "err"; } if ($resql) {
$num = $db->num_rows($resql); $i = 0;
while ($i < $num) { $row = $db->fetch_row($resql); $commandesid[$i] = $row[0]; $i++; }
} else { print "err"; }

6
htdocs/adherents/class/adherent.class.php
View File

@ -1534,16 +1534,16 @@ class Adherent extends CommonObject
if ($result) if ($result)
{ {
if ($mydb->num_rows()) if ($mydb->num_rows($result))
{ {
# nous avons au moins une reponse # nous avons au moins une reponse
$mydb->close(); $mydb->close($result);
return 1; return 1;
} }
else else
{ {
# nous n'avons pas de reponse => n'existe pas # nous n'avons pas de reponse => n'existe pas
$mydb->close(); $mydb->close($result);
return 0; return 0;
} }
} }

4
htdocs/admin/system/dbtable.php
View File

@ -108,12 +108,12 @@ else
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows($result);
$var=True; $var=True;
$i=0; $i=0;
while ($i < $num) while ($i < $num)
{ {
$row = $db->fetch_row($i); $row = $db->fetch_row($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";

43
htdocs/boutique/commande/class/boutiquecommande.class.php
View File

@ -98,30 +98,29 @@ class BoutiqueCommande
$sql = "SELECT value, class "; $sql = "SELECT value, class ";
$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total WHERE orders_id = $id"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total WHERE orders_id = $id";
$result = $this->db->query($sql) ; $result = $this->db->query($sql);
if ( $result ) if ( $result )
{ {
$num = $this->db->num_rows(); $num = $this->db->num_rows($result);
while ($i < $num) while ($i < $num)
{ {
$array = $this->db->fetch_array($i); $array = $this->db->fetch_array($result);
if ($array["class"] == 'ot_total') if ($array["class"] == 'ot_total')
{ {
$this->total_ot_total = $array["value"]; $this->total_ot_total = $array["value"];
} }
if ($array["class"] == 'ot_shipping') if ($array["class"] == 'ot_shipping')
{ {
$this->total_ot_shipping = $array["value"]; $this->total_ot_shipping = $array["value"];
} }
$i++; $i++;
} }
} }
else else
{ {
print $this->db->error(); print $this->db->error();
} }
} }
else else

4
htdocs/compta/bank/categ.php
View File

@ -104,7 +104,7 @@ $sql.= " ORDER BY label";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $total = 0; $i = 0; $total = 0;
$var=True; $var=True;
@ -119,7 +119,7 @@ if ($result)
print "</tr>"; print "</tr>";
$i++; $i++;
} }
$db->free(); $db->free($result);
} }
/* /*

2
htdocs/compta/dons/index.php
View File

@ -47,7 +47,7 @@ $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {

5
htdocs/compta/prelevement/class/bon-prelevement.class.php
View File

@ -147,9 +147,10 @@ class BonPrelevement extends CommonObject
$sql.= " AND code_guichet ='".$code_guichet."'"; $sql.= " AND code_guichet ='".$code_guichet."'";
$sql.= " AND number ='".$number."'"; $sql.= " AND number ='".$number."'";
if ($this->db->query($sql)) $resql=$this->db->query($sql);
if ($resql)
{ {
$num = $this->db->num_rows(); $num = $this->db->num_rows($resql);
} }
else else
{ {

6
htdocs/compta/stats/comp.php
View File

@ -55,7 +55,7 @@ function propals ($db, $year, $month)
$sql .= " ORDER BY p.fk_statut"; $sql .= " ORDER BY p.fk_statut";
$result = $db->query($sql); $result = $db->query($sql);
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">"; print "<table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print "<tr class=\"liste_titre\"><td colspan=\"5\"><b>Propal</b></td></tr>"; print "<tr class=\"liste_titre\"><td colspan=\"5\"><b>Propal</b></td></tr>";
@ -131,7 +131,7 @@ function factures ($db, $year, $month, $paye)
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows($result);
if ($num > 0) if ($num > 0)
{ {
$i = 0; $i = 0;
@ -192,7 +192,7 @@ function pt ($db, $sql, $year)
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $total = 0 ; $i = 0; $total = 0 ;
print '<table class="border" width="100%" cellspacing="0" cellpadding="3">'; print '<table class="border" width="100%" cellspacing="0" cellpadding="3">';
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";

2
htdocs/compta/stats/prev.php
View File

@ -42,7 +42,7 @@ function pt ($db, $sql, $title) {
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $total = 0 ; $i = 0; $total = 0 ;
$var=True; $var=True;

2
htdocs/compta/tva.php
View File

@ -34,7 +34,7 @@ function pt ($db, $sql, $date) {
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $total = 0 ; $i = 0; $total = 0 ;
print "<TABLE border=\"1\" width=\"100%\">"; print "<TABLE border=\"1\" width=\"100%\">";
print "<TR class=\"liste_titre\">"; print "<TR class=\"liste_titre\">";

8
htdocs/compta/tva/class/tva.class.php
View File

@ -360,7 +360,7 @@ class Tva extends CommonObject
if ($result) if ($result)
{ {
if ($this->db->num_rows()) if ($this->db->num_rows($result))
{ {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
return $obj->amount; return $obj->amount;
@ -370,7 +370,7 @@ class Tva extends CommonObject
return 0; return 0;
} }
$this->db->free(); $this->db->free($result);
} }
else else
@ -399,7 +399,7 @@ class Tva extends CommonObject
if ($result) if ($result)
{ {
if ($this->db->num_rows()) if ($this->db->num_rows($result))
{ {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
return $obj->total_tva; return $obj->total_tva;
@ -441,7 +441,7 @@ class Tva extends CommonObject
if ($result) if ($result)
{ {
if ($this->db->num_rows()) if ($this->db->num_rows($result))
{ {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
return $obj->amount; return $obj->amount;

2
htdocs/domain/index.php
View File

@ -51,7 +51,7 @@ if ($result)
$var=True; $var=True;
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $total = 0; $i = 0; $total = 0;
$sep = 0; $sep = 0;

18
htdocs/expedition/class/expeditionstats.class.php
View File

@ -51,18 +51,19 @@ class ExpeditionStats
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
$sql.= " GROUP BY dm DESC"; $sql.= " GROUP BY dm DESC";
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($i); $row = $this->db->fetch_row($resql);
$result[$i] = $row; $result[$i] = $row;
$i++; $i++;
} }
$this->db->free(); $this->db->free($resql);
} }
return $result; return $result;
} }
@ -82,18 +83,19 @@ class ExpeditionStats
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
$sql.= " GROUP BY dm DESC"; $sql.= " GROUP BY dm DESC";
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($i); $row = $this->db->fetch_row($resql);
$j = $row[0] * 1; $j = $row[0] * 1;
$result[$j] = $row[1]; $result[$j] = $row[1];
$i++; $i++;
} }
$this->db->free(); $this->db->free($resql);
} }
for ($i = 1 ; $i < 13 ; $i++) for ($i = 1 ; $i < 13 ; $i++)
{ {

9
htdocs/expedition/stats/index.php
View File

@ -34,7 +34,7 @@ $langs->load("sendings");
llxHeader(); llxHeader();
print_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg); print_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg);
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td align="center">'.$langs->trans("Year").'</td>'; print '<tr><td align="center">'.$langs->trans("Year").'</td>';
print '<td width="40%" align="center">'.$langs->trans("NbOfSendings").'</td></tr>'; print '<td width="40%" align="center">'.$langs->trans("NbOfSendings").'</td></tr>';
@ -45,13 +45,14 @@ $sql.= " WHERE fk_statut > 0";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
$sql.= " GROUP BY dm DESC "; $sql.= " GROUP BY dm DESC ";
if ($db->query($sql)) $resql=$db->query($sql);
if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$row = $db->fetch_row($i); $row = $db->fetch_row($resql);
$nbproduct = $row[0]; $nbproduct = $row[0];
$year = $row[1]; $year = $row[1];
print "<tr>"; print "<tr>";

2
htdocs/fichinter/rapport.php
View File

@ -94,7 +94,7 @@ $sql .= " ORDER BY $sortfield $sortorder ";
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
$title = $langs->trans("Report")." ".dol_print_date(strtotime($start),"%B %Y"); $title = $langs->trans("Report")." ".dol_print_date(strtotime($start),"%B %Y");
print_barre_liste($title, $page, "rapport.php","&socid=".$socid,$sortfield,$sortorder,'',$num); print_barre_liste($title, $page, "rapport.php","&socid=".$socid,$sortfield,$sortorder,'',$num);

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

@ -1083,7 +1083,7 @@ class CommandeFournisseur extends Commande
if ($resql) if ($resql)
{ {
$i = 0; $i = 0;
$num = $this->db->num_rows(); $num = $this->db->num_rows($resql);
$this->methodes_commande = array(); $this->methodes_commande = array();
while ($i < $num) while ($i < $num)
{ {

9
htdocs/fourn/product/index.php
View File

@ -61,17 +61,18 @@ print "</table></form><br>\n";
*/ */
$prodser = array(); $prodser = array();
$sql = "SELECT count(*), fk_product_type FROM ".MAIN_DB_PREFIX."product as p GROUP BY fk_product_type"; $sql = "SELECT count(*), fk_product_type FROM ".MAIN_DB_PREFIX."product as p GROUP BY fk_product_type";
if ($db->query($sql)) $resql=$db->query($sql);
if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$row = $db->fetch_row($i); $row = $db->fetch_row($resql);
$prodser[$row[1]] = $row[0]; $prodser[$row[1]] = $row[0];
$i++; $i++;
} }
$db->free(); $db->free($resql);
} }
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';

119
htdocs/includes/modules/societe/mod_codecompta_digitaria.php
View File

@ -19,94 +19,95 @@
*/ */
/** /**
\file htdocs/includes/modules/societe/mod_codecompta_digitaria.php \file htdocs/includes/modules/societe/mod_codecompta_digitaria.php
\ingroup societe \ingroup societe
\brief Fichier de la classe des gestion digitaria des codes compta des societes clientes \brief Fichier de la classe des gestion digitaria des codes compta des societes clientes
\version $Id$ \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
/** /**
\class mod_codecompta_digitaria \class mod_codecompta_digitaria
\brief Classe permettant la gestion digitaria des codes compta des societes clients \brief Classe permettant la gestion digitaria des codes compta des societes clients
*/ */
class mod_codecompta_digitaria extends ModeleAccountancyCode class mod_codecompta_digitaria extends ModeleAccountancyCode
{ {
var $nom; var $nom;
function mod_codecompta_digitaria() function mod_codecompta_digitaria()
{ {
$this->nom = "Digitaria"; $this->nom = "Digitaria";
} }
function info($langs) function info($langs)
{ {
return $langs->trans("ModuleCompanyCode".$this->nom); return $langs->trans("ModuleCompanyCode".$this->nom);
} }
/** /**
* \brief Renvoi code * \brief Renvoi code
* \param DB Handler d'acc<EFBFBD>s base * \param DB Handler d'acc<EFBFBD>s base
* \param societe Objet societe * \param societe Objet societe
*/ */
function get_code($DB, $societe) function get_code($DB, $societe)
{ {
$i = 0; $i = 0;
$this->db = $DB; $this->db = $DB;
$this->code = "C".substr($societe->code_client,0,5); $this->code = "C".substr($societe->code_client,0,5);
$is_dispo = $this->verif($DB, $this->code); $is_dispo = $this->verif($DB, $this->code);
while ( $is_dispo <> 0 && $i < 37) while ( $is_dispo <> 0 && $i < 37)
{ {
$arr = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; $arr = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
$this->code = substr($this->code,0,5) . substr($arr, $i, 1); $this->code = substr($this->code,0,5) . substr($arr, $i, 1);
$is_dispo = $this->verif($DB, $this->code); $is_dispo = $this->verif($DB, $this->code);
$i++; $i++;
} }
if ($is_dispo == 0) if ($is_dispo == 0)
{ {
return 0; return 0;
} }
else else
{ {
return -1; return -1;
} }
} }
function verif($db, $code) function verif($db, $code)
{ {
$sql = "SELECT code_compta FROM ".MAIN_DB_PREFIX."societe"; $sql = "SELECT code_compta FROM ".MAIN_DB_PREFIX."societe";
$sql .= " WHERE code_compta = '".$code."'"; $sql .= " WHERE code_compta = '".$code."'";
if ($db->query($sql)) $resql=$db->query($sql);
{ if ($resql)
if ($db->num_rows() == 0) {
{ if ($db->num_rows($resql) == 0)
return 0; {
} return 0;
else }
{ else
return -1; {
} return -1;
} }
else }
{ else
return -2; {
} return -2;
}
} }
} }
?> ?>

9
htdocs/product/stats/index.php
View File

@ -156,13 +156,14 @@ $sql = "SELECT p.label, sum(f.qty) as sumf, sum(pr.qty) as sumpr FROM ".MAIN_DB_
$sql.=" left join ".MAIN_DB_PREFIX."facturedet as f on p.rowid = f.fk_product"; $sql.=" left join ".MAIN_DB_PREFIX."facturedet as f on p.rowid = f.fk_product";
$sql.=" left join ".MAIN_DB_PREFIX."propaldet as pr on p.rowid = pr.fk_product"; $sql.=" left join ".MAIN_DB_PREFIX."propaldet as pr on p.rowid = pr.fk_product";
$sql.=" group by p.label"; $sql.=" group by p.label";
if ($db->query($sql)) $resql=$db->query($sql);
if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object( $i); $obj = $db->fetch_object($resql);
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print "<td>".$obj->label."</td>"; print "<td>".$obj->label."</td>";
print "<td>".$obj->sumf."</td>"; print "<td>".$obj->sumf."</td>";
@ -175,7 +176,7 @@ else {
dol_print_error($db); dol_print_error($db);
} }
print "</table>\n"; print "</table>\n";
$db->free(); $db->free($resql);
*/ */

6
htdocs/product/stock/class/entrepot.class.php
View File

@ -331,17 +331,17 @@ class Entrepot extends CommonObject
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;
$i = 0; $i = 0;
$num = $this->db->num_rows(); $num = $this->db->num_rows($result);
if ( $result ) if ( $result )
{ {
while ($i < $num) while ($i < $num)
{ {
$row = $this->db->fetch_row($i); $row = $this->db->fetch_row($result);
$liste[$row[0]] = $row[1]; $liste[$row[0]] = $row[1];
$i++; $i++;
} }
$this->db->free(); $this->db->free($result);
} }
return $liste; return $liste;
} }

8
htdocs/public/donations/donateurs_code.php
View File

@ -53,10 +53,10 @@ $sql = "SELECT d.datedon as datedon, d.nom, d.prenom, d.amount, d.public, d.soci
$sql.= " FROM ".MAIN_DB_PREFIX."don as d"; $sql.= " FROM ".MAIN_DB_PREFIX."don as d";
$sql.= " WHERE d.fk_statut in (2, 3) ORDER BY d.datedon DESC"; $sql.= " WHERE d.fk_statut in (2, 3) ORDER BY d.datedon DESC";
if ( $db->query( $sql) ) $resql=$db->query($sql);
if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
if ($num) if ($num)
{ {
@ -73,7 +73,7 @@ if ( $db->query( $sql) )
$bc[0]='bgcolor="#f0f0f0"'; $bc[0]='bgcolor="#f0f0f0"';
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object( $i); $objp = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print "<TR $bc[$var]>"; print "<TR $bc[$var]>";

2
htdocs/public/members/new.php
View File

@ -91,7 +91,7 @@ if ($_POST["action"] == 'add')
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows($result);
} }
if (!isset($_POST["nom"]) || !isset($_POST["prenom"]) || $_POST["prenom"]=='' || $_POST["nom"]=='') if (!isset($_POST["nom"]) || !isset($_POST["prenom"]) || $_POST["prenom"]=='' || $_POST["nom"]=='')
{ {

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

@ -93,22 +93,20 @@ class CompanyBankAccount
$sql .= " WHERE fk_soc = ".$this->socid; $sql .= " WHERE fk_soc = ".$this->socid;
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
if ($this->db->num_rows() == 0) if ($this->db->num_rows($result) == 0)
{ {
$this->create(); $this->create();
} }
} }
else else
{ {
print $this->db->error(); dol_print_error($this->db);
return 0; return 0;
} }
$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET "; $sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET ";
$sql .= " bank = '" .addslashes($this->bank)."'"; $sql .= " bank = '" .addslashes($this->bank)."'";
$sql .= ",code_banque='".$this->code_banque."'"; $sql .= ",code_banque='".$this->code_banque."'";
$sql .= ",code_guichet='".$this->code_guichet."'"; $sql .= ",code_guichet='".$this->code_guichet."'";
@ -119,11 +117,9 @@ class CompanyBankAccount
$sql .= ",domiciliation='".addslashes($this->domiciliation)."'"; $sql .= ",domiciliation='".addslashes($this->domiciliation)."'";
$sql .= ",proprio = '".addslashes($this->proprio)."'"; $sql .= ",proprio = '".addslashes($this->proprio)."'";
$sql .= ",adresse_proprio = '".addslashes($this->adresse_proprio)."'"; $sql .= ",adresse_proprio = '".addslashes($this->adresse_proprio)."'";
$sql .= " WHERE fk_soc = ".$this->socid; $sql .= " WHERE fk_soc = ".$this->socid;
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
return 1; return 1;

9
htdocs/user/class/user.class.php
View File

@ -923,18 +923,19 @@ class User extends CommonObject
$sql.= " WHERE bydefault = 1"; $sql.= " WHERE bydefault = 1";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
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;
$rd = array(); $rd = array();
while ($i < $num) while ($i < $num)
{ {
$row = $this->db->fetch_row($i); $row = $this->db->fetch_row($resql);
$rd[$i] = $row[0]; $rd[$i] = $row[0];
$i++; $i++;
} }
$this->db->free(); $this->db->free($resql);
} }
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)