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

Ajout code agence et ville

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2005-04-12 08:49:49 +00:00
parent 151cd6fbb4
commit 14bb4ba213
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/telephonie/client/fiche.php
View File

@ -87,7 +87,8 @@ if ($_GET["id"])
/* Lignes */
$sql = "SELECT count(l.rowid) as cc, c.rowid, c.ref, ss.nom as agence";
$sql = "SELECT count(l.rowid) as cc, c.rowid, c.ref";
$sql .= ", ss.nom as agence, ss.code_client, ss.ville";
$sql .= " FROM ".MAIN_DB_PREFIX."telephonie_societe_ligne as l";
$sql .= " , ".MAIN_DB_PREFIX."telephonie_contrat as c";
$sql .= " , ".MAIN_DB_PREFIX."societe as ss";
@ -106,7 +107,7 @@ if ($_GET["id"])
$ligne = new LigneTel($db);
print '<tr class="liste_titre"><td width="15%" valign="center">Contrat';
print '</td><td>Agence/Filiale</td><td align="center">Nb Lignes</td>';
print '</td><td colspan="3">Agence/Filiale</td><td align="center">Nb Lignes</td>';
print "</tr>\n";
while ($i < $num)
@ -123,7 +124,9 @@ if ($_GET["id"])
print '<a href="'.DOL_URL_ROOT.'/telephonie/contrat/fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
print '<td>'.$obj->code_client."</td>\n";
print '<td>'.$obj->agence."</td>\n";
print '<td>'.$obj->ville."</td>\n";
print '<td align="center">'.$obj->cc."</td>\n";

23
htdocs/telephonie/client/lignes.php
View File

@ -92,17 +92,22 @@ if ($_GET["id"])
/* Lignes */
$sql = "SELECT s.idp as socidp, s.nom, l.ligne, f.nom as fournisseur, l.statut, l.rowid, l.remise, ss.nom as agence";
$sql = "SELECT s.idp as socidp, f.nom as fournisseur, s.nom";
$sql .= ", ss.nom as agence, ss.ville, ss.code_client";
$sql .= " , l.ligne, l.statut, l.rowid, l.remise";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."telephonie_societe_ligne as l";
$sql .= " , ".MAIN_DB_PREFIX."societe as ss";
$sql .= " , ".MAIN_DB_PREFIX."telephonie_fournisseur as f";
$sql .= " WHERE l.fk_client_comm = s.idp AND l.fk_fournisseur = f.rowid";
$sql .= " AND l.fk_soc = ss.idp ";
$sql .= " AND s.idp = ".$soc->id;
$sql .= " ORDER BY ss.idp ASC";
$resql = $db->query($sql);
if ( $db->query( $sql) )
if ($resql)
{
$num = $db->num_rows();
$num = $db->num_rows($resql);
if ( $num > 0 )
{
$i = 0;
@ -110,14 +115,15 @@ if ($_GET["id"])
$ligne = new LigneTel($db);
print '<tr class="liste_titre"><td width="15%" valign="center">Ligne';
print '</td><td>Agence/Filiale</td><td align="center">Statut</td><td align="center">Remise LMN';
print '</td><td>Fournisseur</td>';
print '</td><td colspan="3">Agence/Filiale</td>';
print '<td align="center">Remise LMN</td>';
print '<td>Fournisseur</td>';
print "</tr>\n";
while ($i < $num)
{
$obj = $db->fetch_object($i);
$obj = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]><td>";
@ -131,8 +137,9 @@ if ($_GET["id"])
print '<a href="'.DOL_URL_ROOT.'/telephonie/ligne/fiche.php?id='.$obj->rowid.'">'.dolibarr_print_phone($obj->ligne)."</a></td>\n";
print '<td>'.$obj->code_client."</td>\n";
print '<td>'.$obj->agence."</td>\n";
print '<td align="center">'.$ligne->statuts[$obj->statut]."</td>\n";
print '<td>'.$obj->ville."</td>\n";
print '<td align="center">'.$obj->remise." %</td>\n";
print "<td>".$obj->fournisseur."</td>\n";
@ -140,7 +147,7 @@ if ($_GET["id"])
$i++;
}
}
$db->free();
$db->free($resql);
}
else