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

New: Add option SUPPLIER_REF_IN_NAME

Browse Source
This commit is contained in:
Laurent Destailleur 2014-01-19 22:00:02 +01:00
parent c7a73e4e00
commit cbf6e8563d
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View File

@ -166,8 +166,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
else else
{ {
$objectref = dol_sanitizeFileName($object->ref); $objectref = dol_sanitizeFileName($object->ref);
$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
$dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$objectref; $dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$objectref;
$file = $dir . "/" . $objectref . ".pdf"; $file = $dir . "/" . $objectref . ".pdf";
if (! empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir . "/" . $objectref . ($objectrefsupplier?"-".$objectrefsupplier:"").".pdf";
} }
if (! file_exists($dir)) if (! file_exists($dir))

2
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -174,8 +174,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
else else
{ {
$objectref = dol_sanitizeFileName($object->ref); $objectref = dol_sanitizeFileName($object->ref);
$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
$dir = $conf->fournisseur->commande->dir_output . '/'. $objectref; $dir = $conf->fournisseur->commande->dir_output . '/'. $objectref;
$file = $dir . "/" . $objectref . ".pdf"; $file = $dir . "/" . $objectref . ".pdf";
if (! empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir . "/" . $objectref . ($objectrefsupplier?"-".$objectrefsupplier:"").".pdf";
} }
if (! file_exists($dir)) if (! file_exists($dir))