From 2df0ed3c051710f68432fb3cb17ae6c906cc4ac0 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Thu, 29 Mar 2007 20:27:01 +0000
Subject: [PATCH] Comestic

---
 htdocs/telephonie/tarifs/config/index.php   |  4 ++--
 htdocs/telephonie/tarifs/config/pre.inc.php |  5 +----
 htdocs/telephonie/tarifs/config/tarif.php   | 15 ++++++---------
 htdocs/telephonie/tarifs/config/tarifs.php  |  6 +++---
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/htdocs/telephonie/tarifs/config/index.php b/htdocs/telephonie/tarifs/config/index.php
index 0345b28a055..7b282deb039 100644
--- a/htdocs/telephonie/tarifs/config/index.php
+++ b/htdocs/telephonie/tarifs/config/index.php
@@ -117,9 +117,9 @@ if ($resql)
   print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
   print '<tr class="liste_titre">';
 
-  print_liste_field_titre("Tarif","index.php","d.libelle");
+  print_liste_field_titre("Grille","index.php","d.libelle");
 
-  print_liste_field_titre("Destination","index.php","t.libelle", "&type=".$_GET["type"]);
+  print_liste_field_titre("Tarif","index.php","t.libelle", "&type=".$_GET["type"]);
 
   print_liste_field_titre("Cout / min","index.php","temporel", "&type=".$_GET["type"]);
   print "</td>";
diff --git a/htdocs/telephonie/tarifs/config/pre.inc.php b/htdocs/telephonie/tarifs/config/pre.inc.php
index 5aa4c8fab9f..2a1a1ffac1d 100644
--- a/htdocs/telephonie/tarifs/config/pre.inc.php
+++ b/htdocs/telephonie/tarifs/config/pre.inc.php
@@ -68,10 +68,7 @@ function llxHeader($head = "", $title="") {
   $menu->add_submenu(DOL_URL_ROOT."/telephonie/tarifs/config/prefixs.php", "Prefixs");
 
   if ($user->rights->telephonie->tarif->permission)
-    $menu->add_submenu(DOL_URL_ROOT."/telephonie/tarifs/permissions.php", "Permissions");
-
-  if ($user->rights->telephonie->tarif->permission)
-    $menu->add_submenu(DOL_URL_ROOT."/telephonie/tarifs/config/", "Configuration");
+    $menu->add_submenu(DOL_URL_ROOT."/telephonie/tarifs/config/permissions.php", "Permissions");
 
   if ($user->rights->telephonie->fournisseur->lire)
     $menu->add(DOL_URL_ROOT."/telephonie/fournisseurs.php", "Fournisseurs");
diff --git a/htdocs/telephonie/tarifs/config/tarif.php b/htdocs/telephonie/tarifs/config/tarif.php
index 9f2af75a0cf..1d4ef793e0f 100644
--- a/htdocs/telephonie/tarifs/config/tarif.php
+++ b/htdocs/telephonie/tarifs/config/tarif.php
@@ -23,6 +23,8 @@ require("./pre.inc.php");
 
 require_once DOL_DOCUMENT_ROOT."/telephonie/telephonie.tarif.class.php";
 require_once DOL_DOCUMENT_ROOT."/telephonie/telephonie.tarif.prefix.class.php";
+$ta = new TelephonieTarif($db,1,0);
+$ta->fetch($_GET["id"]);
 $tp = new TelephonieTarifPrefix($db);
 
 if ($_POST["action"] == 'add_prefix')
@@ -38,6 +40,7 @@ llxHeader();
  * Mode Liste
  *
  */
+print_titre($ta->libelle);
 print '<table width="100%" class="noborder"><tr><td valign="top" width="70%">';
 
 $sql = "SELECT d.libelle as tarif_desc, d.type_tarif, d.rowid";
@@ -67,7 +70,7 @@ if ($resql)
   print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
   print '<tr class="liste_titre">';
   print '<td width="25%">Grille</td>';
-  print '<td width="30%">Destination</td>';
+  print '<td width="30%">Tarif</td>';
   print '<td width="15%">Cout / min</td>';
   print '<td width="15%">Cout fixe</td>';
   print '<td width="15%">Type</td>';
@@ -127,7 +130,7 @@ if ($resql)
   print '<tr class="liste_titre">';
 
   print '<td width="25%">Grille</td>';
-  print '<td width="30%">Destination</td>';
+  print '<td width="30%">Tarif</td>';
   print '<td width="15%">Cout / min</td>';
   print '<td width="15%">Cout fixe</td>';
   print '<td width="15%">Type</td>';
@@ -215,7 +218,7 @@ if ($tp->tarif_id > 0)
   print '<td><input type="checkbox" name="force"></td></tr>';
 }
 
-print '<tr><td align="center"><input class="button" value="'.$langs->trans("Create").'" type="submit"></td></tr>';
+print '<tr><td align="center"><input class="button" value="'.$langs->trans("Add").'" type="submit"></td></tr>';
 
 print '</table></form>';
 
@@ -238,14 +241,8 @@ if ($tp->tarif_id > 0)
  
 }
 
-
-
 print '</td></tr></table>';
 
-
-
-
-
 $db->close();
 
 llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
diff --git a/htdocs/telephonie/tarifs/config/tarifs.php b/htdocs/telephonie/tarifs/config/tarifs.php
index f76991dc73d..8879b6d557a 100644
--- a/htdocs/telephonie/tarifs/config/tarifs.php
+++ b/htdocs/telephonie/tarifs/config/tarifs.php
@@ -74,7 +74,7 @@ print '</table></form>';
 print '<br> <table width="100%" class="noborder">';
 print '<tr><td valign="top" width="50%">';
 
-$sql = "SELECT tt.libelle as tarif_desc, tt.rowid";
+$sql = "SELECT tt.libelle as tarif_desc, tt.rowid, tt.type";
 $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_tarif as tt";
 $sql .= " ORDER BY tt.libelle;";
 
@@ -86,7 +86,7 @@ if ($result)
   
   print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
   print '<tr class="liste_titre">';
-  print "<td>Tarifs</td>";
+  print "<td>Tarifs</td><td>Type</td>";
   print "</tr>\n";
 
   $var=True;
@@ -98,7 +98,7 @@ if ($result)
 
       print "<tr $bc[$var]>";
       print '<td><a href="tarif.php?id='.$obj->rowid.'">'.$obj->tarif_desc."</a></td>\n";
-
+      print '<td>'.$obj->type."</td>\n";
       print "</tr>\n";
       $i++;
     }