From 2c6c3a90d29ce700cf9c84794058dfa369a2292e Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 2 Apr 2025 19:13:24 +0200 Subject: [PATCH] manage read_supplier_prices permission also on stock movement list (#33700) Co-authored-by: Christophe Battarel --- htdocs/product/stock/movement_card.php | 6 +++++- htdocs/product/stock/movement_list.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php index 590420e2028..2e19b6b9a83 100644 --- a/htdocs/product/stock/movement_card.php +++ b/htdocs/product/stock/movement_card.php @@ -1133,8 +1133,12 @@ if ($resql) { } if (!empty($arrayfields['m.price']['checked'])) { // Price + $usercancreadsupplierprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_supplier_prices') : $user->hasRight('product', 'lire'); + if ($productstatic->isService()) { + $usercancreadsupplierprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_supplier_prices') : $user->hasRight('service', 'lire'); + } print ''; - if ($objp->price != 0) { + if ($objp->price != 0 && $usercancreadsupplierprice) { print price($objp->price); } print ''; diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php index d04651a18f1..f50ad707cc7 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -1630,8 +1630,12 @@ while ($i < $imaxinloop) { } // Price if (!empty($arrayfields['m.price']['checked'])) { + $usercancreadsupplierprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_supplier_prices') : $user->hasRight('product', 'lire'); + if ($productstatic->isService()) { + $usercancreadsupplierprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_supplier_prices') : $user->hasRight('service', 'lire'); + } print ''; - if ($obj->price != 0) { + if ($obj->price != 0 && $usercancreadsupplierprice) { print price($obj->price); } print '';