diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index c6c638f06f3..d3842411d94 100755 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -1693,10 +1693,10 @@ class ExpenseReportLine * Retourne la liste deroulante des differents etats d'une note de frais. * Les valeurs de la liste sont les id de la table c_expensereport_statuts * - * @param int $selected etat pre-selectionne + * @param int $selected preselect status * @param string $htmlname Name of HTML select * @param int $useempty 1=Add empty line - * @return string HTML select with sattus + * @return string HTML select with status */ function select_expensereport_statut($selected='',$htmlname='fk_statut',$useempty=1) { diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 9ef9c05a328..ca33fc34f0f 100755 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2015 Alexandre Spangaro + * Copyright (C) 2015 Alexandre Spangaro * * 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 @@ -41,7 +41,9 @@ $result = restrictedArea($user, 'expensereport','',''); $search_ref = GETPOST('search_ref'); $search_user = GETPOST('search_user','int'); -$search_status = GETPOST('search_status','int'); +$search_amount_ht = GETPOST('search_amount_ht','alpha'); +$search_amount_ttc = GETPOST('search_amount_ttc','alpha'); +$search_status = (GETPOST('search_status','alpha')!=''?GETPOST('search_status','alpha'):GETPOST('statut','alpha')); $month_start = GETPOST("month_start","int"); $year_start = GETPOST("year_start","int"); $month_end = GETPOST("month_end","int"); @@ -51,6 +53,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both { $search_ref=""; $search_user=""; + $search_amount_ht=""; + $search_amount_ttc=""; $search_status=""; $month_start=""; $year_start=""; @@ -58,6 +62,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both $year_end=""; } +if ($search_status == '') $search_status=-1; +if ($search_user == '') $search_user=-1; + /* * View */ @@ -86,17 +93,16 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -$sql = "SELECT d.rowid, d.ref, d.total_ht, d.total_tva, d.total_ttc, d.fk_statut as status,"; +$sql = "SELECT d.rowid, d.ref, d.fk_user_author, d.total_ht, d.total_tva, d.total_ttc, d.fk_statut as status,"; $sql.= " d.date_debut, d.date_fin,"; $sql.= " u.rowid as id_user, u.firstname, u.lastname"; $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON d.fk_user_author = u.rowid"; +$sql.= " WHERE d.entity = ".$conf->entity; -// Where +// Ref if(!empty($search_ref)){ - $sql.= " WHERE d.ref LIKE '%".$db->escape($search_ref)."%'"; -}else{ - $sql.= " WHERE 1 = 1"; + $sql.= " AND d.ref LIKE '%".$db->escape($search_ref)."%'"; } // Date Start if ($month_start > 0) @@ -126,13 +132,26 @@ else if ($year_end > 0) { $sql.= " AND d.date_fin BETWEEN '".$db->idate(dol_get_first_day($year_end,1,false))."' AND '".$db->idate(dol_get_last_day($year_end,12,false))."'"; } -// User -if ($search_name) +// Amount +if ($search_amount_ht != '') { - $sql .= natural_search('u.lastname', $search_name); + $sql.= natural_search('d.total_ht', $search_amount_ht, 1); +} +if ($search_amount_ttc != '') +{ + $sql.= natural_search('d.total_ttc', $search_amount_ttc, 1); +} +// User +if ($search_user != '' && $search_user >= 0) +{ + $sql.= " AND u.rowid = '".$db->escape($search_user)."'"; } // Status -if($search_status != '') $sql.= " AND d.fk_statut = '".$search_status."'"; +if ($search_status != '' && $search_status >= 0) +{ + if (strstr($search_status, ',')) $sql.=" AND d.fk_statut IN (".$db->escape($search_status).")"; + else $sql.=" AND d.fk_statut = ".$search_status; +} // RESTRICT RIGHTS if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) @@ -150,11 +169,17 @@ $resql=$db->query($sql); if ($resql) { $num = $db->num_rows($resql); - $i = 0; - print_barre_liste($langs->trans("ListTripsAndExpenses"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); - print '
'."\n"; + $param=""; + if ($search_ref) $param.="&search_ref=".$search_ref; + if ($search_user) $param.="&search_user=".$search_user; + if ($search_amount_ht) $param.="&search_amount_ht=".$search_amount_ht; + if ($search_amount_ttc) $param.="&search_amount_ttc=".$search_amount_ttc; + if ($search_status >= 0) $param.="&search_status=".$search_status; + + print_barre_liste($langs->trans("ListTripsAndExpenses"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + print ''."\n"; print ''; print ""; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","",$param,'',$sortfield,$sortorder); @@ -194,9 +219,13 @@ if ($resql) print ''; } + // Amount with no taxe + print ''; + print ''; - print ''; - print ''; + + // Amount with all taxes + print ''; // Status print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print '';
    '; @@ -249,9 +278,9 @@ if ($resql) print '
'.$langs->trans("Total").''.$total_total_ht.''.$total_total_tva.''.$total_total_ttc.''.price($total_total_ht).''.price($total_total_tva).''.price($total_total_ttc).'