From 1c067482fc4efebb156c7cf08b7fdc4321e82b38 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 30 Sep 2011 13:49:40 +0200 Subject: [PATCH] Fix: bad link --- htdocs/comm/prospect/list.php | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index 832ea49e510..a9600493d98 100755 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * Copyright (C) 2011 Philippe Grand * * This program is free software; you can redistribute it and/or modify @@ -177,16 +177,16 @@ if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as cs"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d on (d.rowid = s.fk_departement)"; $sql.= " WHERE s.fk_stcomm = st.id"; -$sql.= " AND s.client in (2, 3)"; +$sql.= " AND s.client IN (2, 3)"; $sql.= " AND s.entity = ".$conf->entity; if ($user->societe_id) $sql.= " AND s.rowid = " .$user->societe_id; if ($search_sale) $sql.= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale if ($search_categ) $sql.= " AND s.rowid = cs.fk_societe"; // Join for the needed table to filter by categ if (isset($stcomm) && $stcomm != '') $sql.= " AND s.fk_stcomm=".$stcomm; -if ($search_nom) $sql .= " AND s.nom like '%".$db->escape(strtolower($search_nom))."%'"; -if ($search_ville) $sql .= " AND s.ville like '%".$db->escape(strtolower($search_ville))."%'"; -if ($search_departement) $sql .= " AND d.nom like '%".$db->escape(strtolower($search_departement))."%'"; +if ($search_nom) $sql .= " AND s.nom LIKE '%".$db->escape(strtolower($search_nom))."%'"; +if ($search_ville) $sql .= " AND s.ville LIKE '%".$db->escape(strtolower($search_ville))."%'"; +if ($search_departement) $sql .= " AND d.nom LIKE '%".$db->escape(strtolower($search_departement))."%'"; if ($search_datec) $sql .= " AND s.datec LIKE '%".$db->escape($search_datec)."%'"; // Insert levels filters if ($search_levels) @@ -205,7 +205,7 @@ if ($search_categ) } if ($socname) { - $sql .= " AND s.nom like '%".$db->escape($socname)."%'"; + $sql .= " AND s.nom LIKE '%".$db->escape($socname)."%'"; $sortfield = "s.nom"; $sortorder = "ASC"; } @@ -262,7 +262,7 @@ if ($resql) // Print the search-by-sale and search-by-categ filters - print '
'; + print ''; print ''; @@ -289,12 +289,12 @@ if ($resql) } print ''; - print_liste_field_titre($langs->trans("Company"),"prospects.php","s.nom","",$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Town"),"prospects.php","s.ville","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("State"),"prospects.php","s.fk_departement","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateCreation"),"prospects.php","s.datec","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("ProspectLevelShort"),"prospects.php","s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("StatusProsp"),"prospects.php","s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.ville","",$param,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("State"),$_SERVER["PHP_SELF"],"s.fk_departement","",$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("ProspectLevelShort"),$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("StatusProsp"),$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder); print ''; print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$params,'align="right"',$sortfield,$sortorder); print "\n"; @@ -377,11 +377,11 @@ if ($resql) print $prospectstatic->getNomUrl(1,'prospect'); print ''; print ""; - print ""; + print ''; // Creation date - print ""; + print ''; // Level - print ""; // Statut @@ -395,7 +395,7 @@ if ($resql) { if ($value <> $obj->fk_stcomm) { - print ''; + print ''; print img_action(0,$value); print ' '; }
 
".$obj->ville." $obj->departement'.$obj->departement.'".dol_print_date($db->jdate($obj->datec))."'.dol_print_date($db->jdate($obj->datec)).'"; + print ''; print $prospectstatic->LibLevel($obj->fk_prospectlevel); print "