From 13e9c71f38ec7031520ad3716569165b378843ee Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 16 Dec 2007 19:21:45 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Les=20mod=E8le=20PDF=20ne=20g=E9raient?= =?UTF-8?q?=20pas=20l'affichage=20de=20l'avoir=20appliqu=E9=20sur=20une=20?= =?UTF-8?q?facture.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/facture.php | 8 ++++++-- htdocs/langs/en_US/bills.lang | 1 + htdocs/langs/fr_FR/bills.lang | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 989a7be2e3a..9c3a6c0ffca 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2144,8 +2144,12 @@ else print ''.price($fac->total_ttc - $totalpaye).''.$langs->trans('Currency'.$conf->monnaie).''; $resteapayeraffiche=0; } - print ''.$langs->trans('RemainderToPay').' :'; - print ''.price($resteapayeraffiche).''.$langs->trans('Currency'.$conf->monnaie).''; + print ''; + if ($resteapayeraffiche >= 0) print $langs->trans('RemainderToPay'); + else print $langs->trans('ExcessReceived'); + print ' :'; + print ''.price($resteapayeraffiche).''; + print ''.$langs->trans('Currency'.$conf->monnaie).''; } else { diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 04c52bcb906..99248aa68be 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -161,6 +161,7 @@ Abandoned=Abandoned RemainderToPay=Remainder to pay RemainderToTake=Remainder to take AmountExpected=Amount claimed +ExcessReceived=Trop perçu EscompteOffered=Discount offered (payment before term) CreateDraft=Create draft SendBillRef=Send invoice %s diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 53bf2a05da0..a1f3ced10cf 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -161,6 +161,7 @@ Abandoned=Abandonn RemainderToPay=Reste à payer RemainderToTake=Reste à encaisser AmountExpected=Montant réclamé +ExcessReceived=Trop perçu EscompteOffered=Escompte (réglement avant échéance) CreateDraft=Créer brouillon SendBillRef=Envoi facture %s