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

New: Ajout d'un visuel spcifique pour les liens "contacts" et "socits".

Browse Source
This commit is contained in:
Laurent Destailleur 2005-01-30 19:21:47 +00:00
parent 084c520352
commit 29ed5e9f4b
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/clients.php
View File

@ -130,9 +130,9 @@ if ($result)
$var=!$var;
print "<tr $bc[$var]>";
print '<td><a href="fiche.php?socid='.$obj->idp.'">';
print img_file();
print "</a>&nbsp;<a href=\"fiche.php?socid=$obj->idp\">".stripslashes($obj->nom)."</A></td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">';
print img_object($langs->trans("ShowCustomer"),"company");
print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">'.stripslashes($obj->nom).'</a></td>';
print "<td>".$obj->code_client."&nbsp;</td>\n";
print "<td>".$obj->ville."&nbsp;</td>\n";
print '<td align="center"><a href="'.DOL_URL_ROOT.'/dossier/client/fiche.php?id='.$obj->idp.'">';

28
htdocs/comm/contact.php
View File

@ -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 '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Lastname"),"contact.php","lower(p.name)", $begin,"&amp;type=$type","",$sortfield);
print_liste_field_titre($langs->trans("Firstname"),"contact.php","lower(p.firstname)", $begin,"&amp;type=$type","",$sortfield);
print_liste_field_titre($langs->trans("Company"),"contact.php","lower(s.nom)", $begin,"&amp;type=$type","",$sortfield);
print_liste_field_titre($langs->trans("Lastname"),"contact.php","p.name", $begin,"&amp;type=$type","",$sortfield);
print_liste_field_titre($langs->trans("Firstname"),"contact.php","p.firstname", $begin,"&amp;type=$type","",$sortfield);
print_liste_field_titre($langs->trans("Company"),"contact.php","s.nom", $begin,"&amp;type=$type","",$sortfield);
print '<td>'.$langs->trans("Email").'</td>';
print '<td>'.$langs->trans("Phone").'</td>';
print "</tr>\n";

8
htdocs/comm/fiche.php
View File

@ -501,12 +501,12 @@ if ($_socid > 0)
print img_object($langs->trans("Show"),"contact");
print '&nbsp;'.$obj->firstname.' '. $obj->name.'</a>&nbsp;';
if ($obj->note)
if (trim($obj->note))
{
print "<br>".nl2br($obj->note);
print '<br>'.nl2br(trim($obj->note));
}
print "</td>";
print "<td>$obj->poste&nbsp;</td>";
print '</td>';
print '<td>'.$obj->poste.'&nbsp;</td>';
print '<td>';
/*

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

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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&amp;stcomm=$stcomm";
print_barre_liste($langs->trans("ProspectList"), $page, "prospects.php",'&amp;stcomm='.$_GET["stcomm"],"","",'',$num);
print_barre_liste($langs->trans("ListOfProspects"), $page, "prospects.php",'&amp;stcomm='.$_GET["stcomm"],"","",'',$num);
$i = 0;
@ -151,9 +151,9 @@ if ($result)
$var=!$var;
print "<tr $bc[$var]>";
print '<td width="35%"><a href="fiche.php?id='.$obj->idp.'">';
print img_file();
print "</a>&nbsp;<a href=\"fiche.php?id=$obj->idp\">$obj->nom</A></td>";
print '<td width="35%"><a href="'.DOL_URL_ROOT.'/comm/prospect/fiche.php?id='.$obj->idp.'">';
print img_object($langs->trans("ShowProspect"),"company");
print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/comm/prospect/fiche.php?id='.$obj->idp.'">'.$obj->nom.'</a></td>';
print "<td>".$obj->ville."&nbsp;</td>";
print "<td align=\"center\">$obj->departement</td>";
print "<td align=\"center\">".$obj->stcomm."</td>";