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

bug #16672 : Problme d'affichage de la liste des Prospects

Browse Source
This commit is contained in:
Laurent Destailleur 2006-05-25 19:36:17 +00:00
parent cafd5064ab
commit 372e93d622
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/comm/prospect/prospects.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -50,12 +50,10 @@ $stcomm=isset($_GET["stcomm"])?$_GET["stcomm"]:$_POST["stcomm"];
$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
$page=isset($_GET["page"])?$_GET["page"]:$_POST["page"]; $page=isset($_GET["page"])?$_GET["page"]:$_POST["page"];
if ($page == -1) { $page = 0 ; }
if (! $sortorder) $sortorder="ASC"; if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="s.nom"; if (! $sortfield) $sortfield="s.nom";
$page = $user->page_param["page"];
if ($page == -1) { $page = 0 ; }
$offset = $conf->liste_limit * $page ; $offset = $conf->liste_limit * $page ;
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
@ -86,9 +84,9 @@ $sql .= " LEFT join ".MAIN_DB_PREFIX."c_departements as d on d.rowid = s.fk_depa
$sql .= " WHERE s.fk_stcomm = st.id AND s.client=2"; $sql .= " WHERE s.fk_stcomm = st.id AND s.client=2";
if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id; if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
if (isset($_GET["stcomm"])) if (isset($stcomm))
{ {
$sql .= " AND s.fk_stcomm=".$_GET["stcomm"]; $sql .= " AND s.fk_stcomm=".$stcomm;
} }
if ($user->societe_id) if ($user->societe_id)
@ -132,10 +130,9 @@ if ($resql)
llxHeader(); llxHeader();
} }
$urladd="page=$page";
if (isset($stcomm)) $urladd.="&amp;stcomm=".$stcomm; if (isset($stcomm)) $urladd.="&amp;stcomm=".$stcomm;
print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"],'&amp;stcomm='.$_GET["stcomm"],$sortfield,$sortorder,'',$num); print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"],$urladd,$sortfield,$sortorder,'',$num);
$i = 0; $i = 0;