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 '';
+print '
';
print '';
@@ -238,8 +242,8 @@ if ($result)
print '';
print '';
- 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 "";
print "| Cout fixe | ";
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 '';
print '';
-$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 '';
print '';
- print "| Grille | ";
+ print "Grille | Type | ";
print " \n";
$var=True;
@@ -72,7 +72,7 @@ if ($result)
print "";
print '| '.$obj->tarif_desc." | \n";
-
+ print ''.$obj->type_tarif." | \n";
print " \n";
$i++;
}
@@ -87,7 +87,7 @@ else
print ' ';
-//print ' Tableur des tarifs d\'achats comparés';
+print ' Tableur des tarifs d\'achats comparés';
$db->close();
| |