From 29ed5e9f4bc976813e19eaf9155ddd4f1d3f4284 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Jan 2005 19:21:47 +0000 Subject: [PATCH] =?UTF-8?q?New:=20Ajout=20d'un=20visuel=20sp=E9cifique=20p?= =?UTF-8?q?our=20les=20liens=20"contacts"=20et=20"soci=E9t=E9s".?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/clients.php | 6 +++--- htdocs/comm/contact.php | 28 ++++++++++++++-------------- htdocs/comm/fiche.php | 8 ++++---- htdocs/comm/prospect/prospects.php | 10 +++++----- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php index b160d4066b2..562684b7f56 100644 --- a/htdocs/comm/clients.php +++ b/htdocs/comm/clients.php @@ -130,9 +130,9 @@ if ($result) $var=!$var; print ""; - print ''; - print img_file(); - print " idp\">".stripslashes($obj->nom)."\n"; + print ''; + print img_object($langs->trans("ShowCustomer"),"company"); + print ' '.stripslashes($obj->nom).''; print "".$obj->code_client." \n"; print "".$obj->ville." \n"; print ''; diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 88333cb5ecf..60b9c9829c7 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -39,10 +39,10 @@ $user->getrights('commande'); $user->getrights('projet'); -llxHeader('','Contacts Clients'); +llxHeader('','Contacts'); -$sortorder=$_GET["sortorder"]; -$sortfield=$_GET["sortfield"]; +$sortfield=isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; +$sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; $page=$_GET["page"]; $socid=$_GET["socid"]; @@ -59,14 +59,14 @@ if ($user->societe_id > 0) } -if ($sortorder == "") -{ - $sortorder="ASC"; -} -if ($sortfield == "") +if (! $sortfield) { $sortfield="p.name"; } +if (! $sortorder) +{ + $sortorder="ASC"; +} if ($page == -1) { $page = 0 ; } $limit = $conf->liste_limit; @@ -133,10 +133,10 @@ if (trim($_GET["search_societe"])) $sql .= " AND s.nom like '%".trim($_GET["search_societe"])."%'"; } -if ($_GET[contactname]) // acces a partir du module de recherche +if ($_GET["contactname"]) // acces a partir du module de recherche { - $sql .= " AND ( lower(p.name) like '%".strtolower($_GET[contactname])."%' OR lower(p.firstname) like '%".strtolower($_GET[contactname])."%') "; - $sortfield = "lower(p.name)"; + $sql .= " AND ( p.name like '%".strtolower($_GET[contactname])."%' OR lower(p.firstname) like '%".strtolower($_GET[contactname])."%') "; + $sortfield = "p.name"; $sortorder = "ASC"; } @@ -155,9 +155,9 @@ if ($result) print ''; print ''; - print_liste_field_titre($langs->trans("Lastname"),"contact.php","lower(p.name)", $begin,"&type=$type","",$sortfield); - print_liste_field_titre($langs->trans("Firstname"),"contact.php","lower(p.firstname)", $begin,"&type=$type","",$sortfield); - print_liste_field_titre($langs->trans("Company"),"contact.php","lower(s.nom)", $begin,"&type=$type","",$sortfield); + print_liste_field_titre($langs->trans("Lastname"),"contact.php","p.name", $begin,"&type=$type","",$sortfield); + print_liste_field_titre($langs->trans("Firstname"),"contact.php","p.firstname", $begin,"&type=$type","",$sortfield); + print_liste_field_titre($langs->trans("Company"),"contact.php","s.nom", $begin,"&type=$type","",$sortfield); print ''; print ''; print "\n"; diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 9f9ea89f469..e9e0e95e9b5 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -501,12 +501,12 @@ if ($_socid > 0) print img_object($langs->trans("Show"),"contact"); print ' '.$obj->firstname.' '. $obj->name.' '; - if ($obj->note) + if (trim($obj->note)) { - print "
".nl2br($obj->note); + print '
'.nl2br(trim($obj->note)); } - print ""; - print ""; + print ''; + print ''; print '"; - print '"; + print ''; print ""; print ""; print "";
'.$langs->trans("Email").''.$langs->trans("Phone").'
$obj->poste '.$obj->poste.' '; /* diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php index afbd6e965df..895668ac528 100644 --- a/htdocs/comm/prospect/prospects.php +++ b/htdocs/comm/prospect/prospects.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * 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 @@ -118,7 +118,7 @@ if ($result) $urladd="page=$page&stcomm=$stcomm"; - print_barre_liste($langs->trans("ProspectList"), $page, "prospects.php",'&stcomm='.$_GET["stcomm"],"","",'',$num); + print_barre_liste($langs->trans("ListOfProspects"), $page, "prospects.php",'&stcomm='.$_GET["stcomm"],"","",'',$num); $i = 0; @@ -151,9 +151,9 @@ if ($result) $var=!$var; print "
'; - print img_file(); - print " idp\">$obj->nom'; + print img_object($langs->trans("ShowProspect"),"company"); + print ' '.$obj->nom.'".$obj->ville." $obj->departement".$obj->stcomm."