diff --git a/ChangeLog b/ChangeLog index f226db24ee7..864f0930fe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: Can filter on status on interventions. - New: Add help info of field type into dictionary of payment types. - New: Add proposals into referer page of thirdparty. - New: On contact list can set filter on both active and not active (no more exclusive select). diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 6a730dbe046..cb343627959 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("companies"); +$langs->load("bills"); $langs->load("interventions"); $socid=GETPOST('socid','int'); @@ -54,12 +55,15 @@ $limit = $conf->liste_limit; $search_ref=GETPOST('search_ref','alpha'); $search_company=GETPOST('search_company','alpha'); $search_desc=GETPOST('search_desc','alpha'); +$search_status=GETPOST('search_status'); /* * View */ +$form = new Form($db); + llxHeader(); @@ -83,11 +87,14 @@ if ($search_company) { if ($search_desc) { $sql .= natural_search(array('f.description', 'fd.description'), $search_desc); } +if ($search_status != '' && $search_status >= 0) { + $sql .= ' AND f.fk_statut = '.$search_status; +} if (! $user->rights->societe->client->voir && empty($socid)) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = " . $socid; -$sql.= " ORDER BY ".$sortfield." ".$sortorder; +$sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1, $offset); $result=$db->query($sql); @@ -100,7 +107,7 @@ if ($result) $urlparam="&socid=$socid"; print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $urlparam, $sortfield, $sortorder, '', $num); - print '