diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index 557f786b4b8..5e2894eb11f 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -192,7 +192,7 @@ else { print "\n"; print ''; - print ''; + print ''; print $langs->trans('From'); print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, ''); print '
'; @@ -200,14 +200,13 @@ else { print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, ''); print ''; - print ' '; - print ' '; - print ' '; + print ' '; + print ' '; + print ' '; print ''; - print ''; - print ' '; - print ''; + $searchpitco=$form->showFilterAndCheckAddButtons(0); + print $searchpitco; print ''; print ''; diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index f60b1584455..c884c0ae3a8 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -386,7 +386,7 @@ print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60" al print "\n"; print ''; -print ''; +print ''; print ''; print $langs->trans('From') . ': '; print $form->select_date($search_date_start, 'date_start', 0, 0, 1); @@ -394,15 +394,15 @@ print '
'; print $langs->trans('to') . ': '; print $form->select_date($search_date_end, 'date_end', 0, 0, 1); print ''; -print ''; -print ''; +print ''; +print ''; print $langs->trans('From'); print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, ''); print '
'; print $langs->trans('to'); print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, ''); print ''; -print ''; +print ''; print $langs->trans('From'); print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1); print '
'; @@ -412,10 +412,10 @@ print ''; print ''; print ''; print ''; -print ' '; -print ' '; -print ''; -print ''; +print ' '; +print ' '; +print ''; +print ''; $searchpitco=$form->showFilterAndCheckAddButtons(0); print $searchpitco; print ''; diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index f924881108c..c756cc51949 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -35,9 +35,10 @@ class AdherentType extends CommonObject { public $table_element = 'adherent_type'; public $element = 'adherent_type'; - + public $picto = 'group'; + /** @var string Label */ - public $libelle; + public $label; /** * @var bool * @deprecated Use subscription @@ -199,7 +200,7 @@ class AdherentType extends CommonObject */ function fetch($rowid) { - $sql = "SELECT d.rowid, d.libelle, d.statut, d.subscription, d.mail_valid, d.note, d.vote"; + $sql = "SELECT d.rowid, d.libelle as label, d.statut, d.subscription, d.mail_valid, d.note, d.vote"; $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d"; $sql .= " WHERE d.rowid = ".$rowid; @@ -214,7 +215,8 @@ class AdherentType extends CommonObject $this->id = $obj->rowid; $this->ref = $obj->rowid; - $this->libelle = $obj->libelle; + $this->label = $obj->label; + $this->libelle = $obj->label; // For backward compatibility $this->statut = $obj->statut; $this->subscription = $obj->subscription; $this->mail_valid = $obj->mail_valid; @@ -296,6 +298,16 @@ class AdherentType extends CommonObject } + /** + * getLibStatut + * + * @return string Return status of a type of member + */ + function getLibStatut() + { + return ''; + } + /** * getMailOnValid * diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 3bbccd2693a..cab52dceccc 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -298,20 +298,15 @@ if ($rowid > 0) dol_fiche_head($head, 'card', $langs->trans("MemberType"), 0, 'group'); - print ''; - $linkback = ''.$langs->trans("BackToList").''; - // Ref - print ''; - print ''; + dol_banner_tab($object, 'rowid', $linkback); + + print '
'; + + print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object, 'rowid', $linkback); - print '
'; - // Label - print ''; - - print ''; @@ -378,9 +373,7 @@ if ($rowid > 0) $sql.= " AND t.rowid = ".$object->id; if ($sall) { - $sql.= " AND (d.firstname LIKE '%".$sall."%' OR d.lastname LIKE '%".$sall."%' OR d.societe LIKE '%".$sall."%'"; - $sql.= " OR d.email LIKE '%".$sall."%' OR d.login LIKE '%".$sall."%' OR d.address LIKE '%".$sall."%'"; - $sql.= " OR d.town LIKE '%".$sall."%' OR d.note_public LIKE '%".$sall."%' OR d.note_private LIKE '%".$sall."%')"; + $sql.=natural_search(array("f.firstname","d.lastname","d.societe","d.email","d.login","d.address","d.town","d.note_public","d.note_private"), $sall); } if ($status != '') { @@ -388,22 +381,22 @@ if ($rowid > 0) } if ($action == 'search') { - if (isset($_POST['search']) && $_POST['search'] != '') - { - $sql.= " AND (d.firstname LIKE '%".$_POST['search']."%' OR d.lastname LIKE '%".$_POST['search']."%')"; - } + if (GETPOST('search')) + { + $sql.= natural_search(array("d.firstname","d.lastname"), GETPOST('search')); + } } if (! empty($search_lastname)) { - $sql.= " AND (d.firstname LIKE '%".$search_lastname."%' OR d.lastname LIKE '%".$search_lastname."%')"; + $sql.= natural_search(array("d.firstname","d.lastname"), $search_lastname); } if (! empty($search_login)) { - $sql.= " AND d.login LIKE '%".$search_login."%'"; + $sql.= natural_search("d.login", $search_login); } if (! empty($search_email)) { - $sql.= " AND d.email LIKE '%".$search_email."%'"; + $sql.= natural_search("d.email", $search_email); } if ($filter == 'uptodate') { diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 1584e28bad9..c01e62ae3b5 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -368,7 +368,7 @@ if ($resql) print ''; print ''; print ''; - print ''; + print ''; // Action column print ''; } @@ -850,7 +850,7 @@ if ($resql) } if (! empty($arrayfields['balance']['checked'])) { - print ''; diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 755c1f8421f..5e3f81bb205 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -410,7 +410,7 @@ if (! empty($arrayfields['b.clos']['checked'])) // Balance if (! empty($arrayfields['balance']['checked'])) { - print ''; + print ''; } // Action column print ''; - print ''; print ''; print ''; - print ''; + print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; if (! empty($conf->banque->enabled)) { - print ''; } - print ''; print ''; if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) { - print ''; } print "\n"; diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index e7cef1a50ad..9e33bac4046 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2010 Laurent Destailleur + * Copyright (C) 2005-2016 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2010-2012 Juanjo Menent * @@ -118,7 +118,7 @@ if ($result) print '
'.$langs->trans("Label").''.dol_escape_htmltag($object->libelle).'
'.$langs->trans("SubscriptionRequired").''; + print '
'.$langs->trans("SubscriptionRequired").''; print yn($object->subscription); print '
'; $searchpitco=$form->showFilterAndCheckAddButtons(0); diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php index 189fbaa188f..ce70e7ac938 100644 --- a/htdocs/compta/bank/bankentries.php +++ b/htdocs/compta/bank/bankentries.php @@ -832,7 +832,7 @@ if ($resql) } if (! empty($arrayfields['ba.ref']['checked'])) { - print ''; + print ''; $form->select_comptes($account,'account',0,'',1, ($id > 0 || ! empty($ref)?' disabled="disabled"':'')); print ''; + print ''; $htmltext=$langs->trans("BalanceVisibilityDependsOnSortAndFilters", $langs->transnoentitiesnoconv("DateValue")); print $form->textwithpicto('', $htmltext, 1); print ''; diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index 3c820099e58..e7cd70c1e30 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -94,9 +94,9 @@ $sql.= " WHERE bc.fk_bank_account = ba.rowid"; $sql.= " AND bc.entity = ".$conf->entity; // Search criteria -if ($search_ref) $sql.=" AND bc.ref=".$search_ref; +if ($search_ref) $sql.=natural_search("bc.ref",$search_ref); if ($search_account > 0) $sql.=" AND bc.fk_bank_account=".$search_account; -if ($search_amount) $sql.=" AND bc.amount='".$db->escape(price2num(trim($search_amount)))."'"; +if ($search_amount) $sql.=natural_search("bc.amount", price2num($search_amount)); if ($month > 0) { if ($year > 0 && empty($day)) @@ -166,14 +166,14 @@ if ($resql) print ''; $formother->select_year($year?$year:-1,'year',1, 20, 5); print ''; + print ''; $form->select_comptes($search_account,'search_account',0,'',1); print ' '; print ''; print ''; $searchpitco=$form->showFilterAndCheckAddButtons(0); print $searchpitco; diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index f55d5917750..46c54d32a47 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -248,30 +248,30 @@ if ($resql) // Lines for filters fields print '
'; + print ''; print ''; print ''; + print ''; if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; print ''; $formother->select_year($year?$year:-1,'year',1, 20, 5); print ''; + print ''; print ''; print ''; + print ''; $form->select_types_paiements($search_paymenttype,'search_paymenttype','',2,1,1); print ''; + print ''; print ''; print ''; + print ''; $form->select_comptes($search_account,'search_account',0,'',1); print ''; + print ''; print ''; print ''; @@ -280,7 +280,7 @@ if ($resql) print ''; + print ''; print '
'; print ''; - print ''; + print_liste_field_titre($langs->trans("Line"),$_SERVER["PHP_SELF"]); print_liste_field_titre($langs->trans("WithdrawalsReceipts"),$_SERVER["PHP_SELF"],"p.ref"); print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"f.facnumber",'',$urladd); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom"); @@ -130,10 +130,10 @@ if ($result) print ''; print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; } @@ -196,6 +196,7 @@ if ($result) $searchpitco=$form->showFilterAndCheckAddButtons(0); print $searchpitco; print ''; + print "\n"; while ($i < min($num,$limit)) diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 66d11ce753f..1a45b8a91c7 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -185,7 +185,7 @@ if ($result) // Account if (! empty($conf->banque->enabled)) { - print ''; } diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index efb2c13ea9e..8a8ff68097a 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -488,7 +488,7 @@ if ($resql) } if (! empty($arrayfields['sale_representative']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['c.date_contrat']['checked'])) { diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 3c54cd0a525..c9e57eeaa4d 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -6005,9 +6005,10 @@ class Form { global $conf, $langs; - $out=''; + $out='
'; $out.=''; $out.=''; + $out.='
'; if ($addcheckuncheckall) { if (! empty($conf->use_javascript_ajax)) $out.=''; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index c400f9d167b..acfdeba7d8e 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -313,20 +313,20 @@ print_liste_field_titre(''); print "\n"; print ''; -print ''; +print ''; print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; print '
'.$langs->trans("Line").'
    '; diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index 37d55522749..54a3c891e6a 100644 --- a/htdocs/compta/salaries/index.php +++ b/htdocs/compta/salaries/index.php @@ -185,7 +185,7 @@ if ($result) // Account if (! empty($conf->banque->enabled)) { - print ''; + print ''; $form->select_comptes($search_account,'search_account',0,'',1); print '
'; + print ''; $form->select_comptes($search_account,'search_account',0,'',1); print '
  '; print ''; print '                    '; print $form->selectarray('status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled"), '-2'=>$langs->trans("EnabledAndDisabled"), '2'=>$langs->trans("Archived")), $status, 1); print ''; diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 928b151618a..8236693f37f 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -494,12 +494,13 @@ if ($action == 'delete_section') if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete') { - print ''; + print '
'."\n"; - print ''; - print ''."\n"; + print ''; + print ''; $showonrightsize=''; diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php index 6a9e80e32ad..8964f3b0534 100644 --- a/htdocs/ecm/index_auto.php +++ b/htdocs/ecm/index_auto.php @@ -480,12 +480,13 @@ if ($action == 'delete_section') if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete') { - print '
'; + print ''."\n"; + print '
'; print ' '.$langs->trans("ECMSections"); - print '
'; + print '
'."\n"; - print ''; - print ''."\n"; + print ''; + print ''; $showonrightsize=''; // Auto section diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 9090026d744..f8faa5fa753 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2015 Laurent Destailleur + * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2014 Marcos García @@ -672,7 +672,7 @@ if ($resql) // Status billed if (! empty($arrayfields['cf.billed']['checked'])) { - print ''; } diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 800df6bd812..a41978064f6 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -1,7 +1,7 @@ * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin @@ -717,23 +717,23 @@ if (empty($action)) // Lines for filters fields print ''; - print ''; - print ''; - print ''; + print ''; - print ''; - print ''; - print ''; - print ''; print ''; // DUREE -print ''; +print ''; // DATE DEBUT print ''; print ''; print ''; print ''; - - $starthalfday=($obj->halfday == -1 || $obj->halfday == 2)?'afternoon':'morning'; - $endhalfday=($obj->halfday == 1 || $obj->halfday == 2)?'morning':'afternoon'; - - print ''; print ''; diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index 42791f0af8d..847cd5289dc 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -105,14 +105,14 @@ print_liste_field_titre(''); print ''."\n"; print ''; -print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''; +print ''; $arraystatus=array(''=>' ','expired'=>$langs->trans("Expired"),'opened'=>$langs->trans("Opened")); -print ''; -print ''; +print ''; +print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; // Status -print ''; print '\n"; print ''; if (! empty($arrayfields['u.login']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['u.lastname']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['u.firstname']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['u.gender']['checked'])) { - print ''; } if (! empty($arrayfields['u.employee']['checked'])) { - print ''; } if (! empty($arrayfields['u.accountancy_code']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['u.email']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['u.fk_soc']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['u.entity']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['u.fk_user']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['u.datelastlogin']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['u.datepreviouslogin']['checked'])) { - print ''; + print ''; } // Extra fields if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
'; + print ''."\n"; + print '
'; print ' '.$langs->trans("ECMSections"); - print '
'; + print ''; print $form->selectyesno('billed', $billed, 1, 0, 1); print '
'; + print ''; print ''; print ' '; + print ' '; print ''; print ''; + print ''; $form->select_types_paiements($search_paymenttype,'search_paymenttype','',2,1,1); print ''; + print ''; print ''; print ''; + print ''; $form->select_comptes($search_account,'search_account',0,'',1); print ''; + print ''; print ''; print ''; diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 60da780370d..131dcc3651b 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -364,7 +364,7 @@ print $form->selectarray('type', $arraytypeleaves, (GETPOST('type')?GETPOST('typ print '  '; diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php index acc16eb0d3e..504cb4263e2 100644 --- a/htdocs/hrm/index.php +++ b/htdocs/hrm/index.php @@ -145,7 +145,8 @@ $langs->load("boxes"); // Last leave requests if (! empty($conf->holiday->enabled) && $user->rights->holiday->read) { - $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.photo, u.statut, x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status"; + $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.photo, u.statut,"; + $sql.= " x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status"; $sql.= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE u.rowid = x.fk_user"; $sql.= " AND x.entity = ".$conf->entity; @@ -182,23 +183,25 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read) while ($i < $num && $i < $max) { $obj = $db->fetch_object($result); + $holidaystatic->id=$obj->rowid; $holidaystatic->ref=$obj->ref; + $userstatic->id=$obj->uid; $userstatic->lastname=$obj->lastname; $userstatic->firstname=$obj->firstname; $userstatic->login=$obj->login; $userstatic->photo=$obj->photo; $userstatic->statut=$obj->statut; + + $starthalfday=($obj->halfday == -1 || $obj->halfday == 2)?'afternoon':'morning'; + $endhalfday=($obj->halfday == 1 || $obj->halfday == 2)?'morning':'afternoon'; + print '
'.$holidaystatic->getNomUrl(1).''.$userstatic->getNomUrl(-1, 'leave').''.$typeleaves[$obj->fk_type]['label'].''.dol_print_date($obj->date_start,'day').' '.$langs->trans($listhalfday[$endhalfday]); + print ''.dol_print_date($obj->date_start,'day').' '.$langs->trans($listhalfday[$starthalfday]); print ''.dol_print_date($obj->date_end,'day').' '.$langs->trans($listhalfday[$endhalfday]); print ''.dol_print_date($db->jdate($obj->dm),'day').''.$holidaystatic->LibStatut($obj->status,3).'
'. $form->selectarray('status', $arraystatus, $status).''. $form->selectarray('status', $arraystatus, $status).''; $searchpitco=$form->showFilterAndCheckAddButtons(0); print $searchpitco; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 45da1eee13c..9f101b43294 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2818,6 +2818,9 @@ tr.liste_titre_topborder td { .liste_titre td a.notasortlink:hover { background: transparent; } +tr.liste_titre td.liste_titre { /* For last line of table headers only */ + border-bottom: 1px solid rgb(); +} tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index c95bd830059..5a6b5a48297 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2711,6 +2711,10 @@ tr.liste_titre_topborder td { .liste_titre td a.notasortlink:hover { background: transparent; } +tr.liste_titre td.liste_titre { /* For last line of table headers only */ + border-bottom: 1px solid rgb(); +} + div.liste_titre { padding-left: 3px; } diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php index 66d725b3204..9c5dd745347 100644 --- a/htdocs/user/hierarchy.php +++ b/htdocs/user/hierarchy.php @@ -146,10 +146,10 @@ print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','','','','maxwidthsearc print '
    '; +print ''; print $form->selectarray('search_statut', array('-1'=>'','1'=>$langs->trans('Enabled')),$search_statut); print ''; diff --git a/htdocs/user/index.php b/htdocs/user/index.php index b1aba55a73f..54c99ca411a 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2015 Laurent Destailleur + * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2015 Alexandre Spangaro * Copyright (C) 2016 Marcos García @@ -354,56 +354,56 @@ print "
'; + print ''; $arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman")); print $form->selectarray('search_gender', $arraygender, $search_gender, 1); print ''; + print ''; print $form->selectyesno('search_employee', $search_employee, 1, false, 1); print '