diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 503eddfbbb7..f17ca46299f 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -936,7 +936,7 @@ else // Login Dolibarr print '
| '.$langs->trans("Ref").' | '; - print $form->showrefnav($object, 'id', $linkback); - print ' | |||||||||||
| '.$langs->trans("Lastname").' / '.$langs->trans("Label").' | '.$object->lastname.' | '; - print ''.$langs->trans("Firstname").' | '.$object->firstname.' | '; - */ - // Company if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) { @@ -1082,20 +1071,6 @@ else print ''; } - // Photo - /* - if ($object->photo) - { - print ''; - print $form->showphoto('contact',$object); - print ' | '; - } else { - print ''; - print ' '; - print ' | '; - } - */ - print '|||||||
| '.$langs->trans("PostOrFunction").' | '.$object->poste.' | |||||||||||
| '.$langs->trans("Address").' | '; - dol_print_address($object->address,'gmap','contact',$object->id); - print ' | |||||||||||
| '.$langs->trans("Zip").' / '.$langs->trans("Town").' | '; - print $object->zip; - if ($object->zip) print ' '; - print $object->town.' | |||||||||||
| '.$langs->trans("Country").' | '; - $img=picto_from_langcode($object->country_code); - if ($img) print $img.' '; - print $object->country; - print ' | |||||||||||
| '.$langs->trans('State').' | '.$object->state.' | |||||||||||
| '.$langs->trans("PhonePro").' | '.dol_print_phone($object->phone_pro,$object->country_code,$object->id,$object->socid,'AC_TEL').' | '; - print ''.$langs->trans("PhonePerso").' | '.dol_print_phone($object->phone_perso,$object->country_code,$object->id,$object->socid,'AC_TEL').' | |||||||||
| '.$langs->trans("PhoneMobile").' | '.dol_print_phone($object->phone_mobile,$object->country_code,$object->id,$object->socid,'AC_TEL').' | '; - print ''.$langs->trans("Fax").' | '.dol_print_phone($object->fax,$object->country_code,$object->id,$object->socid,'AC_FAX').' | |||||||||
| '.$langs->trans("EMail").' | '.dol_print_email($object->email,$object->id,$object->socid,'AC_EMAIL').' | |||||||||||
| '.$langs->trans("NbOfEMailingsSend").' | '; + print '||||||||||||
| '.$langs->trans("NbOfEMailingsSend").' | '; print ''.$object->getNbOfEMailings().' | '; print $langs->trans("ActionsToDoBy").' '; print ' | '; - print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit); + print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); if (empty($conf->dol_optimize_smallscreen)) print ' '.$langs->trans("or") . ' '.$langs->trans("Group").' '; print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit); print ' | '; diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php index c5cd34caf5f..bf773fcab62 100644 --- a/htdocs/don/stats/index.php +++ b/htdocs/don/stats/index.php @@ -244,7 +244,7 @@ print '|||||||||
| '.$langs->trans("CreatedBy").' | '; - print $form->select_dolusers($userid,'userid',1); + print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print ' | |||||||||||
| '.$langs->trans("Year").' | ';
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 76755360869..f0f5198bee5 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -243,7 +243,7 @@ print ' ';
print ' | |||||||||||
| '.$langs->trans("CreatedBy").' | '; - print $form->select_dolusers($userid,'userid',1); + print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print ' | |||||||||||
| '.$langs->trans("Year").' | '; diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index c59a594b5a6..78edcea53b0 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -247,7 +247,7 @@ if ($resql) // User if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous){ print ' | '; - print $form->select_dolusers($search_user,"search_user",1,"",0,''); + print $form->select_dolusers($search_user, 'search_user', 1, '' 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print ' | '; } else { print ''; diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php index d64cbca648f..80965deebfa 100644 --- a/htdocs/expensereport/stats/index.php +++ b/htdocs/expensereport/stats/index.php @@ -224,7 +224,7 @@ print ' | |||||||||
| '.$langs->trans("User").' | '; $include=''; if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) $include='hierarchy'; -print $form->select_dolusers($userid,'userid',1,'',0,$include); +print $form->select_dolusers($userid, 'userid', 1, '', 0, $include, '', 0, 0, 0, '', 0, '', 'maxwidth300'); print ' | |||||||||||
| '.$langs->trans("Year").' | '; diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 8a576250e79..7802e0c32fa 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -795,7 +795,7 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create print ' | ';
if (empty($user->rights->holiday->write_all))
{
- print $form->select_dolusers($userid,'useridbis',0,'',1);
+ print $form->select_dolusers($userid, 'useridbis', 0, '', 1, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
print '';
}
else print $form->select_dolusers(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0);
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 62ad088a5ef..afd5c1a05d4 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -178,7 +178,7 @@ if ($cp_events == 1)
print $langs->trans('MotifCP').' : ';
print $holiday->selectEventCP();
print ' '.$langs->trans('UserCP').' : ';
- print $form->select_dolusers('',"userCP",1,"",0,'');
+ print $form->select_dolusers('', 'userCP', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
print ' ';
print ' '; diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 83ed0ccfc0f..f9189ed7e97 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -94,7 +94,7 @@ print '
| ||||||||||