diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php index 98000ad6e98..2888b911700 100644 --- a/htdocs/don/admin/donation.php +++ b/htdocs/don/admin/donation.php @@ -1,7 +1,7 @@ * Copyright (C) 2012-2015 Juanjo Menent - * Copyright (C) 2013-2016 Philippe Grand + * Copyright (C) 2013-2017 Philippe Grand * Copyright (C) 2015 Alexandre Spangaro * Copyright (C) 2015 Benoit Bruchard * @@ -250,14 +250,12 @@ clearstatcache(); $handle=opendir($dir); -$var=True; if (is_resource($handle)) { while (($file = readdir($handle))!==false) { if (preg_match('/\.modules\.php$/i',$file)) { - $var = !$var; $name = substr($file, 0, dol_strlen($file) -12); $classname = substr($file, 0, dol_strlen($file) -12); @@ -353,13 +351,11 @@ print ''.$langs->trans("Parameters").''; print ''.$langs->trans("Value")."\n"; print ''; print "\n"; -$var=true; print '
'; print ''; print ''; -$var=! $var; print ''; print ''; @@ -383,7 +379,6 @@ print ''; print ''; print ''; -$var=! $var; print ''; print $langs->trans("FreeTextOnDonations").' '.img_info($langs->trans("AddCRIfTooLong")).'
'; print ''; @@ -406,9 +401,8 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY)) print ''; print '' . $langs->trans('Parameters') . ''; print "\n"; - - print ""; + print ''; print '' . $langs->trans("DONATION_ART200") . ''; if (! empty($conf->global->DONATION_ART200)) { print ''; @@ -420,9 +414,8 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY)) print ''; } print ''; - - print ""; + print ''; print '' . $langs->trans("DONATION_ART238") . ''; if (! empty($conf->global->DONATION_ART238)) { print ''; @@ -434,9 +427,8 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY)) print ''; } print ''; - - print ""; + print ''; print '' . $langs->trans("DONATION_ART885") . ''; if (! empty($conf->global->DONATION_ART885)) { print ''; diff --git a/htdocs/don/card.php b/htdocs/don/card.php index f6584628d25..882b80ec339 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -699,12 +699,11 @@ if (! empty($id) && $action != 'edit') print ''.$langs->trans("Amount").''; print ''; - $var=True; while ($i < $num) { $objp = $db->fetch_object($resql); - print ""; + print ''; print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''; print ''.dol_print_date($db->jdate($objp->dp),'day')."\n"; $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type; @@ -809,8 +808,6 @@ if (! empty($id) && $action != 'edit') $genallowed = ($object->statut == 2 && ($object->paid == 0 || $user->admin) && $user->rights->don->creer); $delallowed = $user->rights->don->supprimer; - $var=true; - print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf); print '
';