diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index ec4e9c37bf2..36cd98cd8a3 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -78,7 +78,7 @@ $search_day=GETPOST("search_day","int"); $search_month=GETPOST("search_month","int"); $search_year=GETPOST("search_year","int"); $search_dayfin=GETPOST("search_dayfin","int"); -$search_monthfin=GETPOST("search_monthfin","int"); +$search_month_end=GETPOST("search_month_end","int"); $search_yearfin=GETPOST("search_yearfin","int"); $search_daydelivery=GETPOST("search_daydelivery","int"); $search_monthdelivery=GETPOST("search_monthdelivery","int"); @@ -213,7 +213,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x', $search_month=''; $search_day=''; $search_yearfin=''; - $search_monthfin=''; + $search_month_end=''; $search_dayfin=''; $search_yeardelivery=''; $search_monthdelivery=''; @@ -343,14 +343,14 @@ else if ($search_year > 0) { $sql.= " AND p.datep BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'"; } -if ($search_monthfin > 0) +if ($search_month_end > 0) { if ($search_yearfin > 0 && empty($search_dayfin)) - $sql.= " AND p.fin_validite BETWEEN '".$db->idate(dol_get_first_day($search_yearfin,$search_monthfin,false))."' AND '".$db->idate(dol_get_last_day($search_yearfin,$search_monthfin,false))."'"; + $sql.= " AND p.fin_validite BETWEEN '".$db->idate(dol_get_first_day($search_yearfin,$search_month_end,false))."' AND '".$db->idate(dol_get_last_day($search_yearfin,$search_month_end,false))."'"; else if ($search_yearfin > 0 && ! empty($search_dayfin)) - $sql.= " AND p.fin_validite BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_monthfin, $search_dayfin, $search_yearfin))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_monthfin, $search_dayfin, $search_yearfin))."'"; + $sql.= " AND p.fin_validite BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month_end, $search_dayfin, $search_yearfin))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month_end, $search_dayfin, $search_yearfin))."'"; else - $sql.= " AND date_format(p.fin_validite, '%m') = '".$db->escape($search_monthfin)."'"; + $sql.= " AND date_format(p.fin_validite, '%m') = '".$db->escape($search_month_end)."'"; } else if ($search_yearfin > 0) { @@ -615,7 +615,7 @@ if ($resql) print ''; //print $langs->trans('Month').': '; if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; - print ''; + print ''; //print ' '.$langs->trans('Year').': '; $formother->select_year($search_yearfin,'search_yearfin',1, 20, 5); print '';