From 7213ae09fe1ac526fff2e9ba51aa215b68e63565 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 29 May 2012 00:08:00 +0200 Subject: [PATCH] Checkstyle --- htdocs/comm/mailing/fiche.php | 4 ++-- htdocs/compta/facture/class/facture.class.php | 4 ++-- htdocs/core/lib/functions.lib.php | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index f6cb2cf39c5..df601e7556d 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -60,13 +60,13 @@ $substitutionarray=array( ); if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE) { - $substitutionarray=array_merge( + $substitutionarray=array_merge( $substitutionarray, array( '__CHECK_READ__' => 'CheckMail', '__UNSUSCRIBE__' => 'Unsubscribe' ) - ); + ); } $substitutionarrayfortest=array( diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 5b74e007a0e..63e88ebcedd 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -349,7 +349,7 @@ class Facture extends CommonObject $this->lines[$i]->fk_code_ventilation, $this->lines[$i]->info_bits, $this->lines[$i]->fk_remise_except, - 'HT', + 'HT', 0, $this->lines[$i]->product_type, $this->lines[$i]->rang, @@ -2898,7 +2898,7 @@ class Facture extends CommonObject if ($row[0] == 0) { $now=dol_now(); - + $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'prelevement_facture_demande'; $sql .= ' (fk_facture, amount, date_demande, fk_user_demande, code_banque, code_guichet, number, cle_rib)'; $sql .= ' VALUES ('.$this->id; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 4bf8cbc959b..77d071a0f6b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -876,7 +876,6 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e /** * Return an array with locale date info. * 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. * Usage must be avoid. *