From b318ccb2af73188afb9927202a93efde028dee55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Oct 2021 19:39:56 +0200
Subject: [PATCH] Fix margin rates and mark rates are 2 different columns

---
 htdocs/core/tpl/objectline_edit.tpl.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 611d6a9cce5..d1b19495429 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -296,7 +296,8 @@ $coldisplay++;
 					echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
 				}
 				$coldisplay++;
-			} elseif (!empty($conf->global->DISPLAY_MARK_RATES)) {
+			}
+			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 				$mark_rate = (GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));
 				// if credit note, dont allow to modify margin
 				if ($line->subprice < 0) {