From 3bd2aa1921cbea3095028ca6c71f5ff16974fe4b Mon Sep 17 00:00:00 2001 From: atm-corentin <165782689+atm-corentin@users.noreply.github.com> Date: Tue, 12 Nov 2024 13:48:12 +0100 Subject: [PATCH] FIX tpl object line because the was twice marginclass2 on col margin rates but also on mark rates (#31774) Co-authored-by: Laurent Destailleur --- htdocs/core/tpl/objectline_create.tpl.php | 2 +- htdocs/core/tpl/objectline_title.tpl.php | 2 +- htdocs/core/tpl/objectline_view.tpl.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index fb4489e38bf..e859b3bc5f3 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -171,7 +171,7 @@ if ($nolinesbefore) { echo ''.$langs->trans('MarginRate').''; } if (getDolGlobalString('DISPLAY_MARK_RATES')) { - echo ''.$langs->trans('MarkRate').''; + echo ''.$langs->trans('MarkRate').''; } } } ?> diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php index f94d304ace4..f548145747b 100644 --- a/htdocs/core/tpl/objectline_title.tpl.php +++ b/htdocs/core/tpl/objectline_title.tpl.php @@ -191,7 +191,7 @@ if ($usemargins && isModEnabled('margin') && empty($user->socid)) { print ''; } if (getDolGlobalString('DISPLAY_MARK_RATES') && $user->hasRight('margins', 'liretous')) { - print ''.$langs->trans('MarkRate').''; + print ''.$langs->trans('MarkRate').''; } } diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index d482a97657f..e50370f4c45 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -454,7 +454,7 @@ if ($usemargins && isModEnabled('margin') && empty($user->socid)) { pa_ht == 0) ? 'n/a' : price(price2num($line->marge_tx, 'MT')).'%'); ?> hasRight('margins', 'liretous')) {?> - marque_tx, 'MT')).'%'; ?> + marque_tx, 'MT')).'%'; ?>