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

Works on multicompany module

Browse Source 
Fix: uniformize code
This commit is contained in:
Regis Houssin 2009-11-07 10:49:52 +00:00
parent 3428bba405
commit 4cb3c5641a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,7 +217,7 @@ class AdherentType extends CommonObject
$sql = "SELECT rowid, libelle"; $sql = "SELECT rowid, libelle";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type";
$sql.= "WHERE entity = ".$conf->entity; $sql.= " WHERE entity = ".$conf->entity;
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)

5
htdocs/adherents/liste.php
View File

@ -77,6 +77,7 @@ $sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
$sql.= " t.libelle as type, t.cotisation"; $sql.= " t.libelle as type, t.cotisation";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t";
$sql.= " WHERE d.fk_adherent_type = t.rowid "; $sql.= " WHERE d.fk_adherent_type = t.rowid ";
$sql.= " AND d.entity = ".$conf->entity;
if ($sall) if ($sall)
{ {
$sql.=" AND (d.prenom like '%".$sall."%' OR d.nom like '%".$sall."%' OR d.societe like '%".$sall."%'"; $sql.=" AND (d.prenom like '%".$sall."%' OR d.nom like '%".$sall."%' OR d.societe like '%".$sall."%'";
@ -89,7 +90,7 @@ if ($_REQUEST["type"] > 0)
} }
if (isset($_GET["statut"])) if (isset($_GET["statut"]))
{ {
$sql.=" AND d.statut in ($statut)"; // Peut valoir un nombre ou liste de nombre s<EFBFBD>par<EFBFBD>s par virgules $sql.=" AND d.statut in ($statut)"; // Peut valoir un nombre ou liste de nombre separes par virgules
} }
if ( $_POST["action"] == 'search') if ( $_POST["action"] == 'search')
{ {
@ -121,7 +122,7 @@ if ($filter == 'outofdate')
$nbtotalofrecords = 0; $nbtotalofrecords = 0;
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{ {
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) $nbtotalofrecords = $db->num_rows($result); if ($resql) $nbtotalofrecords = $db->num_rows($result);
else dol_print_error($db); else dol_print_error($db);
} }