lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Date output on UTF8 config return value in correct code

Browse Source
This commit is contained in:
Laurent Destailleur 2008-10-26 21:43:51 +00:00
parent 2a021e8b40
commit 0aa9cca4e1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/bank/annuel.php
View File

@ -20,7 +20,7 @@
/** /**
* \file htdocs/compta/bank/annuel.php * \file htdocs/compta/bank/annuel.php
* \ingroup banque * \ingroup banque
* \brief Page reporting mensuel Entrées/Sorties d'un compte bancaire * \brief Page reporting mensuel Entr<EFBFBD>es/Sorties d'un compte bancaire
* \version $Id$ * \version $Id$
*/ */
@ -41,7 +41,7 @@ else
$year_end=$year_start+2; $year_end=$year_start+2;
} }
// Sécurité accés client // S<EFBFBD>curit<EFBFBD> acc<63>s client
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$socid = $user->societe_id; $socid = $user->societe_id;
@ -53,7 +53,7 @@ llxHeader();
$form = new Form($db); $form = new Form($db);
// Récupère info du compte // R<EFBFBD>cup<EFBFBD>re info du compte
$acct = new Account($db); $acct = new Account($db);
if ($_GET["account"]) if ($_GET["account"])
{ {
@ -66,7 +66,7 @@ if ($_GET["ref"])
} }
# Ce rapport de trésorerie est basé sur llx_bank (car doit inclure les transactions sans facture) # Ce rapport de tr<EFBFBD>sorerie est bas<61> sur llx_bank (car doit inclure les transactions sans facture)
# plutot que sur llx_paiement + llx_paiementfourn # plutot que sur llx_paiement + llx_paiementfourn
$sql = "SELECT sum(f.amount), date_format(f.dateo,'%Y-%m') as dm"; $sql = "SELECT sum(f.amount), date_format(f.dateo,'%Y-%m') as dm";

2
htdocs/lib/functions.lib.php
View File

@ -493,6 +493,8 @@ function dolibarr_print_date($time,$format='',$to_gmt=false,$convtooutput=true)
// Page code for text from strftime functions // Page code for text from strftime functions
$pagecodefrom='ISO-8859-1'; $pagecodefrom='ISO-8859-1';
$localtime=setlocale(LC_TIME,0);
if (eregi('UTF',$localtime)) $pagecodefrom='UTF-8';
return ($convtooutput?$langs->convToOuptutCharset($ret,$pagecodefrom):$ret); return ($convtooutput?$langs->convToOuptutCharset($ret,$pagecodefrom):$ret);
} }