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

add column numbering name and fix a lot of issues within members list

Browse Source
This commit is contained in:
philippe grand 2016-05-06 17:07:14 +02:00
parent 5a75f346ff
commit d5a18ab584
2 changed files with 139 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
htdocs/adherents/list.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org> * Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2013-2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> * Copyright (C) 2013-2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2016 Philippe Grand <philippe.grand@atoo-net.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -320,10 +321,10 @@ if ($resql)
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{ {
print '<td width="5" align="center">&nbsp;</td>'; print '<td colspan="1" align="center">'.$langs->trans("NumberingShort").'</td>';
} }
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.ref']['checked'])) print_liste_field_titre($arrayfields['d.ref']['label'],$_SERVER["PHP_SELF"],'d.rowid','',$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.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.lastname']['checked'])) print_liste_field_titre($arrayfields['d.lastname']['label'],$_SERVER["PHP_SELF"],'d.lastname','',$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.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); if (! empty($arrayfields['d.login']['checked'])) print_liste_field_titre($arrayfields['d.login']['label'],$_SERVER["PHP_SELF"],'d.login','',$param,'',$sortfield,$sortorder);
@ -359,39 +360,89 @@ if ($resql)
// Line for filters fields // Line for filters fields
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{
print '<td class="liste_titre">&nbsp;</td>';
}
// Ref // Ref
if (! empty($arrayfields['c.ref']['checked'])) if (! empty($arrayfields['d.ref']['checked']))
{ {
print '<td class="liste_titre">'; print '<td class="liste_titre">';
print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">'; print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
print '</td>'; print '</td>';
} }
print '<td class="liste_titre" align="left">'; if (! empty($arrayfields['d.firstname']['checked']) || ! empty($arrayfields['d.lastname']['checked']) || ! empty($arrayfields['d.company']['checked']))
print '<input class="flat" type="text" name="search_ref" value="'.$search_ref.'" size="4"></td>'; {
print '<td class="liste_titre" align="left">';
print '<input class="flat" type="text" name="search_lastname" value="'.$search_lastname.'" size="12"></td>';
}
print '<td class="liste_titre" align="left">'; if (! empty($arrayfields['d.login']['checked']))
print '<input class="flat" type="text" name="search_lastname" value="'.$search_lastname.'" size="12"></td>'; {
print '<td class="liste_titre" align="left">';
print '<input class="flat" type="text" name="search_login" value="'.$search_login.'" size="7"></td>';
}
print '<td class="liste_titre" align="left">'; if (! empty($arrayfields['d.morphy']['checked']))
print '<input class="flat" type="text" name="search_login" value="'.$search_login.'" size="7"></td>'; {
print '<td class="liste_titre">&nbsp;</td>';
}
print '<td class="liste_titre">'; if (! empty($arrayfields['t.libelle']['checked']))
$listetype=$membertypestatic->liste_array(); {
print $form->selectarray("type", $listetype, $type, 1, 0, 0, '', 0, 32); print '<td class="liste_titre">';
print '</td>'; $listetype=$membertypestatic->liste_array();
print $form->selectarray("type", $listetype, $type, 1, 0, 0, '', 0, 32);
print '</td>';
}
print '<td class="liste_titre">&nbsp;</td>'; if (! empty($arrayfields['d.address']['checked']))
{
print '<td class="liste_titre">&nbsp;</td>';
}
print '<td class="liste_titre" align="left">'; if (! empty($arrayfields['d.zip']['checked']))
print '<input class="flat" type="text" name="search_email" value="'.$search_email.'" size="12"></td>'; {
print '<td class="liste_titre">&nbsp;</td>';
}
if (! empty($arrayfields['d.town']['checked']))
{
print '<td class="liste_titre">&nbsp;</td>';
}
if (! empty($arrayfields['d.email']['checked']))
{
print '<td class="liste_titre" align="left">';
print '<input class="flat" type="text" name="search_email" value="'.$search_email.'" size="12"></td>';
}
if (! empty($arrayfields['d.datefin']['checked']))
{
print '<td class="liste_titre">&nbsp;</td>';
}
if (! empty($arrayfields['d.datec']['checked']))
{
print '<td class="liste_titre">&nbsp;</td>';
}
if (! empty($arrayfields['d.tms']['checked']))
{
print '<td class="liste_titre">&nbsp;</td>';
}
$parameters=array(); $parameters=array();
$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint; print $hookmanager->resPrint;
// Status // Status
print '<td class="liste_titre">&nbsp;</td>'; if (! empty($arrayfields['d.statut']['checked']))
{
print '<td class="liste_titre">&nbsp;</td>';
}
// Action column // Action column
print '<td class="liste_titre" colspan="2" align="right">'; print '<td class="liste_titre" colspan="2" align="right">';
@ -431,29 +482,62 @@ if ($resql)
} }
// Ref // Ref
print "<td>"; if (! empty($arrayfields['d.ref']['checked']))
print $memberstatic->getNomUrl(1); {
print "</td>\n"; print "<td>";
print $memberstatic->getNomUrl(1);
print "</td>\n";
}
// Lastname // Lastname
print "<td><a href=\"card.php?rowid=$objp->rowid\">"; if (! empty($arrayfields['d.firstname']['checked']) || ! empty($arrayfields['d.lastname']['checked']) || ! empty($arrayfields['d.company']['checked']))
print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : ''); {
print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : ''); print "<td><a href=\"card.php?rowid=$objp->rowid\">";
print (! empty($companyname) ? dol_trunc($companyname, 32) : ''); print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
print "</a></td>\n"; print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
print "</a></td>\n";
}
// Login // Login
print "<td>".$objp->login."</td>\n"; if (! empty($arrayfields['d.login']['checked']))
{
// Type print "<td>".$objp->login."</td>\n";
$membertypestatic->id=$objp->type_id; }
$membertypestatic->libelle=$objp->type;
print '<td class="nowrap">';
print $membertypestatic->getNomUrl(1,32);
print '</td>';
// Moral/Physique // Moral/Physique
print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n"; if (! empty($arrayfields['d.morphy']['checked']))
{
print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n";
}
// Type
if (! empty($arrayfields['t.libelle']['checked']))
{
$membertypestatic->id=$objp->type_id;
$membertypestatic->libelle=$objp->type;
print '<td class="nowrap">';
print $membertypestatic->getNomUrl(1,32);
print '</td>';
}
// Address
if (! empty($arrayfields['d.address']['checked']))
{
print "<td>".$memberstatic->address."</td>\n";
}
// Zip
if (! empty($arrayfields['d.zip']['checked']))
{
print "<td>".$memberstatic->zip."</td>\n";
}
// Town
if (! empty($arrayfields['d.town']['checked']))
{
print "<td>".$memberstatic->town."</td>\n";
}
// EMail // EMail
print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n"; print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
@ -462,15 +546,10 @@ if ($resql)
$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint; print $hookmanager->resPrint;
// Statut
print '<td class="nowrap">';
print $memberstatic->LibStatut($objp->statut,$objp->cotisation,$datefin,2);
print "</td>";
// End of subscription date // End of subscription date
if ($datefin) if ($datefin)
{ {
print '<td align="center" class="nowrap">'; print '<td align="left" class="nowrap">';
print dol_print_date($datefin,'day'); print dol_print_date($datefin,'day');
if ($memberstatic->hasDelay()) { if ($memberstatic->hasDelay()) {
print " ".img_warning($langs->trans("SubscriptionLate")); print " ".img_warning($langs->trans("SubscriptionLate"));
@ -492,6 +571,23 @@ if ($resql)
print '</td>'; print '</td>';
} }
// Date create
if (! empty($arrayfields['d.datec']['checked']))
{
print "<td>".$memberstatic->datec."</td>\n";
}
// Date modif
if (! empty($arrayfields['d.tms']['checked']))
{
print "<td>".$memberstatic->datem."</td>\n";
}
// Statut
print '<td class="nowrap">';
print $memberstatic->LibStatut($objp->statut,$objp->cotisation,$datefin,2);
print "</td>";
// Actions // Actions
print '<td align="center">'; print '<td align="center">';
if ($user->rights->adherent->creer) if ($user->rights->adherent->creer)

1
htdocs/langs/en_US/other.lang
View File

@ -1,6 +1,7 @@
# Dolibarr language file - Source file is en_US - other # Dolibarr language file - Source file is en_US - other
SecurityCode=Security code SecurityCode=Security code
Calendar=Calendar Calendar=Calendar
NumberingShort=N°
Tools=Tools Tools=Tools
ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side. ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
Birthday=Birthday Birthday=Birthday