diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 880a18d501a..7dfd39171e9 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -89,12 +89,12 @@ $search_country=GETPOST("search_country",'int');
$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
$search_user = GETPOST('search_user','int');
$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');
-$year_lim = GETPOST('year_lim','int');
+$search_day = GETPOST('search_day','int');
+$search_month = GETPOST('search_month','int');
+$search_year = GETPOST('search_year','int');
+$search_day_lim = GETPOST('search_day_lim','int');
+$search_month_lim = GETPOST('search_month_lim','int');
+$search_year_lim = GETPOST('search_year_lim','int');
$option = GETPOST('option');
if ($option == 'late') {
@@ -219,14 +219,14 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','a
$search_type='';
$search_country='';
$search_type_thirdparty='';
- $day='';
- $year='';
- $month='';
+ $search_day='';
+ $search_year='';
+ $search_month='';
$option='';
$filter='';
- $day_lim='';
- $year_lim='';
- $month_lim='';
+ $search_day_lim='';
+ $search_year_lim='';
+ $search_month_lim='';
$toselect='';
$search_array_options=array();
}
@@ -444,31 +444,31 @@ if ($search_status != '' && $search_status >= 0)
if ($search_status == '3') $sql.=" AND f.fk_statut = 3"; // abandonned
}
if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$db->escape($search_paymentmode);
-if ($month > 0)
+if ($search_month > 0)
{
- if ($year > 0 && empty($day))
- $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
- else if ($year > 0 && ! empty($day))
- $sql.= " AND f.datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+ if ($search_year > 0 && empty($search_day))
+ $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
+ else if ($search_year > 0 && ! empty($search_day))
+ $sql.= " AND f.datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $serch_year))."'";
else
$sql.= " AND date_format(f.datef, '%m') = '".$month."'";
}
-else if ($year > 0)
+else if ($search_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))."'";
+ $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_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))."'";
+ if ($search_year_lim > 0 && empty($search_day_lim))
+ $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($search_year_lim,$search_month_lim,false))."' AND '".$db->idate(dol_get_last_day($search_year_lim,$search_month_lim,false))."'";
+ else if ($search_year_lim > 0 && ! empty($search_day_lim))
+ $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month_lim, $search_day_lim, $search_year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month_lim, $search_day_lim, $search_year_lim))."'";
else
- $sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$db->escape($month_lim)."'";
+ $sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$db->escape($search_month_lim)."'";
}
-else if ($year_lim > 0)
+else if ($search_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))."'";
+ $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_get_first_day($search_year_lim,1,false))."' AND '".$db->idate(dol_get_last_day($search_year_lim,12,false))."'";
}
if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
@@ -539,12 +539,12 @@ if ($resql)
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
if ($sall) $param.='&sall='.urlencode($sall);
- if ($day) $param.='&day='.urlencode($day);
- if ($month) $param.='&month='.urlencode($month);
- if ($year) $param.='&year=' .urlencode($year);
- if ($day_lim) $param.='&day_lim='.urlencode($day_lim);
- if ($month_lim) $param.='&month_lim='.urlencode($month_lim);
- if ($year_lim) $param.='&year_lim=' .urlencode($year_lim);
+ if ($search_day) $param.='&search_day='.urlencode($search_day);
+ if ($search_month) $param.='&search_month='.urlencode($search_month);
+ if ($search_year) $param.='&search_year=' .urlencode($search_year);
+ if ($search_day_lim) $param.='&search_day_lim='.urlencode($search_day_lim);
+ if ($search_month_lim) $param.='&search_month_lim='.urlencode($search_month_lim);
+ if ($search_year_lim) $param.='&search_year_lim=' .urlencode($search_year_lim);
if ($search_ref) $param.='&search_ref=' .urlencode($search_ref);
if ($search_refcustomer) $param.='&search_refcustomer=' .urlencode($search_refcustomer);
if ($search_type != '') $param.='&search_type='.urlencode($search_type);
@@ -559,9 +559,9 @@ if ($resql)
if ($search_montant_ttc != '') $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
if ($search_status != '') $param.='&search_status='.urlencode($search_status);
if ($search_paymentmode > 0) $param.='search_paymentmode='.urlencode($search_paymentmode);
- if ($show_files) $param.='&show_files=' .$show_files;
- if ($option) $param.="&option=".$option;
- if ($optioncss != '') $param.='&optioncss='.$optioncss;
+ if ($show_files) $param.='&show_files=' .urlencode($show_files);
+ if ($option) $param.="&option=".urlencode($option);
+ if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -702,18 +702,18 @@ if ($resql)
if (! empty($arrayfields['f.date']['checked']))
{
print '
';
- if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
- print '';
- $formother->select_year($year?$year:-1,'year',1, 20, 5, 0, 0, '', 'width75');
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
+ print '';
+ $formother->select_year($search_year?$search_year:-1,'search_year',1, 20, 5, 0, 0, '', 'width75');
print ' | ';
}
// Date due
if (! empty($arrayfields['f.date_lim_reglement']['checked']))
{
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, 0, 0, '', 'width75');
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
+ print '';
+ $formother->select_year($search_year_lim?$search_year_lim:-1,'search_year_lim',1, 20, 5, 0, 0, '', 'width75');
print ' '.$langs->trans("Late");
print ' | ';
}
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index ef5f8816a94..aff104cf25f 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -54,12 +54,12 @@ $show_files=GETPOST('show_files','int');
$confirm=GETPOST('confirm','alpha');
$toselect = GETPOST('toselect', 'array');
-$orderyear=GETPOST("orderyear","int");
-$ordermonth=GETPOST("ordermonth","int");
-$orderday=GETPOST("orderday","int");
-$deliveryyear=GETPOST("deliveryyear","int");
-$deliverymonth=GETPOST("deliverymonth","int");
-$deliveryday=GETPOST("deliveryday","int");
+$search_orderyear=GETPOST("search_orderyear","int");
+$search_ordermonth=GETPOST("search_ordermonth","int");
+$search_orderday=GETPOST("search_orderday","int");
+$search_deliveryyear=GETPOST("search_deliveryyear","int");
+$search_deliverymonth=GETPOST("search_deliverymonth","int");
+$search_deliveryday=GETPOST("search_deliveryday","int");
$sall=GETPOST('search_all', 'alphanohtml');
$search_product_category=GETPOST('search_product_category','int');
@@ -182,9 +182,6 @@ if (empty($reshook))
// Purge search criteria
if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
{
- $ordermonth='';
- $orderyear='';
- $orderday='';
$search_categ='';
$search_user='';
$search_sale='';
@@ -204,12 +201,12 @@ if (empty($reshook))
$search_total_ttc='';
$search_project_ref='';
$search_status=-1;
- $orderyear='';
- $ordermonth='';
- $orderday='';
- $deliveryday='';
- $deliverymonth='';
- $deliveryyear='';
+ $search_orderyear='';
+ $search_ordermonth='';
+ $search_orderday='';
+ $search_deliveryday='';
+ $search_deliverymonth='';
+ $search_deliveryyear='';
$billed='';
$search_billed='';
$toselect='';
@@ -525,7 +522,7 @@ if ($search_refsupp) $sql.= natural_search("cf.ref_supplier", $search_refsupp);
if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
if ($search_company) $sql .= natural_search('s.nom', $search_company);
if ($search_request_author) $sql.=natural_search(array('u.lastname','u.firstname','u.login'), $search_request_author) ;
-if ($search_billed != '' && $search_billed >= 0) $sql .= " AND cf.billed = ".$search_billed;
+if ($search_billed != '' && $search_billed >= 0) $sql .= " AND cf.billed = ".$db->escape($search_billed);
//Required triple check because statut=0 means draft filter
if (GETPOST('statut', 'intcomma') !== '')
@@ -536,31 +533,31 @@ if ($search_status != '' && $search_status >= 0)
{
$sql.=" AND cf.fk_statut IN (".$db->escape($search_status).")";
}
-if ($ordermonth > 0)
+if ($search_ordermonth > 0)
{
- if ($orderyear > 0 && empty($orderday))
- $sql.= " AND cf.date_commande BETWEEN '".$db->idate(dol_get_first_day($orderyear,$ordermonth,false))."' AND '".$db->idate(dol_get_last_day($orderyear,$ordermonth,false))."'";
- else if ($orderyear > 0 && ! empty($orderday))
- $sql.= " AND cf.date_commande BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $ordermonth, $orderday, $orderyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $ordermonth, $orderday, $orderyear))."'";
+ if ($search_orderyear > 0 && empty($search_orderday))
+ $sql.= " AND cf.date_commande BETWEEN '".$db->idate(dol_get_first_day($search_orderyear,$search_ordermonth,false))."' AND '".$db->idate(dol_get_last_day($search_orderyear,$search_ordermonth,false))."'";
+ else if ($search_orderyear > 0 && ! empty($search_orderday))
+ $sql.= " AND cf.date_commande BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_ordermonth, $search_orderday, $search_orderyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_ordermonth, $search_orderday, $search_orderyear))."'";
else
- $sql.= " AND date_format(cf.date_commande, '%m') = '".$ordermonth."'";
+ $sql.= " AND date_format(cf.date_commande, '%m') = '".$db->escape($search_ordermonth)."'";
}
-else if ($orderyear > 0)
+else if ($search_orderyear > 0)
{
- $sql.= " AND cf.date_commande BETWEEN '".$db->idate(dol_get_first_day($orderyear,1,false))."' AND '".$db->idate(dol_get_last_day($orderyear,12,false))."'";
+ $sql.= " AND cf.date_commande BETWEEN '".$db->idate(dol_get_first_day($search_orderyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_orderyear,12,false))."'";
}
-if ($deliverymonth > 0)
+if ($search_deliverymonth > 0)
{
- if ($deliveryyear > 0 && empty($deliveryday))
- $sql.= " AND cf.date_livraison BETWEEN '".$db->idate(dol_get_first_day($deliveryyear,$deliverymonth,false))."' AND '".$db->idate(dol_get_last_day($deliveryyear,$deliverymonth,false))."'";
- else if ($deliveryyear > 0 && ! empty($deliveryday))
- $sql.= " AND cf.date_livraison BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $deliverymonth, $deliveryday, $deliveryyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $deliverymonth, $deliveryday, $deliveryyear))."'";
- else
- $sql.= " AND date_format(cf.date_livraison, '%m') = '".$deliverymonth."'";
+ if ($search_deliveryyear > 0 && empty($search_deliveryday))
+ $sql.= " AND cf.date_livraison BETWEEN '".$db->idate(dol_get_first_day($search_deliveryyear,$search_deliverymonth,false))."' AND '".$db->idate(dol_get_last_day($search_deliveryyear,$search_deliverymonth,false))."'";
+ else if ($search_deliveryyear > 0 && ! empty($search_deliveryday))
+ $sql.= " AND cf.date_livraison BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_eliverymonth, $search_deliveryday, $search_deliveryyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_deliverymonth, $search_deliveryday, $search_deliveryyear))."'";
+ else
+ $sql.= " AND date_format(cf.date_livraison, '%m') = '".$db->escape($search_deliverymonth)."'";
}
-else if ($deliveryyear > 0)
+else if ($search_deliveryyear > 0)
{
- $sql.= " AND cf.date_livraison BETWEEN '".$db->idate(dol_get_first_day($deliveryyear,1,false))."' AND '".$db->idate(dol_get_last_day($deliveryyear,12,false))."'";
+ $sql.= " AND cf.date_livraison BETWEEN '".$db->idate(dol_get_first_day($search_deliveryyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_deliveryyear,12,false))."'";
}
if ($search_town) $sql.= natural_search('s.town', $search_town);
if ($search_zip) $sql.= natural_search("s.zip",$search_zip);
@@ -615,12 +612,12 @@ if ($resql)
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
if ($sall) $param.="&search_all=".$sall;
- if ($orderday) $param.='&orderday='.$orderday;
- if ($ordermonth) $param.='&ordermonth='.$ordermonth;
- if ($orderyear) $param.='&orderyear='.$orderyear;
- if ($deliveryday) $param.='&deliveryday='.$deliveryday;
- if ($deliverymonth) $param.='&deliverymonth='.$deliverymonth;
- if ($deliveryyear) $param.='&deliveryyear='.$deliveryyear;
+ if ($search_orderday) $param.='&search_orderday='.$search_orderday;
+ if ($search_ordermonth) $param.='&search_ordermonth='.$search_ordermonth;
+ if ($search_orderyear) $param.='&search_orderyear='.$search_orderyear;
+ if ($search_deliveryday) $param.='&search_deliveryday='.$search_deliveryday;
+ if ($search_deliverymonth) $param.='&search_deliverymonth='.$search_deliverymonth;
+ if ($search_deliveryyear) $param.='&search_deliveryyear='.$search_deliveryyear;
if ($search_ref) $param.='&search_ref='.$search_ref;
if ($search_company) $param.='&search_company='.$search_company;
if ($search_user > 0) $param.='&search_user='.$search_user;
@@ -818,18 +815,18 @@ if ($resql)
if (! empty($arrayfields['cf.date_commande']['checked']))
{
print '';
- if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
- print '';
- $formother->select_year($orderyear?$orderyear:-1,'orderyear',1, 20, 5);
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
+ print '';
+ $formother->select_year($search_orderyear?$search_orderyear:-1,'search_orderyear',1, 20, 5);
print ' | ';
}
// Date delivery
if (! empty($arrayfields['cf.date_delivery']['checked']))
{
print '';
- if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
- print '';
- $formother->select_year($deliveryyear?$deliveryyear:-1,'deliveryyear',1, 20, 5);
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
+ print '';
+ $formother->select_year($search_deliveryyear?$search_deliveryyear:-1,'search_deliveryyear',1, 20, 5);
print ' | ';
}
if (! empty($arrayfields['cf.total_ht']['checked']))
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 6a3daaf6cfb..e7a9250c6cf 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -278,6 +278,7 @@ input.select2-input {
.liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
.liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month],
.liste_titre input[name=month_lim], .liste_titre input[name=month_start], .liste_titre input[name=month_end], .liste_titre input[name=month_create],
+.liste_titre input[name=search_month_lim], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end], .liste_titre input[name=search_month_create],
.liste_titre input[name=search_day_date_when], .liste_titre input[name=search_month_date_when], .liste_titre input[name=search_year_date_when],
.liste_titre input[name=search_month_create], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end]
{
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c36edde7ddc..eff7b98e8c5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -291,6 +291,7 @@ textarea.cke_source:focus
.liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
.liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month],
.liste_titre input[name=month_lim], .liste_titre input[name=month_start], .liste_titre input[name=month_end], .liste_titre input[name=month_create],
+.liste_titre input[name=search_month_lim], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end], .liste_titre input[name=search_month_create],
.liste_titre input[name=search_day_date_when], .liste_titre input[name=search_month_date_when], .liste_titre input[name=search_year_date_when],
.liste_titre input[name=search_month_create], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end]
{