From be302ce5ae0f025e7ed7fa43935da0100fdeeee2 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 3 May 2015 08:10:22 +0200 Subject: [PATCH] New: ER Add filter on amounts --- htdocs/expensereport/list.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 4faff0ecbb4..cc48c78f252 100755 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -41,6 +41,8 @@ $result = restrictedArea($user, 'expensereport','',''); $search_ref = GETPOST('search_ref'); $search_user = GETPOST('search_user','int'); +$search_amount_ht = GETPOST('search_amount_ht','alpha'); +$search_amount_ttc = GETPOST('search_amount_ttc','alpha'); $search_status = GETPOST('search_status','int'); $month_start = GETPOST("month_start","int"); $year_start = GETPOST("year_start","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=""; @@ -126,6 +130,15 @@ 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))."'"; } +// Amount +if ($search_amount_ht != '') +{ + $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_name) { @@ -194,9 +207,13 @@ if ($resql) print ' '; } + // Amount with no taxe + print ''; + print ' '; - print ' '; - print ' '; + + // Amount with all taxes + print ''; // Status print '';