diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 43aeee8ebdf..1cc09394023 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -3,7 +3,6 @@ * Copyright (C) 2002-2003 Jean-Louis Bergamo * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2013-2015 Raphaël Doursenaud - * Copyright (C) 2016 Philippe Grand * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -321,10 +320,10 @@ if ($resql) print ''; if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { - print ''.$langs->trans("NumberingShort").''; + print ' '; } if (! empty($arrayfields['d.ref']['checked'])) print_liste_field_titre($arrayfields['d.ref']['label'],$_SERVER["PHP_SELF"],'d.rowid','',$param,'',$sortfield,$sortorder); - if (! empty($arrayfields['d.firstname']['checked']) && empty($arrayfields['d.lastname']['checked'])) print_liste_field_titre($arrayfields['d.firstname']['label'],$_SERVER["PHP_SELF"],'d.firstname','',$param,'',$sortfield,$sortorder); + if (! empty($arrayfields['d.firstname']['checked'])) print_liste_field_titre($arrayfields['d.firstname']['label'],$_SERVER["PHP_SELF"],'d.firstname','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['d.lastname']['checked'])) print_liste_field_titre($arrayfields['d.lastname']['label'],$_SERVER["PHP_SELF"],'d.lastname','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['d.company']['checked'])) print_liste_field_titre($arrayfields['d.company']['label'],$_SERVER["PHP_SELF"],'d.company','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['d.login']['checked'])) print_liste_field_titre($arrayfields['d.login']['label'],$_SERVER["PHP_SELF"],'d.login','',$param,'',$sortfield,$sortorder); @@ -360,89 +359,39 @@ if ($resql) // Line for filters fields print ''; - if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) - { - print ' '; - } - // Ref - if (! empty($arrayfields['d.ref']['checked'])) + if (! empty($arrayfields['c.ref']['checked'])) { print ''; print ''; print ''; } - - if (! empty($arrayfields['d.firstname']['checked']) || ! empty($arrayfields['d.lastname']['checked']) || ! empty($arrayfields['d.company']['checked'])) - { - print ''; - print ''; - } - if (! empty($arrayfields['d.login']['checked'])) - { - print ''; - print ''; - } - - if (! empty($arrayfields['d.morphy']['checked'])) - { - print ' '; - } + print ''; + print ''; - if (! empty($arrayfields['t.libelle']['checked'])) - { - print ''; - $listetype=$membertypestatic->liste_array(); - print $form->selectarray("type", $listetype, $type, 1, 0, 0, '', 0, 32); - print ''; - } + print ''; + print ''; - if (! empty($arrayfields['d.address']['checked'])) - { - print ' '; - } - - if (! empty($arrayfields['d.zip']['checked'])) - { - print ' '; - } - - if (! empty($arrayfields['d.town']['checked'])) - { - print ' '; - } + print ''; + print ''; - if (! empty($arrayfields['d.email']['checked'])) - { - print ''; - print ''; - } - - if (! empty($arrayfields['d.datefin']['checked'])) - { - print ' '; - } - - if (! empty($arrayfields['d.datec']['checked'])) - { - print ' '; - } - - if (! empty($arrayfields['d.tms']['checked'])) - { - print ' '; - } + print ''; + $listetype=$membertypestatic->liste_array(); + print $form->selectarray("type", $listetype, $type, 1, 0, 0, '', 0, 32); + print ''; + + print ' '; + + print ''; + print ''; $parameters=array(); $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Status - if (! empty($arrayfields['d.statut']['checked'])) - { - print ' '; - } + print ' '; // Action column print ''; @@ -482,62 +431,29 @@ if ($resql) } // Ref - if (! empty($arrayfields['d.ref']['checked'])) - { - print ""; - print $memberstatic->getNomUrl(1); - print "\n"; - } + print ""; + print $memberstatic->getNomUrl(1); + print "\n"; // Lastname - if (! empty($arrayfields['d.firstname']['checked']) || ! empty($arrayfields['d.lastname']['checked']) || ! empty($arrayfields['d.company']['checked'])) - { - print "rowid\">"; - print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : ''); - print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : ''); - print (! empty($companyname) ? dol_trunc($companyname, 32) : ''); - print "\n"; - } + print "rowid\">"; + print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : ''); + print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : ''); + print (! empty($companyname) ? dol_trunc($companyname, 32) : ''); + print "\n"; // Login - if (! empty($arrayfields['d.login']['checked'])) - { - print "".$objp->login."\n"; - } - - // Moral/Physique - if (! empty($arrayfields['d.morphy']['checked'])) - { - print "".$memberstatic->getmorphylib($objp->morphy)."\n"; - } + print "".$objp->login."\n"; // Type - if (! empty($arrayfields['t.libelle']['checked'])) - { - $membertypestatic->id=$objp->type_id; - $membertypestatic->libelle=$objp->type; - print ''; - print $membertypestatic->getNomUrl(1,32); - print ''; - } - - // Address - if (! empty($arrayfields['d.address']['checked'])) - { - print "".$memberstatic->address."\n"; - } - - // Zip - if (! empty($arrayfields['d.zip']['checked'])) - { - print "".$memberstatic->zip."\n"; - } - - // Town - if (! empty($arrayfields['d.town']['checked'])) - { - print "".$memberstatic->town."\n"; - } + $membertypestatic->id=$objp->type_id; + $membertypestatic->libelle=$objp->type; + print ''; + print $membertypestatic->getNomUrl(1,32); + print ''; + + // Moral/Physique + print "".$memberstatic->getmorphylib($objp->morphy)."\n"; // EMail print "".dol_print_email($objp->email,0,0,1)."\n"; @@ -546,10 +462,15 @@ if ($resql) $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; + // Statut + print ''; + print $memberstatic->LibStatut($objp->statut,$objp->cotisation,$datefin,2); + print ""; + // End of subscription date if ($datefin) { - print ''; + print ''; print dol_print_date($datefin,'day'); if ($memberstatic->hasDelay()) { print " ".img_warning($langs->trans("SubscriptionLate")); @@ -570,23 +491,6 @@ if ($resql) } print ''; } - - // Date create - if (! empty($arrayfields['d.datec']['checked'])) - { - print "".$memberstatic->datec."\n"; - } - - // Date modif - if (! empty($arrayfields['d.tms']['checked'])) - { - print "".$memberstatic->datem."\n"; - } - - // Statut - print ''; - print $memberstatic->LibStatut($objp->statut,$objp->cotisation,$datefin,2); - print ""; // Actions print ''; diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 6187293aefd..3000eecf33b 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Security code Calendar=Calendar -NumberingShort=N° Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

Those tools can be reached from menu on the side. Birthday=Birthday