diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index db25741989d..f6cb2cf39c5 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -45,52 +45,52 @@ $object=new Mailing($db); // Tableau des substitutions possibles $substitutionarray=array( - '__ID__' => 'IdRecord', - '__EMAIL__' => 'EMail', - '__LASTNAME__' => 'Lastname', - '__FIRSTNAME__' => 'Firstname', - '__MAILTOEMAIL__' => 'MailtoEmail', - '__OTHER1__' => 'Other1', - '__OTHER2__' => 'Other2', - '__OTHER3__' => 'Other3', - '__OTHER4__' => 'Other4', - '__OTHER5__' => 'Other5', - '__SIGNATURE__' => 'Signature', - '__PERSONALIZED__' => 'Personalized' + '__ID__' => 'IdRecord', + '__EMAIL__' => 'EMail', + '__LASTNAME__' => 'Lastname', + '__FIRSTNAME__' => 'Firstname', + '__MAILTOEMAIL__' => 'MailtoEmail', + '__OTHER1__' => 'Other1', + '__OTHER2__' => 'Other2', + '__OTHER3__' => 'Other3', + '__OTHER4__' => 'Other4', + '__OTHER5__' => 'Other5', + '__SIGNATURE__' => 'Signature', + '__PERSONALIZED__' => 'Personalized' ); if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE) { $substitutionarray=array_merge( - $substitutionarray, - array( - '__CHECK_READ__' => 'CheckMail', - '__UNSUSCRIBE__' => 'Unsubscribe' - ) + $substitutionarray, + array( + '__CHECK_READ__' => 'CheckMail', + '__UNSUSCRIBE__' => 'Unsubscribe' + ) ); } $substitutionarrayfortest=array( - '__ID__' => 'TESTIdRecord', - '__EMAIL__' => 'TESTEMail', - '__LASTNAME__' => 'TESTLastname', - '__FIRSTNAME__' => 'TESTFirstname', - '__MAILTOEMAIL__' => 'TESTMailtoEmail', - '__OTHER1__' => 'TESTOther1', - '__OTHER2__' => 'TESTOther2', - '__OTHER3__' => 'TESTOther3', - '__OTHER4__' => 'TESTOther4', - '__OTHER5__' => 'TESTOther5', - '__SIGNATURE__' => 'TESTSignature', - '__PERSONALIZED__' => 'TESTPersonalized' + '__ID__' => 'TESTIdRecord', + '__EMAIL__' => 'TESTEMail', + '__LASTNAME__' => 'TESTLastname', + '__FIRSTNAME__' => 'TESTFirstname', + '__MAILTOEMAIL__' => 'TESTMailtoEmail', + '__OTHER1__' => 'TESTOther1', + '__OTHER2__' => 'TESTOther2', + '__OTHER3__' => 'TESTOther3', + '__OTHER4__' => 'TESTOther4', + '__OTHER5__' => 'TESTOther5', + '__SIGNATURE__' => 'TESTSignature', + '__PERSONALIZED__' => 'TESTPersonalized' ); if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE) { $substitutionarrayfortest=array_merge( - $substitutionarrayfortest, - array( - '__CHECK_READ__' => 'TESTCheckMail', - '__UNSUSCRIBE__' => 'TESTUnsubscribe' - ) + $substitutionarrayfortest, + array( + '__CHECK_READ__' => 'TESTCheckMail', + '__UNSUSCRIBE__' => 'TESTUnsubscribe' + ) ); } diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index df946ca345d..313d7162351 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2009 Regis Houssin * Copyright (C) 2010-2011 Juanjo Menent * @@ -30,8 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); /** - * \class FactureRec - * \brief Classe de gestion des factures recurrentes/Modeles + * Classe de gestion des factures recurrentes/Modeles */ class FactureRec extends Facture { @@ -147,20 +146,20 @@ class FactureRec extends Facture for ($i = 0; $i < $num; $i++) { $result_insert = $this->addline( - $this->id, - $facsrc->lines[$i]->desc, - $facsrc->lines[$i]->subprice, - $facsrc->lines[$i]->qty, - $facsrc->lines[$i]->tva_tx, - $facsrc->lines[$i]->fk_product, - $facsrc->lines[$i]->remise_percent, - 'HT', - 0, - '', - 0, - $facsrc->lines[$i]->product_type, - $facsrc->lines[$i]->rang, - $facsrc->lines[$i]->special_code + $this->id, + $facsrc->lines[$i]->desc, + $facsrc->lines[$i]->subprice, + $facsrc->lines[$i]->qty, + $facsrc->lines[$i]->tva_tx, + $facsrc->lines[$i]->fk_product, + $facsrc->lines[$i]->remise_percent, + 'HT', + 0, + '', + 0, + $facsrc->lines[$i]->product_type, + $facsrc->lines[$i]->rang, + $facsrc->lines[$i]->special_code ); if ($result_insert < 0) diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index e6c876c23f6..88392d80e12 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -542,8 +542,8 @@ if (empty($reshook)) $localtax2_tx, // localtax2 $prod->id, $_POST["remise_percent"], - '', - '', //Todo: voir si fk_remise_except est encore valable car n'apparait plus dans les propales + '', + '', // TODO voir si fk_remise_except est encore valable car n'apparait plus dans les propales $price_base_type, $pu_ttc ); @@ -624,11 +624,11 @@ if (empty($reshook)) $localtax2_tx, $prod->id, $_POST["remise_percent"], - '', - '', - '', - '', - '', + '', + '', + '', + '', + '', $price_base_type, $pu_ttc );