From daa2c673ba25868affaa1e93ffa9fbbb0498b192 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 4 Apr 2006 00:34:51 +0000
Subject: [PATCH] =?UTF-8?q?New:=20Gestion=20des=20avoirs=20=E0=20la=20sais?=
 =?UTF-8?q?ie=20des=20factures?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/fiche.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php
index d05f90bd8aa..f248e9e80de 100644
--- a/htdocs/compta/fiche.php
+++ b/htdocs/compta/fiche.php
@@ -268,18 +268,18 @@ if ($socid > 0)
         // Remise permanente
         print '<tr><td nowrap>';
         print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
-        print $langs->trans("CustomerRelativeDiscount");
+        print $langs->trans("CustomerRelativeDiscountShort");
         print '<td><td align="right">';
         print '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$societe->id.'">'.img_edit($langs->trans("Modify")).'</a>';
         print '</td></tr></table>';
-        print '</td><td colspan="3">'.$societe->remise_client."&nbsp;%</td>";
+        print '</td><td colspan="3">'.($societe->remise_client?$societe->remise_client.'%':$langs->trans("DiscountNone")).'</td>';
         print '</tr>';
         
         // Remise avoirs
         print '<tr><td nowrap>';
         print '<table width="100%" class="nobordernopadding">';
         print '<tr><td nowrap>';
-        print $langs->trans("CustomerAbsoluteDiscount");
+        print $langs->trans("CustomerAbsoluteDiscountShort");
         print '<td><td align="right">';
         print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$societe->id.'">'.img_edit($langs->trans("Modify")).'</a>';
         print '</td></tr></table>';
@@ -288,7 +288,7 @@ if ($socid > 0)
 		$amount_discount=$societe->getCurrentDiscount();
 		if ($amount_discount < 0) dolibarr_print_error($db,$societe->error);
         if ($amount_discount > 0) print $amount_discount.'&nbsp;'.$langs->trans("Currency".$conf->monnaie);
-        else print $langs->trans("None");
+        else print $langs->trans("DiscountNone");
         print '</td>';
         print '</tr>';
     }