From 54ed2d2c77cb10f09afe27452ee2abd5a4a59f0d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 3 Jun 2006 16:04:32 +0000
Subject: [PATCH] =?UTF-8?q?Qual:=20Suppression=20des=20propri=E9t=E9s=20no?=
 =?UTF-8?q?m=5Furl=20au=20profit=20de=20la=20methode=20getNomUrl.=20Ce=20q?=
 =?UTF-8?q?ui=20permet=20de=20passer=20en=20parametre=20si=20on=20veut=20e?=
 =?UTF-8?q?n=20plus=20le=20picto=20ou=20non=20dans=20le=20lien?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/facture.php         | 7 +++----
 htdocs/compta/facture/apercu.php  | 3 +--
 htdocs/compta/facture/contact.php | 9 ++++-----
 htdocs/compta/facture/note.php    | 5 ++---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index e43db825994..491a4e59075 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -742,7 +742,7 @@ if ($_GET['action'] == 'create')
 	print '</tr>';
 
 	// Ligne info remises tiers
-    print '<tr><td>'.$langs->trans('Info').'</td><td colspan="2">';
+    print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="2">';
 	if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
 	else print $langs->trans("CompanyHasNoRelativeDiscount");
 	$absolute_discount=$soc->getCurrentDiscount();
@@ -1337,12 +1337,11 @@ else
 
 			// Société
 			print '<tr><td>'.$langs->trans('Company').'</td>';
-			print '<td colspan="5">';
-			print '<a href="fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
+			print '<td colspan="5">'.$soc->getNomUrl(1,'compta').'</td>';
 			print '</tr>';
 
 			// Ligne info remises tiers
-            print '<tr><td>'.$langs->trans('Info').'</td><td colspan="5">';
+            print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="5">';
 			if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
 			else print $langs->trans("CompanyHasNoRelativeDiscount");
 			$absolute_discount=$soc->getCurrentDiscount();
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index 4654bc69371..13111f41971 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -89,8 +89,7 @@ if ($_GET["facid"] > 0)
 
 		// Societe
         print '<tr><td>'.$langs->trans("Company").'</td>';
-        print '<td colspan="5">';
-        print '<a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
+        print '<td colspan="5">'.$soc->getNomUrl(1,'compta').'</td>';
         print '</tr>';
 
         // Dates
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index a5b7d9f36ab..68bfda4fcce 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2005 Patrick Rouillon     <patrick@rouillon.net>
- * Copyright (C) 2005 Destailleur Laurent  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005      Patrick Rouillon     <patrick@rouillon.net>
+ * Copyright (C) 2005-2006 Destailleur Laurent  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -233,7 +233,7 @@ if ($id > 0)
 		print '<table class="border" width="100%">';
 
 		// Reference du facture
-		print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td colspan="3">';
+		print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
 		print $facture->ref;
 		print "</td></tr>";
 
@@ -242,8 +242,7 @@ if ($id > 0)
 			$facture->fetch_client();
 			
 		print "<tr><td>".$langs->trans("Company")."</td>";
-		print '<td colspan="3">';
-		print '<b><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$facture->client->id.'">'.$facture->client->nom.'</a></b></td></tr>';
+		print '<td colspan="3">'.$facture->client->getNomUrl(1,'compta').'</td></tr>';
 		print "</table>";
 
 		print '</div>';
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 50b367c1358..265746e507b 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -113,12 +113,11 @@ if ($_GET["facid"])
     print '<table class="border" width="100%">';
 
     // Reference
-	print '<tr><td width="20%">'.$langs->trans('Ref').'</td><td colspan="3">'.$fac->ref.'</td></tr>';
+	print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">'.$fac->ref.'</td></tr>';
 
     // Société
     print '<tr><td>'.$langs->trans("Company").'</td>';
-    print '<td colspan="3">';
-    print '<a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
+    print '<td colspan="3">'.$soc->getNomUrl(1,'compta').'</td>';
 
 	// Note publique
     print '<tr><td valign="top">'.$langs->trans("NotePublic").' :</td>';