From b2eb43290cbaad560b9d27ad6c091888d72322db Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 8 Apr 2006 12:58:29 +0000 Subject: [PATCH] =?UTF-8?q?Trad:=20Traduction=20r=E9glement=20client/fourn?= =?UTF-8?q?isseur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/bank/account.php | 12 +++++++++++- htdocs/compta/bank/ligne.php | 22 ++++++++++++++++++++-- htdocs/langs/en_US/banks.lang | 4 +++- htdocs/langs/fr_FR/banks.lang | 4 +++- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index c203f726101..c08c2e210a0 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -385,7 +385,17 @@ function _print_lines($db,$result,$sql,$acct) print "".dolibarr_print_date($objp->do,"%d/%m/%y")."\n"; print " ".dolibarr_print_date($objp->dv,"%d/%m/%y")."\n"; print " ".$objp->fk_type." ".($objp->num_chq?$objp->num_chq:"")."\n"; - print ''.$objp->label.''; + print ''; + if (eregi('^\((.*)\)$',$objp->label,$reg)) + { + // Label générique car entre parenthèses. On l'affiche en le traduisant + print $langs->trans($reg[1]); + } + else + { + print $objp->label; + } + print ''; /* * Ajout les liens diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 93d50e43639..396d9419c54 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -316,14 +316,32 @@ if ($result) if (! $objp->rappro) { print ''; - print ''; + print ''; print ''; print ''; } else { print ''; - print $objp->label; + if (eregi('^\((.*)\)$',$objp->label,$reg)) + { + // Label générique car entre parenthèses. On l'affiche en le traduisant + print $langs->trans($reg[1]); + } + else + { + print $objp->label; + } } print ''; diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index 09ae1b2690e..2ad8a86bc8f 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -78,4 +78,6 @@ AddBankRecord=Add transaction AddBankRecordLong=Add transaction manually ConciliatedBy=Conciliated by DateConciliating=Conciliate date -BankLineConciliated=Transaction conciliated \ No newline at end of file +BankLineConciliated=Transaction conciliated +CustomerInvoicePayment=Customer payment +SupplierInvoicePayment=Supplier payment \ No newline at end of file diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang index 4db7ef10b09..0dcf64c3b94 100644 --- a/htdocs/langs/fr_FR/banks.lang +++ b/htdocs/langs/fr_FR/banks.lang @@ -78,4 +78,6 @@ AddBankRecord=Ajouter AddBankRecordLong=Saisie d'une écriture manuelle hors facture ConciliatedBy=Rapproché par DateConciliating=Date rapprochement -BankLineConciliated=Ecriture rapprochée \ No newline at end of file +BankLineConciliated=Ecriture rapprochée +CustomerInvoicePayment=Réglement client +SupplierInvoicePayment=Réglement fournisseur \ No newline at end of file