Mise jour des noms de tables

This commit is contained in:
Rodolphe Quiedeville 2003-05-25 16:38:10 +00:00
parent 55d0b0e8d3
commit d29346aac2
3 changed files with 12 additions and 9 deletions

View File

@ -64,7 +64,7 @@ if ($action == 'create') {
*/
if ($sortfield == "")
{
$sortfield="lower(p.label)";
$sortfield="lower(s.nom)";
}
if ($sortorder == "")
{
@ -87,7 +87,7 @@ $pagenext = $page + 1;
print "<P>";
$sql = "SELECT s.nom, s.idp, p.rowid as projectid, p.ref, p.title,".$db->pdate("p.dateo")." as do";
$sql .= " FROM societe as s, llx_projet as p";
$sql .= " FROM llx_societe as s, llx_projet as p";
$sql .= " WHERE p.fk_soc = s.idp";
if ($socidp)
@ -95,6 +95,8 @@ if ($socidp)
$sql .= " AND s.idp = $socidp";
}
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $offset);
if ( $db->query($sql) )
{
$num = $db->num_rows();
@ -103,10 +105,11 @@ if ( $db->query($sql) )
print '<TR class="liste_titre">';
print "<TD>";
print_liste_field_titre("Société",$PHP_SELF,"s.nom");
print_liste_field_titre("Titre",$PHP_SELF,"p.title");
print "</td>";
print "<TD>Réf</TD><td>Titre</td>";
print "</TR>\n";
print "<TD>Réf</TD><td>";
print_liste_field_titre("Société",$PHP_SELF,"s.nom");
print "</td></TR>\n";
while ($i < $num)
{
@ -114,9 +117,9 @@ if ( $db->query($sql) )
$var=!$var;
print "<TR $bc[$var]>";
print "<TD><a href=\"../fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
print "<TD><a href=\"fiche.php3?id=$objp->projectid\">$objp->ref</a></TD>\n";
print "<TD><a href=\"fiche.php3?id=$objp->projectid\">$objp->title</a></TD>\n";
print "<TD><a href=\"fiche.php3?id=$objp->projectid\">$objp->ref</a></TD>\n";
print "<TD><a href=\"../fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
print "</TR>\n";
$i++;

View File

@ -169,7 +169,7 @@ print "</table><br>";
*
*/
$sql = "SELECT s.idp, s.nom,b.rowid as bid";
$sql .= " FROM societe as s, llx_bookmark as b";
$sql .= " FROM llx_societe as s, llx_bookmark as b";
$sql .= " WHERE b.fk_soc = s.idp AND b.fk_user = ".$user->id;
$sql .= " ORDER BY lower(s.nom) ASC";

View File

@ -44,7 +44,7 @@ if ($sortfield == "")
print_titre("Liste des fiches d'intervention");
$sql = "SELECT s.nom,s.idp, f.ref,".$db->pdate("f.datei")." as dp, f.rowid as fichid, f.fk_statut, f.duree";
$sql .= " FROM societe as s, llx_fichinter as f ";
$sql .= " FROM llx_societe as s, llx_fichinter as f ";
$sql .= " WHERE f.fk_soc = s.idp ";
if ($user->societe_id > 0) {