From b5b9153c57590d463bf6d0d7d05ceb77678ddba3 Mon Sep 17 00:00:00 2001 From: Jonathan lescaut Date: Mon, 12 Aug 2024 14:04:10 +0200 Subject: [PATCH] add conf global --- htdocs/core/lib/product.lib.php | 5 +++-- htdocs/core/tpl/card_presend.tpl.php | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index a2e42cde0c969..b465f80c6b9a9 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -39,13 +39,14 @@ function product_prepare_head($object) $langs->load("products"); $label = $langs->trans('Product'); - $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'read'); + $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? + $user->hasRight('product', 'product_advance', 'read_prices') : + $user->hasRight('product', 'read'); if ($object->isService()) { $label = $langs->trans('Service'); $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'read'); } - $h = 0; $head = array(); diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php index 9f8b7ab95b7c8..743ef134c5b1e 100644 --- a/htdocs/core/tpl/card_presend.tpl.php +++ b/htdocs/core/tpl/card_presend.tpl.php @@ -88,9 +88,8 @@ if (empty($object->ref_client)) { $topicmail = $outputlangs->trans($defaulttopic, '__REF__'); } elseif (!empty($object->ref_client)) { - $topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REF_CLIENT__)'); + $topicmail = $outputlangs->trans($defaulttopic, '__REF__'. getDolGlobalString('MAIN_MAIL_NO_DISPLAY_OBJECT_REF_CLIENT', ' (__REF_CLIENT__)')); } - // Build document if it not exists $forcebuilddoc = true; if (in_array($object->element, array('user', 'member'))) {