*
* 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
@@ -65,6 +66,22 @@ $search_town = GETPOST('search_town', 'alpha');
$search_zip = GETPOST('search_zip', 'alpha');
$search_state = GETPOST("search_state");
$search_country = GETPOST("search_country", 'int');
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
+$search_date_valid_startday = GETPOST('search_date_valid_startday', 'int');
+$search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int');
+$search_date_valid_startyear = GETPOST('search_date_valid_startyear', 'int');
+$search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
+$search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
+$search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
+$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver
+$search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
$search_montant_ht = GETPOST('search_montant_ht', 'alpha');
$search_montant_vat = GETPOST('search_montant_vat', 'alpha');
@@ -83,12 +100,6 @@ $search_remove_btn = GETPOST('button_removefilter', 'alpha');
$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
$mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
-$year = GETPOST("year");
-$month = GETPOST("month");
-$day = GETPOST("day");
-$yearvalid = GETPOST("yearvalid");
-$monthvalid = GETPOST("monthvalid");
-$dayvalid = GETPOST("dayvalid");
$optioncss = GETPOST('optioncss', 'alpha');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -227,12 +238,22 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_type = '';
$search_country = '';
$search_type_thirdparty = '';
- $yearvalid = '';
- $monthvalid = '';
- $dayvalid = '';
- $year = '';
- $month = '';
- $day = '';
+ $search_date_startday = '';
+ $search_date_startmonth = '';
+ $search_date_startyear = '';
+ $search_date_endday = '';
+ $search_date_endmonth = '';
+ $search_date_endyear = '';
+ $search_date_start = '';
+ $search_date_end = '';
+ $search_date_valid_startday = '';
+ $search_date_valid_startmonth = '';
+ $search_date_valid_startyear = '';
+ $search_date_valid_endday = '';
+ $search_date_valid_endmonth = '';
+ $search_date_valid_endyear = '';
+ $search_date_valid_start = '';
+ $search_date_valid_end = '';
$search_status = '';
$object_statut = '';
}
@@ -376,8 +397,18 @@ if ($socid) {
if ($search_status >= 0 && $search_status != '') {
$sql .= ' AND sp.fk_statut IN ('.$db->sanitize($db->escape($search_status)).')';
}
-$sql .= dolSqlDateFilter("sp.date_livraison", $day, $month, $year);
-$sql .= dolSqlDateFilter("sp.date_valid", $dayvalid, $monthvalid, $yearvalid);
+if ($search_date_start) {
+ $sql .= " AND sp.date_livraison >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+ $sql .= " AND sp.date_livraison <= '".$db->idate($search_date_end)."'";
+}
+if ($search_date_valid_start) {
+ $sql .= " AND sp.date_valid >= '".$db->idate($search_date_valid_start)."'";
+}
+if ($search_date_valid_end) {
+ $sql .= " AND sp.date_valid <= '".$db->idate($search_date_valid_end)."'";
+}
if ($search_sale > 0) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
}
@@ -446,11 +477,41 @@ if ($resql) {
if ($sall) {
$param .= '&sall='.urlencode($sall);
}
- if ($month) {
- $param .= '&month='.urlencode($month);
+ if ($search_date_startday) {
+ $param .= '&search_date_startday='.urlencode($search_date_startday);
}
- if ($year) {
- $param .= '&year='.urlencode($year);
+ if ($search_date_startmonth) {
+ $param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+ }
+ if ($search_date_startyear) {
+ $param .= '&search_date_startyear='.urlencode($search_date_startyear);
+ }
+ if ($search_date_endday) {
+ $param .= '&search_date_endday='.urlencode($search_date_endday);
+ }
+ if ($search_date_endmonth) {
+ $param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+ }
+ if ($search_date_endyear) {
+ $param .= '&search_date_endyear='.urlencode($search_date_endyear);
+ }
+ if ($search_date_valid_startday) {
+ $param .= '&search_date_valid_startday='.urlencode($search_date_valid_startday);
+ }
+ if ($search_date_valid_startmonth) {
+ $param .= '&search_date_valid_startmonth='.urlencode($search_date_valid_startmonth);
+ }
+ if ($search_date_valid_startyear) {
+ $param .= '&search_date_valid_startyear='.urlencode($search_date_valid_startyear);
+ }
+ if ($search_date_valid_endday) {
+ $param .= '&search_date_valid_endday='.urlencode($search_date_valid_endday);
+ }
+ if ($search_date_valid_endmonth) {
+ $param .= '&search_date_valid_endmonth='.urlencode($search_date_valid_endmonth);
+ }
+ if ($search_date_valid_endyear) {
+ $param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
}
if ($search_ref) {
$param .= '&search_ref='.urlencode($search_ref);
@@ -641,21 +702,23 @@ if ($resql) {
// Date
if (!empty($arrayfields['sp.date_valid']['checked'])) {
print '| ';
- //print $langs->trans('Month').': ';
- print '';
- //print ' '.$langs->trans('Year').': ';
- $syearvalid = $yearvalid;
- $formother->select_year($syearvalid, 'yearvalid', 1, 20, 5);
+ print ' ';
+ print $form->selectDate($search_date_valid_start ? $search_date_valid_start : -1, 'search_date_valid_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+ print ' ';
+ print '';
+ print $form->selectDate($search_date_valid_end ? $search_date_valid_end : -1, 'search_date_valid_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+ print ' ';
print ' | ';
}
// Date
if (!empty($arrayfields['sp.date_livraison']['checked'])) {
print '';
- //print $langs->trans('Month').': ';
- print '';
- //print ' '.$langs->trans('Year').': ';
- $syear = $year;
- $formother->select_year($syear, 'year', 1, 20, 5);
+ print ' ';
+ print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+ print ' ';
+ print '';
+ print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+ print ' ';
print ' | ';
}