Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

debug rebuild_merge_pdf

Browse Source
This commit is contained in:
Laurent Destailleur (aka Eldy) 2024-12-20 15:38:59 +01:00
parent 35e935f4be
commit f81cdfbcf0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/invoice2.lib.php
View File

@ -81,7 +81,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
$table = "propal";
$dir_output = $conf->propal->dir_output;
$date = "date";
$date = "datep";
if ($diroutputpdf == 'auto') {
$diroutputpdf = $conf->propal->dir_output.'/temp';
@ -107,7 +107,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
$sqlwhere .= " f.fk_statut > 0";
$sqlwhere .= " AND f.".$db->sanitize($date)." >= '".$db->idate($dateafterdate)."'";
$sqlwhere .= " AND f.".$db->sanitize($date)." <= '".$db->idate($datebeforedate)."'";
$sqlorder = " ORDER BY f.datef ASC";
$sqlorder = " ORDER BY ".$db->sanitize($date)." ASC";
}
// Filter for invoices only
if (in_array('nopayment', $filter)) {