Skip to content

Commit

Permalink
add conf global
Browse files Browse the repository at this point in the history
  • Loading branch information
atm-jonathan committed Aug 12, 2024
1 parent 2f080b6 commit b5b9153
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 3 additions & 2 deletions htdocs/core/lib/product.lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
3 changes: 1 addition & 2 deletions htdocs/core/tpl/card_presend.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'))) {
Expand Down

0 comments on commit b5b9153

Please sign in to comment.