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

Fix: Bad date ranges

Browse Source
This commit is contained in:
Laurent Destailleur 2013-07-15 21:47:45 +02:00
parent e4d28c81a7
commit e2b63bb8dd
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,8 +37,8 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
* @param array $filter Array with filters * @param array $filter Array with filters
* @param date $dateafterdate Invoice after date * @param date $dateafterdate Invoice after date
* @param date $datebeforedate Invoice before date * @param date $datebeforedate Invoice before date
* @param date $paymentdateafter Payment after date * @param date $paymentdateafter Payment after date (must includes hour)
* @param date $paymentdatebefore Payment before date * @param date $paymentdatebefore Payment before date (must includes hour)
* @param int $usestdout Add information onto standard output * @param int $usestdout Add information onto standard output
* @param int $regenerate ''=Use existing PDF files, 'nameofpdf'=Regenerate all PDF files using the template * @param int $regenerate ''=Use existing PDF files, 'nameofpdf'=Regenerate all PDF files using the template
* @param string $option Suffix to add into file name of generated PDF * @param string $option Suffix to add into file name of generated PDF

8
scripts/invoices/rebuild_merge_pdf.php
View File

@ -112,7 +112,7 @@ foreach ($argv as $key => $value)
$dateafterdate=dol_stringtotime($argv[$key+1]); $dateafterdate=dol_stringtotime($argv[$key+1]);
$datebeforedate=dol_stringtotime($argv[$key+2]); $datebeforedate=dol_stringtotime($argv[$key+2]);
print 'Rebuild PDF for invoices validated between '.dol_print_date($dateafterdate,'day')." and ".dol_print_date($datebeforedate,'day').".\n"; print 'Rebuild PDF for invoices validated between '.dol_print_date($dateafterdate,'day','gmt')." and ".dol_print_date($datebeforedate,'day','gmt').".\n";
} }
if ($value == 'filter=payments') if ($value == 'filter=payments')
@ -121,14 +121,14 @@ foreach ($argv as $key => $value)
$option.=(empty($option)?'':'_').'payments_'.$argv[$key+1].'_'.$argv[$key+2]; $option.=(empty($option)?'':'_').'payments_'.$argv[$key+1].'_'.$argv[$key+2];
$filter[]='payments'; $filter[]='payments';
$paymentdateafter=dol_stringtotime($argv[$key+1]); $paymentdateafter=dol_stringtotime($argv[$key+1].'000000');
$paymentdatebefore=dol_stringtotime($argv[$key+2]); $paymentdatebefore=dol_stringtotime($argv[$key+2].'235959');
if (empty($paymentdateafter) || empty($paymentdatebefore)) if (empty($paymentdateafter) || empty($paymentdatebefore))
{ {
print 'Error: Bad date format or value'."\n"; print 'Error: Bad date format or value'."\n";
exit(-1); exit(-1);
} }
print 'Rebuild PDF for invoices with at least one payment between '.dol_print_date($paymentdateafter,'day')." and ".dol_print_date($paymentdatebefore,'day').".\n"; print 'Rebuild PDF for invoices with at least one payment between '.dol_print_date($paymentdateafter,'day','gmt')." and ".dol_print_date($paymentdatebefore,'day','gmt').".\n";
} }
if ($value == 'filter=nopayment') if ($value == 'filter=nopayment')