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

Merge pull request #18710 from aspangaro/15a14

Browse Source 
NEW Customer invoice template list - Add input date from/to
This commit is contained in:
Laurent Destailleur 2021-09-17 11:50:29 +02:00 committed by GitHub
commit 5f5c659b76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 93 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
htdocs/compta/facture/invoicetemplate_list.php
View File

@ -74,12 +74,22 @@ $search_montant_vat = GETPOST('search_montant_vat');
$search_montant_ttc = GETPOST('search_montant_ttc'); $search_montant_ttc = GETPOST('search_montant_ttc');
$search_payment_mode = GETPOST('search_payment_mode'); $search_payment_mode = GETPOST('search_payment_mode');
$search_payment_term = GETPOST('search_payment_term'); $search_payment_term = GETPOST('search_payment_term');
$search_day = GETPOST('search_day', 'int'); $search_date_startday = GETPOST('search_date_startday', 'int');
$search_year = GETPOST('search_year', 'int'); $search_date_startmonth = GETPOST('search_date_startmonth', 'int');
$search_month = GETPOST('search_month', 'int'); $search_date_startyear = GETPOST('search_date_startyear', 'int');
$search_day_date_when = GETPOST('search_day_date_when', 'int'); $search_date_endday = GETPOST('search_date_endday', 'int');
$search_year_date_when = GETPOST('search_year_date_when', 'int'); $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
$search_month_date_when = GETPOST('search_month_date_when', '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_when_startday = GETPOST('search_date_when_startday', 'int');
$search_date_when_startmonth = GETPOST('search_date_when_startmonth', 'int');
$search_date_when_startyear = GETPOST('search_date_when_startyear', 'int');
$search_date_when_endday = GETPOST('search_date_when_endday', 'int');
$search_date_when_endmonth = GETPOST('search_date_when_endmonth', 'int');
$search_date_when_endyear = GETPOST('search_date_when_endyear', 'int');
$search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear); // Use tzserver
$search_date_when_end = dol_mktime(23, 59, 59, $search_date_when_endmonth, $search_date_when_endday, $search_date_when_endyear);
$search_recurring = GETPOST('search_recurring', 'int'); $search_recurring = GETPOST('search_recurring', 'int');
$search_frequency = GETPOST('search_frequency', 'alpha'); $search_frequency = GETPOST('search_frequency', 'alpha');
$search_unit_frequency = GETPOST('search_unit_frequency', 'alpha'); $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
@ -206,12 +216,22 @@ if (empty($reshook)) {
$search_montant_ttc = ''; $search_montant_ttc = '';
$search_payment_mode = ''; $search_payment_mode = '';
$search_payment_term = ''; $search_payment_term = '';
$search_day = ''; $search_date_startday = '';
$search_year = ''; $search_date_startmonth = '';
$search_month = ''; $search_date_startyear = '';
$search_day_date_when = ''; $search_date_endday = '';
$search_year_date_when = ''; $search_date_endmonth = '';
$search_month_date_when = ''; $search_date_endyear = '';
$search_date_start = '';
$search_date_end = '';
$search_date_when_startday = '';
$search_date_when_startmonth = '';
$search_date_when_startyear = '';
$search_date_when_endday = '';
$search_date_when_endmonth = '';
$search_date_when_endyear = '';
$search_date_when_start = '';
$search_date_when_end = '';
$search_recurring = ''; $search_recurring = '';
$search_frequency = ''; $search_frequency = '';
$search_unit_frequency = ''; $search_unit_frequency = '';
@ -326,8 +346,18 @@ if ($search_status != '' && $search_status >= -1) {
$sql .= ' AND suspended = 1'; $sql .= ' AND suspended = 1';
} }
} }
$sql .= dolSqlDateFilter('f.date_last_gen', $search_day, $search_month, $search_year); if ($search_date_start) {
$sql .= dolSqlDateFilter('f.date_when', $search_day_date_when, $search_month_date_when, $search_year_date_when); $sql .= " AND f.date_last_gen >= '".$db->idate($search_date_start)."'";
}
if ($search_date_end) {
$sql .= " AND f.date_last_gen <= '".$db->idate($search_date_end)."'";
}
if ($search_date_when_start) {
$sql .= " AND f.date_when >= '".$db->idate($search_date_when_start)."'";
}
if ($search_date_when_end) {
$sql .= " AND f.date_when <= '".$db->idate($search_date_when_end)."'";
}
$sql .= $db->order($sortfield, $sortorder); $sql .= $db->order($sortfield, $sortorder);
@ -357,23 +387,41 @@ if ($resql) {
if ($socid > 0) { if ($socid > 0) {
$param .= '&socid='.urlencode($socid); $param .= '&socid='.urlencode($socid);
} }
if ($search_day) { if ($search_date_startday) {
$param .= '&search_day='.urlencode($search_day); $param .= '&search_date_startday='.urlencode($search_date_startday);
} }
if ($search_month) { if ($search_date_startmonth) {
$param .= '&search_month='.urlencode($search_month); $param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
} }
if ($search_year) { if ($search_date_startyear) {
$param .= '&search_year='.urlencode($search_year); $param .= '&search_date_startyear='.urlencode($search_date_startyear);
} }
if ($search_day_date_when) { if ($search_date_endday) {
$param .= '&search_day_date_when='.urlencode($search_day_date_when); $param .= '&search_date_endday='.urlencode($search_date_endday);
} }
if ($search_month_date_when) { if ($search_date_endmonth) {
$param .= '&search_month_date_when='.urlencode($search_month_date_when); $param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
} }
if ($search_year_date_when) { if ($search_date_endyear) {
$param .= '&search_year_date_when='.urlencode($search_year_date_when); $param .= '&search_date_endyear='.urlencode($search_date_endyear);
}
if ($search_date_when_startday) {
$param .= '&search_date_when_startday='.urlencode($search_date_when_startday);
}
if ($search_date_when_startmonth) {
$param .= '&search_date_when_startmonth='.urlencode($search_date_when_startmonth);
}
if ($search_date_when_startyear) {
$param .= '&search_date_when_startyear='.urlencode($search_date_when_startyear);
}
if ($search_date_when_endday) {
$param .= '&search_date_when_endday='.urlencode($search_date_when_endday);
}
if ($search_date_when_endmonth) {
$param .= '&search_date_when_endmonth='.urlencode($search_date_when_endmonth);
}
if ($search_date_when_endyear) {
$param .= '&search_date_when_endyear='.urlencode($search_date_when_endyear);
} }
if ($search_ref) { if ($search_ref) {
$param .= '&search_ref='.urlencode($search_ref); $param .= '&search_ref='.urlencode($search_ref);
@ -453,7 +501,7 @@ if ($resql) {
print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">'; print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
print '</td>'; print '</td>';
} }
// Thirpdarty // Thirdparty
if (!empty($arrayfields['s.nom']['checked'])) { if (!empty($arrayfields['s.nom']['checked'])) {
print '<td class="liste_titre left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>'; print '<td class="liste_titre left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
} }
@ -489,19 +537,19 @@ if ($resql) {
} }
if (!empty($arrayfields['recurring']['checked'])) { if (!empty($arrayfields['recurring']['checked'])) {
// Recurring or not // Recurring or not
print '<td class="liste_titre" align="center">'; print '<td class="liste_titre center">';
print $form->selectyesno('search_recurring', $search_recurring, 1, false, 1); print $form->selectyesno('search_recurring', $search_recurring, 1, false, 1);
print '</td>'; print '</td>';
} }
if (!empty($arrayfields['f.frequency']['checked'])) { if (!empty($arrayfields['f.frequency']['checked'])) {
// Recurring or not // Recurring or not
print '<td class="liste_titre" align="center">'; print '<td class="liste_titre center">';
print '<input class="flat" type="text" size="1" name="search_frequency" value="'.dol_escape_htmltag($search_frequency).'">'; print '<input class="flat" type="text" size="1" name="search_frequency" value="'.dol_escape_htmltag($search_frequency).'">';
print '</td>'; print '</td>';
} }
if (!empty($arrayfields['f.unit_frequency']['checked'])) { if (!empty($arrayfields['f.unit_frequency']['checked'])) {
// Frequency unit // Frequency unit
print '<td class="liste_titre" align="center">'; print '<td class="liste_titre center">';
print '<input class="flat" type="text" size="1" name="search_unit_frequency" value="'.dol_escape_htmltag($search_unit_frequency).'">'; print '<input class="flat" type="text" size="1" name="search_unit_frequency" value="'.dol_escape_htmltag($search_unit_frequency).'">';
print '</td>'; print '</td>';
} }
@ -512,22 +560,24 @@ if ($resql) {
} }
// Date invoice // Date invoice
if (!empty($arrayfields['f.date_last_gen']['checked'])) { if (!empty($arrayfields['f.date_last_gen']['checked'])) {
print '<td class="liste_titre nowraponall" align="center">'; print '<td class="liste_titre center">';
if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) { print '<div class="nowrap">';
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">'; print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
} print '</div>';
print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">'; print '<div class="nowrap">';
$formother->select_year($search_year ? $search_year : -1, 'search_year', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle'); print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '</div>';
print '</td>'; print '</td>';
} }
// Date next generation // Date next generation
if (!empty($arrayfields['f.date_when']['checked'])) { if (!empty($arrayfields['f.date_when']['checked'])) {
print '<td class="liste_titre nowraponall" align="center">'; print '<td class="liste_titre center">';
if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) { print '<div class="nowrap">';
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_date_when" value="'.$search_day_date_when.'">'; print $form->selectDate($search_date_when_start ? $search_date_when_start : -1, 'search_date_when_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
} print '</div>';
print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_date_when" value="'.$search_month_date_when.'">'; print '<div class="nowrap">';
$formother->select_year($search_year_date_when ? $search_year_date_when : -1, 'search_year_date_when', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle'); print $form->selectDate($search_date_when_end ? $search_date_when_end : -1, 'search_date_when_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '</div>';
print '</td>'; print '</td>';
} }
// Extra fields // Extra fields
@ -559,7 +609,7 @@ if ($resql) {
} }
// Status // Status
if (!empty($arrayfields['status']['checked'])) { if (!empty($arrayfields['status']['checked'])) {
print '<td class="liste_titre" align="center">'; print '<td class="liste_titre center">';
$liststatus = array( $liststatus = array(
0=>$langs->trans("Draft"), 0=>$langs->trans("Draft"),
1=>$langs->trans("Active"), 1=>$langs->trans("Active"),