From 768f20aa09405a2e87eeb3ec0c394e22ccf79d64 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Thu, 29 Mar 2007 13:13:24 +0000
Subject: [PATCH] Cosmetique

---
 htdocs/telephonie/tarifs/grille.php  | 8 ++++++--
 htdocs/telephonie/tarifs/grilles.php | 8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/telephonie/tarifs/grille.php b/htdocs/telephonie/tarifs/grille.php
index 00dfda96860..5b4160768cb 100644
--- a/htdocs/telephonie/tarifs/grille.php
+++ b/htdocs/telephonie/tarifs/grille.php
@@ -184,6 +184,10 @@ if ($resql)
 print '</table>';
 
 
+print '<br><table width="100%" class="border">';
+print '<tr><td>Export :</td></tr>';
+print '<tr><td>- <a href="grille-export.php?id='.$_GET["id"].'">fichier format tableur</a></td></tr>';
+print '</table>';
 
 print '</td><td valign="top" width="70%">';
 
@@ -238,8 +242,8 @@ if ($result)
   print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
   print '<tr class="liste_titre">';
 
-  print_liste_field_titre("Tarif","grille.php","d.libelle");
-  print_liste_field_titre("Destination","grille.php","t.libelle", "&type=".$_GET["type"]);
+  print_liste_field_titre("Grille","grille.php","d.libelle");
+  print_liste_field_titre("Tarif","grille.php","t.libelle", "&type=".$_GET["type"]);
   print_liste_field_titre("Cout / min","grille.php","temporel", "&type=".$_GET["type"]);
   print "</td>";
   print "<td>Cout fixe</td>";
diff --git a/htdocs/telephonie/tarifs/grilles.php b/htdocs/telephonie/tarifs/grilles.php
index d8d83b2ed0f..d6f8d358d1c 100644
--- a/htdocs/telephonie/tarifs/grilles.php
+++ b/htdocs/telephonie/tarifs/grilles.php
@@ -41,7 +41,7 @@ if ($user->societe_id > 0)
 print '<table width="100%" class="noborder">';
 print '<tr><td valign="top" width="50%">';
 
-$sql = "SELECT d.libelle as tarif_desc, d.rowid";
+$sql = "SELECT d.libelle as tarif_desc, d.rowid, d.type_tarif";
 
 $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_tarif_grille as d";
 $sql .= ","    . MAIN_DB_PREFIX."telephonie_tarif_grille_rights as r";
@@ -60,7 +60,7 @@ if ($result)
   
   print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
   print '<tr class="liste_titre">';
-  print "<td>Grille</td>";
+  print "<td>Grille</td><td>Type</td>";
   print "</tr>\n";
 
   $var=True;
@@ -72,7 +72,7 @@ if ($result)
 
       print "<tr $bc[$var]>";
       print '<td><a href="grille.php?id='.$obj->rowid.'">'.$obj->tarif_desc."</a></td>\n";
-
+      print '<td>'.$obj->type_tarif."</td>\n";
       print "</tr>\n";
       $i++;
     }
@@ -87,7 +87,7 @@ else
 print '</td></tr></table>';
 
 
-//print '<br>Tableur des <a href="grille-export-achat.php">tarifs d\'achats comparés</a>';
+print '<br>Tableur des <a href="grille-export-achat.php">tarifs d\'achats comparés</a>';
 
 $db->close();