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

Problem with agregate function and "group by" with postgresql

Browse Source
This commit is contained in:
Regis Houssin 2010-04-16 17:21:53 +00:00
parent 567b3d08e5
commit daa8609cb5
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/compta/facture.php
View File

@ -2088,8 +2088,6 @@ else
{ {
if ($mesg) print $mesg.'<br>'; if ($mesg) print $mesg.'<br>';
$facstatic = new Facture($db);
$fac = new Facture($db); $fac = new Facture($db);
$result=$fac->fetch($id,$ref); $result=$fac->fetch($id,$ref);
if ($result > 0) if ($result > 0)
@ -3710,7 +3708,7 @@ else
if (! $sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid'; if (! $sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as fd ON fd.fk_facture = f.rowid'; if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as fd ON fd.fk_facture = f.rowid';
$sql.= ' WHERE f.fk_soc = s.rowid'; $sql.= ' WHERE f.fk_soc = s.rowid';
$sql.= " AND s.entity = ".$conf->entity; $sql.= " AND f.entity = ".$conf->entity;
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid) $sql.= ' AND s.rowid = '.$socid; if ($socid) $sql.= ' AND s.rowid = '.$socid;
if ($_GET['filtre']) if ($_GET['filtre'])
@ -3724,11 +3722,11 @@ else
} }
if ($_GET['search_ref']) if ($_GET['search_ref'])
{ {
$sql.= ' AND f.facnumber like \'%'.addslashes(trim($_GET['search_ref'])).'%\''; $sql.= ' AND f.facnumber LIKE \'%'.addslashes(trim($_GET['search_ref'])).'%\'';
} }
if ($_GET['search_societe']) if ($_GET['search_societe'])
{ {
$sql.= ' AND s.nom like \'%'.addslashes(trim($_GET['search_societe'])).'%\''; $sql.= ' AND s.nom LIKE \'%'.addslashes(trim($_GET['search_societe'])).'%\'';
} }
if ($_GET['search_montant_ht']) if ($_GET['search_montant_ht'])
{ {
@ -3751,11 +3749,11 @@ else
} }
if ($_POST['sf_ref']) if ($_POST['sf_ref'])
{ {
$sql.= ' AND f.facnumber like \'%'.addslashes(trim($_POST['sf_ref'])) . '%\''; $sql.= ' AND f.facnumber LIKE \'%'.addslashes(trim($_POST['sf_ref'])) . '%\'';
} }
if ($sall) if ($sall)
{ {
$sql.= ' AND (s.nom like \'%'.addslashes($sall).'%\' OR f.facnumber like \'%'.addslashes($sall).'%\' OR f.note like \'%'.addslashes($sall).'%\' OR fd.description like \'%'.addslashes($sall).'%\')'; $sql.= ' AND (s.nom LIKE \'%'.addslashes($sall).'%\' OR f.facnumber LIKE \'%'.addslashes($sall).'%\' OR f.note LIKE \'%'.addslashes($sall).'%\' OR fd.description LIKE \'%'.addslashes($sall).'%\')';
} }
$sql.= ' GROUP BY f.rowid'; $sql.= ' GROUP BY f.rowid';