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

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0

Browse Source
This commit is contained in:
Laurent Destailleur 2021-09-20 13:21:13 +02:00
commit b97ad33911
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -2440,7 +2440,7 @@ class FactureFournisseur extends CommonInvoice
if ($facturestatic->hasDelay()) {
$response->nbtodolate++;
$response->url_late = DOL_URL_ROOT.'/fourn/facture/list.php?option=late&mainmenu=billing&leftmenu=suppliers_bills';
$response->url_late = DOL_URL_ROOT.'/fourn/facture/list.php?search_option=late&mainmenu=billing&leftmenu=suppliers_bills';
}
}
$this->db->free($resql);

8
htdocs/fourn/facture/list.php
View File

@ -119,7 +119,7 @@ $search_btn = GETPOST('button_search', 'alpha');
$search_remove_btn = GETPOST('button_removefilter', 'alpha');
$search_categ_sup = trim(GETPOST("search_categ_sup", 'int'));
$option = GETPOST('option');
$option = GETPOST('search_option');
if ($option == 'late') {
$search_status = '1';
}
@ -803,7 +803,7 @@ if ($resql) {
$param .= '&show_files='.urlencode($show_files);
}
if ($option) {
$param .= "&option=".urlencode($option);
$param .= "&search_option=".urlencode($option);
}
if ($optioncss != '') {
$param .= '&optioncss='.urlencode($optioncss);
@ -1428,9 +1428,9 @@ if ($resql) {
// Date limit
if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
print '<td class="center nowrap">'.dol_print_date($datelimit, 'day');
print '<td class="center nowraponall">'.dol_print_date($datelimit, 'day');
if ($facturestatic->hasDelay()) {
print img_warning($langs->trans('Late'));
print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
}
print '</td>';
if (!$i) {