diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 6d9a6329d4e..a68ed8ef903 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -89,8 +89,8 @@ $search_sale = GETPOST('search_sale','int');
$day = GETPOST('day','int');
$month = GETPOST('month','int');
$year = GETPOST('year','int');
-$day_lim = GETPOST('day_lim','int');
-$month_lim = GETPOST('month_lim','int');
+$day_lim = GETPOST('day_lim','int');
+$month_lim = GETPOST('month_lim','int');
$year_lim = GETPOST('year_lim','int');
$filtre = GETPOST('filtre');
@@ -217,18 +217,18 @@ else if ($year > 0)
{
$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
}
-if ($month_lim > 0)
-{
- if ($year_lim > 0 && empty($day_lim))
- $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($year_lim,$month_lim,false))."' AND '".$db->idate(dol_get_last_day($year_lim,$month_lim,false))."'";
- else if ($year_lim > 0 && ! empty($day_lim))
- $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'";
- else
- $sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$month_lim."'";
-}
-else if ($year_lim > 0)
-{
- $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($year_lim,1,false))."' AND '".$db->idate(dol_get_last_day($year_lim,12,false))."'";
+if ($month_lim > 0)
+{
+ if ($year_lim > 0 && empty($day_lim))
+ $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($year_lim,$month_lim,false))."' AND '".$db->idate(dol_get_last_day($year_lim,$month_lim,false))."'";
+ else if ($year_lim > 0 && ! empty($day_lim))
+ $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'";
+ else
+ $sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$month_lim."'";
+}
+else if ($year_lim > 0)
+{
+ $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($year_lim,1,false))."' AND '".$db->idate(dol_get_last_day($year_lim,12,false))."'";
}
if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
if ($search_user > 0)
@@ -339,10 +339,10 @@ if ($resql)
print '';
$formother->select_year($year?$year:-1,'year',1, 20, 5);
print '';
- print '
';
- if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
- print '';
- $formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5);
+ print ' | ';
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
+ print '';
+ $formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5);
print ' | ';
print ' | ';
print ' | ';
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 88a82573d7a..26cfbacb6bf 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -78,8 +78,8 @@ $search_status=GETPOST('search_status','alpha');
$day = GETPOST("day","int");
$month = GETPOST("month","int");
$year = GETPOST("year","int");
-$day_lim = GETPOST('day_lim','int');
-$month_lim = GETPOST('month_lim','int');
+$day_lim = GETPOST('day_lim','int');
+$month_lim = GETPOST('month_lim','int');
$year_lim = GETPOST('year_lim','int');
$filter = GETPOST("filtre");
@@ -179,18 +179,18 @@ else if ($year > 0)
{
$sql.= " AND fac.datef BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
}
-if ($month_lim > 0)
-{
- if ($year_lim > 0 && empty($day_lim))
- $sql.= " AND fac.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($year_lim,$month_lim,false))."' AND '".$db->idate(dol_get_last_day($year_lim,$month_lim,false))."'";
- else if ($year_lim > 0 && ! empty($day_lim))
- $sql.= " AND fac.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'";
- else
- $sql.= " AND date_format(fac.date_lim_reglement, '%m') = '".$month_lim."'";
-}
-else if ($year_lim > 0)
-{
- $sql.= " AND fac.datef BETWEEN '".$db->idate(dol_get_first_day($year_lim,1,false))."' AND '".$db->idate(dol_get_last_day($year_lim,12,false))."'";
+if ($month_lim > 0)
+{
+ if ($year_lim > 0 && empty($day_lim))
+ $sql.= " AND fac.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($year_lim,$month_lim,false))."' AND '".$db->idate(dol_get_last_day($year_lim,$month_lim,false))."'";
+ else if ($year_lim > 0 && ! empty($day_lim))
+ $sql.= " AND fac.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'";
+ else
+ $sql.= " AND date_format(fac.date_lim_reglement, '%m') = '".$month_lim."'";
+}
+else if ($year_lim > 0)
+{
+ $sql.= " AND fac.datef BETWEEN '".$db->idate(dol_get_first_day($year_lim,1,false))."' AND '".$db->idate(dol_get_last_day($year_lim,12,false))."'";
}
if ($search_label)
{
@@ -280,14 +280,14 @@ if ($resql)
print '';
}
print '';
- if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
print '';
$formother->select_year($year?$year:-1,'year',1, 20, 5);
print ' | ';
- print '';
- if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
- print '';
- $formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5);
+ print ' | ';
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
+ print '';
+ $formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5);
print ' | ';
print '';
print '';
|