From f37c24f8ff74a5bccb86955c0acc19ea631219de Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Thu, 22 Aug 2013 11:45:27 +0200
Subject: [PATCH] allow to modify margin rate or mark rate but not both

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

diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index a7a744be7ee..ac05f71b901 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -144,7 +144,7 @@ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 					echo '<td align="right"><input type="text" size="2" name="marginRate" value="'.$margin_rate.'">%</td>';
 					$coldisplay++;
 				  }
-				if (! empty($conf->global->DISPLAY_MARK_RATES))
+				elseif (! empty($conf->global->DISPLAY_MARK_RATES))
 				  {
 				    $mark_rate = (isset($_POST["markRate"])?$_POST["markRate"]:price($line->marque_tx));
 					echo '<td align="right"><input type="text" size="2" name="markRate" value="'.$mark_rate.'">%</td>';