From 59d96fdc07966945332ba803cfa81701957de6aa Mon Sep 17 00:00:00 2001 From: Neil Orley Date: Thu, 7 Jul 2016 09:52:59 +0200 Subject: [PATCH] ut8_encode() removed from balance.php and listbyaccount.php --- htdocs/accountancy/bookkeeping/balance.php | 6 +++--- htdocs/accountancy/bookkeeping/listbyaccount.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index c76ab9e23b3..0fabdc4d54b 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -235,7 +235,7 @@ else { // Affiche un Sous-Total par compte comptable if ($displayed_account != "") { - print ''.utf8_encode($langs->trans("SubTotal")) . ':'.price($sous_total_debit).''.price($sous_total_credit).''.price($sous_total_credit-$sous_total_debit).''; + print ''.$langs->trans("SubTotal") . ':'.price($sous_total_debit).''.price($sous_total_credit).''.price($sous_total_credit-$sous_total_debit).''; print " \n"; print ''; } @@ -268,11 +268,11 @@ else { } - print ''.utf8_encode($langs->trans("SubTotal")) . ':'.price($sous_total_debit).''.price($sous_total_credit).''.price($sous_total_credit-$sous_total_debit).''; + print ''.$langs->trans("SubTotal") . ':'.price($sous_total_debit).''.price($sous_total_credit).''.price($sous_total_credit-$sous_total_debit).''; print " \n"; print ''; - print ''.utf8_encode($langs->trans("AccountBalance")) . ':'.price($total_debit).''.price($total_credit).''.price($total_credit-$total_debit).''; + print ''.$langs->trans("AccountBalance") . ':'.price($total_debit).''.price($total_credit).''.price($total_credit-$total_debit).''; print " \n"; print ''; diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index d7ed92c7c94..f086b28d244 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -277,7 +277,7 @@ foreach ( $object->lines as $line ) { // Affiche un Sous-Total par compte comptable if ($displayed_account_number != "") { - print ''.utf8_encode($langs->trans("SubTotal")).':'.price($sous_total_debit).''.price($sous_total_credit).''; + print ''.$langs->trans("SubTotal").':'.price($sous_total_debit).''.price($sous_total_credit).''; print " \n"; print ''; } @@ -323,14 +323,14 @@ foreach ( $object->lines as $line ) { } // Affiche un Sous-Total du dernier compte comptable affiché -print ''.utf8_encode($langs->trans("SubTotal")).':'.price($sous_total_debit).''.price($sous_total_credit).''; +print ''.$langs->trans("SubTotal").':'.price($sous_total_debit).''.price($sous_total_credit).''; print " \n"; print ''; // Affiche le Total print ''; -print ''.utf8_encode($langs->trans("Total")).':'; +print ''.$langs->trans("Total").':'; print ''; print price($total_debit); print '';