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

Checkstyle

Browse Source
This commit is contained in:
Laurent Destailleur 2012-05-29 00:08:00 +02:00
parent d52d063d98
commit 7213ae09fe
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/mailing/fiche.php
View File

@ -60,13 +60,13 @@ $substitutionarray=array(
); );
if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE) if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
{ {
$substitutionarray=array_merge( $substitutionarray=array_merge(
$substitutionarray, $substitutionarray,
array( array(
'__CHECK_READ__' => 'CheckMail', '__CHECK_READ__' => 'CheckMail',
'__UNSUSCRIBE__' => 'Unsubscribe' '__UNSUSCRIBE__' => 'Unsubscribe'
) )
); );
} }
$substitutionarrayfortest=array( $substitutionarrayfortest=array(

2
htdocs/compta/facture/class/facture.class.php
View File

@ -349,7 +349,7 @@ class Facture extends CommonObject
$this->lines[$i]->fk_code_ventilation, $this->lines[$i]->fk_code_ventilation,
$this->lines[$i]->info_bits, $this->lines[$i]->info_bits,
$this->lines[$i]->fk_remise_except, $this->lines[$i]->fk_remise_except,
'HT', 'HT',
0, 0,
$this->lines[$i]->product_type, $this->lines[$i]->product_type,
$this->lines[$i]->rang, $this->lines[$i]->rang,

1
htdocs/core/lib/functions.lib.php
View File

@ -876,7 +876,6 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
/** /**
* Return an array with locale date info. * Return an array with locale date info.
* PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows * PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows
*
* WARNING: This function always use PHP server timezone to return locale informations. * WARNING: This function always use PHP server timezone to return locale informations.
* Usage must be avoid. * Usage must be avoid.
* *