diff --git a/htdocs/telephonie/client/fiche.php b/htdocs/telephonie/client/fiche.php index 717f75b3273..066dc8d06db 100644 --- a/htdocs/telephonie/client/fiche.php +++ b/htdocs/telephonie/client/fiche.php @@ -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 'Contrat'; - print 'Agence/FilialeNb Lignes'; + print 'Agence/FilialeNb Lignes'; print "\n"; while ($i < $num) @@ -123,7 +124,9 @@ if ($_GET["id"]) print ''.$obj->ref."\n"; + print ''.$obj->code_client."\n"; print ''.$obj->agence."\n"; + print ''.$obj->ville."\n"; print ''.$obj->cc."\n"; diff --git a/htdocs/telephonie/client/lignes.php b/htdocs/telephonie/client/lignes.php index 17b29767b71..8bcbbb2490a 100644 --- a/htdocs/telephonie/client/lignes.php +++ b/htdocs/telephonie/client/lignes.php @@ -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 'Ligne'; - print 'Agence/FilialeStatutRemise LMN'; - print 'Fournisseur'; + print 'Agence/Filiale'; + print 'Remise LMN'; + print 'Fournisseur'; print "\n"; while ($i < $num) { - $obj = $db->fetch_object($i); + $obj = $db->fetch_object($resql); $var=!$var; print ""; @@ -131,8 +137,9 @@ if ($_GET["id"]) print ''.dolibarr_print_phone($obj->ligne)."\n"; + print ''.$obj->code_client."\n"; print ''.$obj->agence."\n"; - print ''.$ligne->statuts[$obj->statut]."\n"; + print ''.$obj->ville."\n"; print ''.$obj->remise." %\n"; print "".$obj->fournisseur."\n"; @@ -140,7 +147,7 @@ if ($_GET["id"]) $i++; } } - $db->free(); + $db->free($resql); } else