From b4f30681413d82eb629b1bde927ce2cfdb4364aa Mon Sep 17 00:00:00 2001 From: Alexis Algoud Date: Tue, 24 Feb 2015 18:20:19 +0100 Subject: [PATCH 1/2] NEW add PDF icon on linked element into project --- htdocs/core/class/html.formfile.class.php | 5 ++--- htdocs/projet/element.php | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 8a47e8a0eb1..e341a992b6b 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -670,10 +670,9 @@ class FormFile if (! function_exists('dol_dir_list')) include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $out=''; - $this->numoffiles=0; - - $file_list=dol_dir_list($filedir, 'files', 0, preg_quote($modulesubdir.'.pdf','/'), '\.meta$|\.png$'); + + $file_list=dol_dir_list($filedir, 'files', 0, preg_quote(basename($modulesubdir).'.pdf','/'), '\.meta$|\.png$'); // For ajax treatment $out.= '
'.img_picto('', 'refresh').'
'."\n"; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 9569b44aceb..51db2202d2c 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php'; @@ -106,6 +107,7 @@ llxHeader("",$langs->trans("Referers"),$help_url); $form = new Form($db); $formproject=new FormProjets($db); +$formfile = new FormFile($db); $userstatic=new User($db); @@ -412,7 +414,23 @@ foreach ($listofreferent as $key => $value) { print $expensereport->getNomUrl(1); } - else print $element->getNomUrl(1); + else { + print $element->getNomUrl(1); + + $element_doc = $element->element; + $filename=dol_sanitizeFileName($element->ref); + $filedir=$conf->{$element_doc}->dir_output . '/' . dol_sanitizeFileName($element->ref); + + if($element_doc === 'invoice_supplier') { + $element_doc='facture_fournisseur'; + $filename = get_exdir($element->id,2).dol_sanitizeFileName($element->ref); + $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($element->id,2).dol_sanitizeFileName($element->ref); + } + + print $formfile->getDocumentsLink($element_doc, $filename, $filedir); + + } + print "\n"; // Date From 5bc376394585166f5d6feeeb9fe3fac15f19914e Mon Sep 17 00:00:00 2001 From: Alexis Algoud Date: Tue, 24 Feb 2015 18:23:40 +0100 Subject: [PATCH 2/2] fix supplier order element --- htdocs/projet/element.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 51db2202d2c..f47b6cbeac6 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -421,7 +421,11 @@ foreach ($listofreferent as $key => $value) $filename=dol_sanitizeFileName($element->ref); $filedir=$conf->{$element_doc}->dir_output . '/' . dol_sanitizeFileName($element->ref); - if($element_doc === 'invoice_supplier') { + if($element_doc === 'order_supplier') { + $element_doc='commande_fournisseur'; + $filedir = $conf->fournisseur->commande->dir_output.'/'.dol_sanitizeFileName($element->ref); + } + else if($element_doc === 'invoice_supplier') { $element_doc='facture_fournisseur'; $filename = get_exdir($element->id,2).dol_sanitizeFileName($element->ref); $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($element->id,2).dol_sanitizeFileName($element->ref);