From e85b4a5a207fa9f9dd3f78ec72346e2539a34c50 Mon Sep 17 00:00:00 2001 From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com> Date: Thu, 16 Apr 2020 12:15:41 +0200 Subject: [PATCH 1/2] FIX Directory Issue with Multicompany Before : Cannot show documents added entity who created the product/service Now : show all files. Warning : all products must be generated in $object->entity directory and not in $conf->entity. --- htdocs/product/card.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index ad793f4f7d3..499ac1ec1e4 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -2255,7 +2255,11 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') // Documents $objectref = dol_sanitizeFileName($object->ref); $relativepath = $comref.'/'.$objectref.'.pdf'; - $filedir = $conf->product->dir_output.'/'.$objectref; + if ($conf->product->entity != $object->entity) { + $filedir = $conf->product->multidir_output[$object->entity].'/'.$objectref; //Check repertories of current entities + } else { + $filedir = $conf->product->dir_output.'/'.$objectref; //Check repertory of the current product + } $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id; $genallowed = $usercanread; $delallowed = $usercancreate; From 19c85785f7d049f4b4e8002d1291738482ceec1b Mon Sep 17 00:00:00 2001 From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com> Date: Thu, 16 Apr 2020 13:26:55 +0200 Subject: [PATCH 2/2] Fix --- htdocs/product/card.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 499ac1ec1e4..de863769519 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -18,6 +18,7 @@ * Copyright (C) 2017 Josep Lluís Amador * Copyright (C) 2019 Frédéric France * Copyright (C) 2019-2020 Thibault FOUCART + * Copyright (C) 2020 Pierre Ardoin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2255,11 +2256,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') // Documents $objectref = dol_sanitizeFileName($object->ref); $relativepath = $comref.'/'.$objectref.'.pdf'; - if ($conf->product->entity != $object->entity) { - $filedir = $conf->product->multidir_output[$object->entity].'/'.$objectref; //Check repertories of current entities - } else { - $filedir = $conf->product->dir_output.'/'.$objectref; //Check repertory of the current product - } + $filedir = $conf->product->multidir_output[$object->entity].'/'.$objectref; //Check repertories of current entities $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id; $genallowed = $usercanread; $delallowed = $usercancreate;