diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 503eddfbbb727ae2abc17fe8a6a7a8577e471f01..f17ca46299f45be17e4b0043d8a20ecdae5b3d52 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -936,7 +936,7 @@ else // Login Dolibarr print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">'; - print $form->select_dolusers($object->user_id,'userid',1); + print $form->select_dolusers($object->user_id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</td></tr>'; */ print '<tbody>'; diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index 43b994adafeb62f4a1374e56c25e4fff10acd564..dc5bf7321034c83ce13b71722cbbb9c65c757fa4 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -155,7 +155,7 @@ $filter='s.client in (1,2,3)'; print $form->select_company($id,'memberid',$filter,1); print '</td></tr>'; print '<tr><td>'.$langs->trans("User").'</td><td>'; -print $form->select_dolusers($userid,'userid',1); +print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</td></tr>'; print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>'; print '</table>'; diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index f2d8c2d84dccb4f10195fccd8c0a4542f3832023..1a3fd19aa1c2fdb1fb9f9b56e9048dfa436934f9 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -135,7 +135,7 @@ print "</tr>"; print '<tr class="impair"><td>'.$langs->trans("ResponsibleUser").'</td>'; print '<td align="left">'; print '<input type="hidden" name="nom0" value="PRELEVEMENT_USER">'; -print $form->select_dolusers($conf->global->PRELEVEMENT_USER,'value0',1); +print $form->select_dolusers($conf->global->PRELEVEMENT_USER, 'value0', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</td>'; print '</tr>'; diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php index 62b4ccddce6617a37a791a9da29c1fbbe2b3f0a8..c7f47649efa7700cd440d532c4a5c00d9f5322ad 100644 --- a/htdocs/bookmarks/card.php +++ b/htdocs/bookmarks/card.php @@ -165,7 +165,7 @@ if ($action == 'create') print '</td><td class="hideonsmartphone">'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</td></tr>'; print '<tr><td>'.$langs->trans("Owner").'</td><td>'; - print $form->select_dolusers(isset($_POST['userid'])?$_POST['userid']:$user->id,'userid',1); + print $form->select_dolusers(isset($_POST['userid'])?$_POST['userid']:$user->id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</td><td class="hideonsmartphone"> </td></tr>'; // Position @@ -262,7 +262,7 @@ if ($id > 0 && ! preg_match('/^add/i',$action)) print '<tr><td>'.$langs->trans("Owner").'</td><td>'; if ($action == 'edit' && $user->admin) { - print $form->select_dolusers(isset($_POST['userid'])?$_POST['userid']:($bookmark->fk_user?$bookmark->fk_user:''),'userid',1); + print $form->select_dolusers(isset($_POST['userid'])?$_POST['userid']:($bookmark->fk_user?$bookmark->fk_user:''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); } else { diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 84a36dec8b94973a247402ff0298033b4cf67b8e..0f561622bd1d34c7da7f9a38b280dd175727c1db 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -1247,7 +1247,7 @@ if ($id > 0) } } print '<div class="assignedtouser">'; - print $form->select_dolusers_forevent('view','assignedtouser',1); + print $form->select_dolusers_forevent('view', 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</div>'; if (in_array($user->id,array_keys($listofuserid))) { diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index f3bda0281daf7f52e029a8451efee064017505e8..992c23144462c385264049a9acc791f0d81ae41d 100644 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -196,7 +196,7 @@ if ($object->id > 0) } } print '<div class="assignedtouser">'; - print $form->select_dolusers_forevent('view','assignedtouser',1); + print $form->select_dolusers_forevent('view', 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</div>'; if (in_array($user->id,array_keys($listofuserid))) { diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 5b45020b7e1a45db4a852ee0a56ab4d6067f5778..f757a224266bc875c06ad8ea6f6a796320e92fd9 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -243,7 +243,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">'; print '</td></tr>'; // User print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">'; - print $form->select_dolusers($userid,'userid',1); + print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</td></tr>'; // Status print '<tr><td align="left">'.$langs->trans("Status").'</td><td align="left">'; diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 04cfad1732df6826764710216e3363083e89310d..a6e04121707c1fe3d4930a972a438ee68115f488 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -260,8 +260,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">'; print '</td></tr>'; // User print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">'; - print $form->select_dolusers($userid,'userid',1); - print '</td></tr>'; + print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); // Year print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">'; if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year; diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index f2fcd49027750619350b810b72735d9827472fcb..903977da46083ce1774e61a4beb35c4219eabde0 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -257,7 +257,7 @@ if ($action == 'create') print "<tr>"; print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>'; - print $form->select_dolusers(GETPOST('fk_user','int'),'fk_user',1); + print $form->select_dolusers(GETPOST('fk_user','int'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</td></tr>'; print "<tr>"; @@ -353,7 +353,7 @@ else if ($id) // Who print "<tr>"; print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>'; - print $form->select_dolusers(GETPOST('fk_user','int')?GETPOST('fk_user','int'):$object->fk_user,'fk_user',0); + print $form->select_dolusers(GETPOST('fk_user','int')?GETPOST('fk_user','int'):$object->fk_user, 'fk_user', 0, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</td></tr>'; // Date diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index 1d9f7b70201219110b5986fb06f36f4c4e9cf0a3..531c05401abe48b29dea9737dac89ab467707012 100644 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -242,7 +242,7 @@ print '</td></tr>'; print '<tr><td>'.$langs->trans("User").'</td><td>'; $include=''; if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->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 '</td></tr>'; // Year print '<tr><td>'.$langs->trans("Year").'</td><td>'; diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php index f79621a4d87077b10f27ad468c88c95daa70ca86..64a823e8e4a2b025d5eeef5db8dfc43cf6947453 100644 --- a/htdocs/compta/facture/mergepdftool.php +++ b/htdocs/compta/facture/mergepdftool.php @@ -637,7 +637,7 @@ if ($resql) $langs->load("commercial"); $moreforfilter.='<div class="divsearchfield">'; $moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': '; - $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user); + $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user, 0, 1, 'maxwidth300'); $moreforfilter.='</div>'; } // If the user can view prospects other than his' @@ -645,7 +645,7 @@ if ($resql) { $moreforfilter.='<div class="divsearchfield">'; $moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': '; - $moreforfilter.=$form->select_dolusers($search_user,'search_user',1); + $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); $moreforfilter.='</div>'; } if (! empty($moreforfilter)) diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index 2b7e17d93696889a44e3138c94c8b62137ce735e..bfe3cdc8555c06bef67485b78079377bfa1c4554 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -244,7 +244,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">'; print '</td></tr>'; // User print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>'; - print $form->select_dolusers($userid,'userid',1); + print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</td></tr>'; // Year print '<tr><td>'.$langs->trans("Year").'</td><td>'; diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index 4b5b0edd784e1949fcde2a84a0437b75b666ec60..0e8e69b835312e81d9888b9c8b88fcdbad10f18b 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -250,7 +250,7 @@ if ($action == 'create') // Employee print '<tr><td>'; print fieldLabel('Employee','fk_user',1).'</td><td>'; - print $form->select_dolusers(GETPOST('fk_user','int'),'fk_user',1); + print $form->select_dolusers(GETPOST('fk_user','int'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</td></tr>'; // Label diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 8022c17de675434dbc5ad7df8c1a23914e360dbc..1da57afc2f6c4d1f5943769bfdb83eeddc5ee9ef 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -1055,17 +1055,6 @@ else print '<div class="underbanner clearboth"></div>'; print '<table class="border tableforfield" width="100%">'; - - // Ref - /*print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td colspan="3">'; - print $form->showrefnav($object, 'id', $linkback); - print '</td></tr>'; - - // Name - print '<tr><td width="20%">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td width="30%">'.$object->lastname.'</td>'; - print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="30%">'.$object->firstname.'</td>'; - */ - // Company if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) { @@ -1082,20 +1071,6 @@ else print '</td>'; } - // Photo - /* - if ($object->photo) - { - print '<td rowspan="6" style="text-align: center;" width="25%">'; - print $form->showphoto('contact',$object); - print '</td>'; - } else { - print '<td rowspan="6" style="text-align: center;" width="25%">'; - print ' '; - print '</td>'; - } - */ - print '</tr>'; // Civility @@ -1106,46 +1081,11 @@ else // Role print '<tr><td>'.$langs->trans("PostOrFunction").'</td><td>'.$object->poste.'</td></tr>'; - // Address - /* - print '<tr><td>'.$langs->trans("Address").'</td><td colspan="2">'; - dol_print_address($object->address,'gmap','contact',$object->id); - print '</td></tr>'; - - // Zip/Town - print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="2">'; - print $object->zip; - if ($object->zip) print ' '; - print $object->town.'</td></tr>'; - - // Country - print '<tr><td>'.$langs->trans("Country").'</td><td colspan="2">'; - $img=picto_from_langcode($object->country_code); - if ($img) print $img.' '; - print $object->country; - print '</td></tr>'; - - // State - if (empty($conf->global->SOCIETE_DISABLE_STATE)) - { - print '<tr><td>'.$langs->trans('State').'</td><td>'.$object->state.'</td></tr>'; - }*/ - - // Phone - /* - print '<tr><td>'.$langs->trans("PhonePro").'</td><td>'.dol_print_phone($object->phone_pro,$object->country_code,$object->id,$object->socid,'AC_TEL').'</td>'; - print '<td>'.$langs->trans("PhonePerso").'</td><td>'.dol_print_phone($object->phone_perso,$object->country_code,$object->id,$object->socid,'AC_TEL').'</td></tr>'; - - print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td>'.dol_print_phone($object->phone_mobile,$object->country_code,$object->id,$object->socid,'AC_TEL').'</td>'; - print '<td>'.$langs->trans("Fax").'</td><td>'.dol_print_phone($object->fax,$object->country_code,$object->id,$object->socid,'AC_FAX').'</td></tr>'; - */ - // Email - //print '<tr><td>'.$langs->trans("EMail").'</td><td>'.dol_print_email($object->email,$object->id,$object->socid,'AC_EMAIL').'</td></tr>'; if (! empty($conf->mailing->enabled)) { $langs->load("mails"); - print '<tr><td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>'; + print '<tr><td>'.$langs->trans("NbOfEMailingsSend").'</td>'; print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?filteremail='.urlencode($object->email).'">'.$object->getNbOfEMailings().'</a></td></tr>'; } diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index dbf5803a4c67dc544556570ff71af509f55b2e14..ef226d359082e23dd7fba4a164e1e377308b5f33 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -178,7 +178,7 @@ if ($resql) $langs->load("commercial"); $moreforfilter.='<div class="divsearchfield">'; $moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': '; - $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user); + $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user,0,1,'maxwidth300'); $moreforfilter.='</div>'; } // If the user can view other users diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index 42244a11718606f337500ec24516b2d308e90024..165c93fa9a1c731d8272820e396e2f12cc8748c9 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -75,7 +75,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">'; print $langs->trans("ActionsToDoBy").' '; print '</td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px; padding-right: 4px;">'; - 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 '</td></tr>'; diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php index c5cd34caf5fb9b40d3b3824cbee0e4358c68bc5e..bf773fcab62309b75acbb5fdbcdce27ed44b4768 100644 --- a/htdocs/don/stats/index.php +++ b/htdocs/don/stats/index.php @@ -244,7 +244,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">'; print '</td></tr>'; // User print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">'; - print $form->select_dolusers($userid,'userid',1); + print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</td></tr>'; // Year print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">'; diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index 767553608695c366d750676e3286a4c3095aee59..f0f5198bee5f7e5d32255d455dac29360d0f0ca7 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -243,7 +243,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">'; print '</td></tr>'; // User print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">'; - print $form->select_dolusers($userid,'userid',1); + print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</td></tr>'; // Year print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">'; diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index c59a594b5a651485f627d3338be191d5d437cfae..78edcea53b01443dd046e912eaadc043dee4bcc9 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 '<td class="liste_titre" align="left">'; - 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 '</td>'; } else { print '<td class="liste_titre"> </td>'; diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php index d64cbca648f2c9522334884f723b40fd622a429e..80965deebfaa662238ac9069689fcfdde6006e37 100644 --- a/htdocs/expensereport/stats/index.php +++ b/htdocs/expensereport/stats/index.php @@ -224,7 +224,7 @@ print '</td></tr>'; print '<tr><td>'.$langs->trans("User").'</td><td>'; $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 '</td></tr>'; // Year print '<tr><td>'.$langs->trans("Year").'</td><td>'; diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 8a576250e79a7bbde4c1dd8e5c82f77b2c0376ab..7802e0c32faa7b3d3841dd44fdb46d249513b13d 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 '<td>'; 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 '<input type="hidden" name="userid" value="'.$userid.'">'; } 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 62ad088a5ef109026ec527f12bd2fc80e954e660..afd5c1a05d495e2d017b9bf3d4a344cafb760dc8 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 ' <input type="submit" value="'.$langs->trans("addEventToUserCP").'" name="bouton" class="button"/>'; print '</form><br>'; diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 83ed0ccfc0f78309944368bd6fe0557baf0cb0c8..f9189ed7e974f24768d2eaf37134f22d638caa56 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -94,7 +94,7 @@ print '<table class="border" width="100%">'; if ($user->rights->margins->read->all) { print '<tr><td width="20%">'.$langs->trans('SalesRepresentative').'</td>'; print '<td colspan="4">'; - print $form->select_dolusers($agentid, 'agentid', 1); + print $form->select_dolusers($agentid, 'agentid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '</td></tr>'; } diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 63c2bd72f28ff161584a671f6fec6308e8d8f864..eb95fd336241aedc1246aaadd9f03a0a96bdc03e 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -307,7 +307,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third $contactsofproject=(! empty($object->id)?$object->getListContactId('internal'):''); if (count($contactsofproject)) { - print $form->select_dolusers($user->id,'userid',0,'',0,'',$contactsofproject); + print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300'); } else { diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index bffff8f3cbe045cc8a2a6dcec8e5a865321f449e..0dd71b42baa5f0d3ece1a706d26c3b6e461ec14f 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -510,7 +510,7 @@ abstract class ActionsCardCommon $this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value',$this->tpl['tva_assuj'],1); // Assujeti par defaut en creation // Select users - $this->tpl['select_users'] = $form->select_dolusers($this->object->commercial_id,'commercial_id',1); + $this->tpl['select_users'] = $form->select_dolusers($this->object->commercial_id, 'commercial_id', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); // Local Tax // TODO mettre dans une classe propre au pays diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index ef64761ab6fe01636a7f79153b122222f0a5fc07..0b373ba9d5de5b1cacfd65d45fca1be83ba16c0c 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -514,7 +514,7 @@ if ($resql) { $moreforfilter.='<div class="divsearchfield">'; $moreforfilter.=$langs->trans('SalesRepresentatives'). ': '; - $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user); + $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user, 0, 1, 'maxwidth300'); $moreforfilter.='</div>'; } } diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index a1f66e832f058aacdcee786c72767888aa2e4631..6aad541c1f97f5d3e861768e9cddffa3a8adee29 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -273,7 +273,7 @@ if ($result) $langs->load("commercial"); $moreforfilter.='<div class="divsearchfield">'; $moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': '; - $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user); + $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user, 0, 1, 'maxwidth300'); $moreforfilter.='</div>'; } // If the user can view prospects other than his' @@ -281,7 +281,7 @@ if ($result) { $moreforfilter.='<div class="divsearchfield">'; $moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': '; - $moreforfilter.=$form->select_dolusers($search_user,'search_user',1); + $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); $moreforfilter.='</div>'; } if (! empty($moreforfilter)) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index bb00659f171b3a2a052a31d7dc50efa2f79da659..66d62959e438c3d8d059303af9c5efaf3a2b3811 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1612,7 +1612,9 @@ div.tabsAction { padding: 0em 0em; text-align: right; } - +div.tabsAction > a { + margin-bottom: 16px !important; +} a.tabTitle { /* background: #657090; @@ -2364,7 +2366,7 @@ tr.even td, tr.pair td, tr.odd td, tr.impair td, form.odd div.tagtd, form.impair tr.even td, tr.pair td, tr.odd td, tr.impair td, form.odd div.tagtd, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd { border-bottom: 1px solid #ddd; } -tr.even:last-child td, tr.pair:last-child td, tr.odd:last-child td, tr.impair:last-child td { +tr.even:last-of-type td, tr.pair:last-of-type td, tr.odd:last-of-type td, tr.impair:last-of-type td { border-bottom: 0px !important; } tr.even td .nobordernopadding tr td, tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td, tr.odd td .nobordernopadding tr td { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 13b2e4df17105bd3dc3ed0f6623615eb1d877c1b..9839959bfb8352c5a92720223a552f8752cc353e 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1592,6 +1592,10 @@ div.tabsAction { padding: 0em 0em; text-align: right; } +div.tabsAction > a { + margin-bottom: 16px !important; +} + div.popuptabset { padding: 6px; border: 1px solid #888; @@ -2187,7 +2191,7 @@ tr.even td, tr.pair td, tr.odd td, tr.impair td, form.odd div.tagtd, form.impair padding: 5px 2px 5px 3px; border-bottom: 1px solid #eee; } -tr.even:last-child td, tr.pair:last-child td, tr.odd:last-child td, tr.impair:last-child td { +tr.even:last-of-type td, tr.pair:last-of-type td, tr.odd:last-of-type td, tr.impair:last-of-type td { border-bottom: 0px !important; } tr.even td .nobordernopadding tr td, tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td, tr.odd td .nobordernopadding tr td { diff --git a/htdocs/user/card.php b/htdocs/user/card.php index c7d745a2c94c9f6e2a93da247f71132a3db4ef2a..9fbd9d20aa7ec2ca45ff96daf9ef4edb1792ccb3 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1007,7 +1007,7 @@ if (($action == 'create') || ($action == 'adduserldap')) // Hierarchy print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>'; print '<td>'; - print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id),0,'',0,$conf->entity); + print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300'); print '</td>'; print "</tr>\n"; @@ -2107,7 +2107,7 @@ else print '<td>'; if ($caneditfield) { - print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id),0,'',0,$object->entity); + print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300'); } else { diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 4edb037d8d66f7527f583c33907cae48dd70fb3a..39aca6f2bf40b0de7e35d9671b6738ee48a819ae 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -398,7 +398,7 @@ else print '<table class="noborder" width="100%">'."\n"; print '<tr class="liste_titre"><td class="liste_titre" width="25%">'.$langs->trans("NonAffectedUsers").'</td>'."\n"; print '<td>'; - print $form->select_dolusers('','user',1,$exclude,0,'','',$object->entity); + print $form->select_dolusers('', 'user', 1, $exclude, 0, '', '', $object->entity, 0, 0, '', 0, '', 'maxwidth300'); print ' '; // Multicompany if (! empty($conf->multicompany->enabled) && is_object($mc))