lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW Expedition list - Add date start & date end

Browse Source
This commit is contained in:
Alexandre SPANGARO 2019-11-07 14:21:11 +01:00
parent d972fa8bcb
commit 55e3d7b899
1 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
htdocs/expedition/list.php
View File

@ -59,6 +59,10 @@ $search_state=trim(GETPOST("search_state"));
$search_country=GETPOST("search_country", 'int'); $search_country=GETPOST("search_country", 'int');
$search_type_thirdparty=GETPOST("search_type_thirdparty", 'int'); $search_type_thirdparty=GETPOST("search_type_thirdparty", 'int');
$search_billed=GETPOST("search_billed", 'int'); $search_billed=GETPOST("search_billed", 'int');
$search_datedelivery_start= dol_mktime(0, 0, 0, GETPOST('search_datedelivery_startmonth', 'int'), GETPOST('search_datedelivery_startday', 'int'), GETPOST('search_datedelivery_startyear', 'int'));
$search_datedelivery_end= dol_mktime(23, 59, 59, GETPOST('search_datedelivery_endmonth', 'int'), GETPOST('search_datedelivery_endday', 'int'), GETPOST('search_datedelivery_endyear', 'int'));
$search_datereceipt_start= dol_mktime(0, 0, 0, GETPOST('search_datereceipt_startmonth', 'int'), GETPOST('search_datereceipt_startday', 'int'), GETPOST('search_datereceipt_startyear', 'int'));
$search_datereceipt_end= dol_mktime(23, 59, 59, GETPOST('search_datereceipt_endmonth', 'int'), GETPOST('search_datereceipt_endday', 'int'), GETPOST('search_datereceipt_endyear', 'int'));
$sall = trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml')); $sall = trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
$optioncss = GETPOST('optioncss', 'alpha'); $optioncss = GETPOST('optioncss', 'alpha');
@ -156,6 +160,10 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_country=''; $search_country='';
$search_type_thirdparty=''; $search_type_thirdparty='';
$search_billed=''; $search_billed='';
$search_datedelivery_start='';
$search_datedelivery_end='';
$search_datereceipt_start='';
$search_datereceipt_end='';
$viewstatut=''; $viewstatut='';
$toselect = ''; $toselect = '';
$search_array_options=array(); $search_array_options=array();
@ -234,6 +242,11 @@ if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdp
if ($search_ref_exp) $sql.= natural_search('e.ref', $search_ref_exp); if ($search_ref_exp) $sql.= natural_search('e.ref', $search_ref_exp);
if ($search_ref_liv) $sql.= natural_search('l.ref', $search_ref_liv); if ($search_ref_liv) $sql.= natural_search('l.ref', $search_ref_liv);
if ($search_company) $sql.= natural_search('s.nom', $search_company); if ($search_company) $sql.= natural_search('s.nom', $search_company);
if ($search_datedelivery_start) $sql.= " AND e.date_delivery >= '" . $db->idate($search_datedelivery_start) . "'";
if ($search_datedelivery_end) $sql.= " AND e.date_delivery <= '" . $db->idate($search_datedelivery_end) . "'";
if ($search_datereceipt_start) $sql.= " AND l.date_delivery >= '" . $db->idate($search_datereceipt_start) . "'";
if ($search_datereceipt_end) $sql.= " AND l.date_delivery <= '" . $db->idate($search_datereceipt_end) . "'";
if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall); if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
// Add where from extra fields // Add where from extra fields
@ -280,6 +293,10 @@ if ($resql)
if ($search_company) $param.= "&amp;search_company=".urlencode($search_company); if ($search_company) $param.= "&amp;search_company=".urlencode($search_company);
if ($search_town) $param.= '&search_town='.urlencode($search_town); if ($search_town) $param.= '&search_town='.urlencode($search_town);
if ($search_zip) $param.= '&search_zip='.urlencode($search_zip); if ($search_zip) $param.= '&search_zip='.urlencode($search_zip);
if ($search_datedelivery_start) $param.='&search_datedelivery_start=' . urlencode($search_datedelivery_start);
if ($search_datedelivery_end) $param.='&search_datedelivery_end=' . urlencode($search_datedelivery_end);
if ($search_datereceipt_start) $param.='&search_datereceipt_start=' . urlencode($search_datereceipt_start);
if ($search_datereceipt_end) $param.='&search_datereceipt_end=' . urlencode($search_datereceipt_end);
if ($viewstatut != '') $param.= '&viewstatut='.urlencode($viewstatut); if ($viewstatut != '') $param.= '&viewstatut='.urlencode($viewstatut);
if ($optioncss != '') $param.='&amp;optioncss='.urlencode($optioncss); if ($optioncss != '') $param.='&amp;optioncss='.urlencode($optioncss);
// Add $param from extra fields // Add $param from extra fields
@ -391,7 +408,16 @@ if ($resql)
// Date delivery planned // Date delivery planned
if (! empty($arrayfields['e.date_delivery']['checked'])) if (! empty($arrayfields['e.date_delivery']['checked']))
{ {
print '<td class="liste_titre">&nbsp;</td>'; print '<td class="liste_titre center">';
print '<div class="nowrap">';
print $langs->trans('From') . ' ';
print $form->selectDate($search_delivery_start?$search_delivery_start:-1, 'search_delivery_start', 0, 0, 1);
print '</div>';
print '<div class="nowrap">';
print $langs->trans('to') . ' ';
print $form->selectDate($search_delivery_end?$search_delivery_end:-1, 'search_delivery_end', 0, 0, 1);
print '</div>';
print '</td>';
} }
if (! empty($arrayfields['l.ref']['checked'])) if (! empty($arrayfields['l.ref']['checked']))
{ {
@ -403,7 +429,16 @@ if ($resql)
if (! empty($arrayfields['l.date_delivery']['checked'])) if (! empty($arrayfields['l.date_delivery']['checked']))
{ {
// Date received // Date received
print '<td class="liste_titre">&nbsp;</td>'; print '<td class="liste_titre center">';
print '<div class="nowrap">';
print $langs->trans('From') . ' ';
print $form->selectDate($search_receipt_start?$search_receipt_start:-1, 'search_receipt_start', 0, 0, 1);
print '</div>';
print '<div class="nowrap">';
print $langs->trans('to') . ' ';
print $form->selectDate($search_receipt_end?$search_receipt_end:-1, 'search_receipt_end', 0, 0, 1);
print '</div>';
print '</td>';
} }
// Extra fields // Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';