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

FIX #13182

Browse Source
This commit is contained in:
Laurent Destailleur 2020-02-26 20:25:26 +01:00
parent 8b1fff202b
commit 9bc5eb44ca
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/compta/tva/document.php
View File

@ -70,8 +70,7 @@ if (! $sortfield) $sortfield="name";
$object = new Tva($db); $object = new Tva($db);
if ($id > 0) $object->fetch($id); if ($id > 0) $object->fetch($id);
$upload_dir = $conf->tax->dir_output.'/'.dol_sanitizeFileName($object->ref); $upload_dir = $conf->tax->dir_output.'/vat/'.dol_sanitizeFileName($object->ref);
$modulepart='tax';
/* /*
@ -144,7 +143,7 @@ if ($object->id)
dol_fiche_end(); dol_fiche_end();
$modulepart = 'tax'; $modulepart = 'tax-vat';
$permission = $user->rights->tax->charges->creer; $permission = $user->rights->tax->charges->creer;
$permtoedit = $user->rights->fournisseur->facture->creer; $permtoedit = $user->rights->fournisseur->facture->creer;
$param = '&id=' . $object->id; $param = '&id=' . $object->id;

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

@ -1099,7 +1099,7 @@ class FormFile
if ($disablecrop == -1) if ($disablecrop == -1)
{ {
$disablecrop = 1; $disablecrop = 1;
if (in_array($modulepart, array('bank', 'bom', 'expensereport', 'holiday', 'member', 'mrp', 'project', 'product', 'produit', 'propal', 'service', 'societe', 'tax', 'ticket', 'user'))) $disablecrop = 0; if (in_array($modulepart, array('bank', 'bom', 'expensereport', 'holiday', 'member', 'mrp', 'project', 'product', 'produit', 'propal', 'service', 'societe', 'tax', 'tax-vat', 'ticket', 'user'))) $disablecrop = 0;
} }
// Define relative path used to store the file // Define relative path used to store the file
@ -1121,6 +1121,8 @@ class FormFile
$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir); $relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
$relativedir = preg_replace('/^[\\/]/', '', $relativedir); $relativedir = preg_replace('/^[\\/]/', '', $relativedir);
} }
// For example here $upload_dir = '/pathtodocuments/commande/SO2001-123/'
// For example here $upload_dir = '/pathtodocuments/tax/vat/1'
$hookmanager->initHooks(array('formfile')); $hookmanager->initHooks(array('formfile'));
$parameters = array( $parameters = array(

5
htdocs/core/lib/files.lib.php
View File

@ -2401,10 +2401,11 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file; $original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
} }
// Wrapping for taxes // Wrapping for taxes
elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output)) elseif (in_array($modulepart, array('tax', 'tax-vat')) && !empty($conf->tax->dir_output))
{ {
if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1; if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
$original_file=$conf->tax->dir_output.'/'.$original_file; $modulepartsuffix = str_replace('tax-', '', $modulepart);
$original_file=$conf->tax->dir_output.'/'.($modulepartsuffix != 'tax' ? $modulepartsuffix.'/' : '').$original_file;
} }
// Wrapping for events // Wrapping for events
elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output)) elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))

2
htdocs/core/lib/vat.lib.php
View File

@ -49,7 +49,7 @@ function vat_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
$upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref); $upload_dir = $conf->tax->dir_output . "/vat/" . dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
$nbLinks=Link::count($db, $object->element, $object->id); $nbLinks=Link::count($db, $object->element, $object->id);
$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id; $head[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id;

2
htdocs/core/tpl/document_actions_post_headers.tpl.php
View File

@ -72,6 +72,7 @@ if ($action == 'delete')
$formfile=new FormFile($db); $formfile=new FormFile($db);
// We define var to enable the feature to add prefix of uploaded files. // We define var to enable the feature to add prefix of uploaded files.
// Caller of this include can make // Caller of this include can make
// $savingdocmask=dol_sanitizeFileName($object->ref).'-__file__'; // $savingdocmask=dol_sanitizeFileName($object->ref).'-__file__';
@ -93,6 +94,7 @@ if (!isset($savingdocmask) || !empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_
'project_task', 'project_task',
'expensereport', 'expensereport',
'tax', 'tax',
'tax-vat',
'produit', 'produit',
'product_batch', 'product_batch',
'bom', 'bom',