Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Add a tool to merge all invoices in one PDF

Browse Source
This commit is contained in:
Laurent Destailleur
2009-04-09 21:53:53 +00:00
parent 996add6dde
commit 55aa8bc4bc
5 changed files with 280 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture.php
View File

@@ -3836,7 +3836,7 @@ else
{
// Print total
print '<tr class="liste_total">';
print '<td class="liste_total" colspan="3" align="left">'.$langs->trans('Total').'</td>';
print '<td class="liste_total" colspan="4" align="left">'.$langs->trans('Total').'</td>';
print '<td class="liste_total" align="right">'.price($total).'</td>';
print '<td class="liste_total" align="right">'.price($total_ttc).'</td>';
print '<td class="liste_total" align="right">'.price($totalrecu).'</td>';

3
htdocs/compta/facture/impayees.php
View File

@@ -53,7 +53,6 @@ if ($_POST["action"] == "builddoc" && $user->rights->facture->lire)
{
if (is_array($_POST['toGenerate']))
{
$factures = dol_dir_list($conf->facture->dir_output,'all',1,implode('\.pdf|',$_POST['toGenerate']).'\.pdf','\.meta$|\.png','date',SORT_DESC) ;
// liste les fichiers
@@ -95,7 +94,7 @@ if ($_POST["action"] == "builddoc" && $user->rights->facture->lire)
// Create output dir if not exists
create_exdir($diroutputpdf);
// enregistre le fichier pdf concatene
// Save merged file
$filename=strtolower(sanitizeFileName($langs->transnoentities("Unpayed")));
if ($option=='late') $filename.='_'.strtolower(sanitizeFileName($langs->transnoentities("Late")));
if ($pagecount)

4
htdocs/lib/functions.lib.php
View File

@@ -447,8 +447,8 @@ function dol_print_date($time,$format='',$to_gmt=false,$outputlangs='',$encodeto
* \param string Date in a string
* YYYYMMDD
* YYYYMMDDHHMMSS
* DD/MM/YY ou DD/MM/YYYY
* DD/MM/YY HH:MM:SS ou DD/MM/YYYY HH:MM:SS
* DD/MM/YY or DD/MM/YYYY (this format should not be used anymore)
* DD/MM/YY HH:MM:SS or DD/MM/YYYY HH:MM:SS (this format should not be used anymore)
* \return date Date
* \example 19700101020000 -> 7200
*/