From c0feda49216ddc5e46db4bdaaf79eaa6ae41ddaa Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Tue, 16 Jul 2013 01:28:24 +0200 Subject: [PATCH] Task 149 : added on product --- htdocs/core/lib/company.lib.php | 3 ++- htdocs/core/lib/product.lib.php | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 1d938cee9e3..b85d805fe38 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -105,7 +105,8 @@ function societe_prepare_head($object) } // Attached files - $nbFiles = count(dol_dir_list($upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id)); + $upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id; + $nbFiles = count(dol_dir_list($upload_dir)); $head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id; $head[$h][1] = $langs->trans("Documents"); if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index 9b6f48519fa..ccebd10cea5 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -116,8 +116,14 @@ function product_prepare_head($object, $user) // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf,$langs,$object,$head,$h,'product'); + // Attachments + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref); + elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref); + $nbFiles = count(dol_dir_list($upload_dir)); $head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$object->id; $head[$h][1] = $langs->trans('Documents'); + if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; $head[$h][2] = 'documents'; $h++;