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

Fix: Generated doc in wrong dir

Browse Source
This commit is contained in:
Laurent Destailleur 2011-03-07 00:40:32 +00:00
parent 9a49264cb5
commit 7ee59fcb62
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/fourn/facture/document.php
View File

@ -70,7 +70,7 @@ if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC))
if ($facture->fetch($facid)) if ($facture->fetch($facid))
{ {
$ref=dol_sanitizeFileName($facture->ref); $ref=dol_sanitizeFileName($facture->ref);
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.$ref; $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$ref;
if (create_exdir($upload_dir) >= 0) if (create_exdir($upload_dir) >= 0)
{ {
@ -108,7 +108,7 @@ if ($action=='delete')
if ($facture->fetch($facid)) if ($facture->fetch($facid))
{ {
$ref=dol_sanitizeFileName($facture->ref); $ref=dol_sanitizeFileName($facture->ref);
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.$ref; $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$ref;
$file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). $file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
dol_delete_file($file); dol_delete_file($file);
@ -133,7 +133,7 @@ if ($facid > 0)
$facture->fetch_thirdparty(); $facture->fetch_thirdparty();
$ref=dol_sanitizeFileName($facture->ref); $ref=dol_sanitizeFileName($facture->ref);
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.$ref; $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$ref;
$head = facturefourn_prepare_head($facture); $head = facturefourn_prepare_head($facture);
dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), 0, 'bill'); dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), 0, 'bill');

4
htdocs/fourn/facture/fiche.php
View File

@ -1828,8 +1828,8 @@ else
*/ */
$ref=dol_sanitizeFileName($fac->ref); $ref=dol_sanitizeFileName($fac->ref);
$subdir = $ref; $subdir = get_exdir($fac->id,2).$ref;
$filedir = $conf->fournisseur->facture->dir_output.'/'.$ref; $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($fac->id,2).$ref;
$urlsource=$_SERVER['PHP_SELF'].'?facid='.$fac->id; $urlsource=$_SERVER['PHP_SELF'].'?facid='.$fac->id;
$genallowed=$user->rights->fournisseur->facture->creer; $genallowed=$user->rights->fournisseur->facture->creer;
$delallowed=$user->rights->fournisseur->facture->supprimer; $delallowed=$user->rights->fournisseur->facture->supprimer;

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

@ -133,7 +133,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
else else
{ {
$objectref = dol_sanitizeFileName($object->ref); $objectref = dol_sanitizeFileName($object->ref);
$dir = $conf->fournisseur->facture->dir_output.'/'.$objectref; $dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$objectref;
$file = $dir . "/" . $objectref . ".pdf"; $file = $dir . "/" . $objectref . ".pdf";
} }