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

Prepare add of concatpdf module

Browse Source
This commit is contained in:
Laurent Destailleur 2011-05-18 15:58:08 +00:00
parent 83cb9cf7a7
commit 247e333a8d
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/core/class/html.formfile.class.php
View File

@ -174,6 +174,8 @@ class FormFile
if ($genallowed) if ($genallowed)
{ {
$modellist=array(); $modellist=array();
$cgvlist=array();
if ($modulepart == 'company') if ($modulepart == 'company')
{ {
$showempty=1; $showempty=1;
@ -243,6 +245,17 @@ class FormFile
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php');
$model=new ModelePDFFactures(); $model=new ModelePDFFactures();
$modellist=$model->liste_modeles($this->db); $modellist=$model->liste_modeles($this->db);
// This is to allow to join external files to invoices
if (! empty($conf->concatpdf->enabled))
{
$filescgv=glob($conf->concatpdf->dir_output."/invoices/*.pdf");
if ($filescgv) {
foreach ($filescgv as $cgvfilename) {
$cgvlist[] = basename($cgvfilename, ".pdf");
}
}
}
} }
} }
elseif ($modulepart == 'project') elseif ($modulepart == 'project')
@ -336,6 +349,10 @@ class FormFile
print '<td align="center">'; print '<td align="center">';
print $langs->trans('Model').' '; print $langs->trans('Model').' ';
print $html->selectarray('model',$modellist,$modelselected,$showempty,0,0); print $html->selectarray('model',$modellist,$modelselected,$showempty,0,0);
if (sizeof($cgvlist) > 0)
{
print $html->selectarray('cgv',$cgvlist,"-1",1,0,1);
}
print '</td>'; print '</td>';
} }
else else