From 827c836e6e0450bd68588f87e4535b0c087b8e76 Mon Sep 17 00:00:00 2001
From: torvista <torvista@users.noreply.github.com>
Date: Mon, 21 Jan 2019 16:18:39 +0100
Subject: [PATCH] Whne multicurrency in use, the Add button colspan is
 incorrect (6 instead of 5) since it is incrementing colspan in addition to a
 previous incrment in the title bar. This corrects the table.

---
 htdocs/core/tpl/objectline_create.tpl.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 30ae765618d..06960ebba36 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -57,7 +57,8 @@ if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
 
 
 // Define colspan for button Add
-$colspan = 3;	// Col total ht + col edit + col delete
+$colspan = 3;	// Columns: total ht + col edit + col delete
+if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan++;//Add column for Total (currency) if required
 if (in_array($object->element,array('propal','commande','order','facture','facturerec','invoice','supplier_proposal','order_supplier','invoice_supplier'))) $colspan++;	// With this, there is a column move button
 //print $object->element;
 
@@ -113,7 +114,7 @@ if ($nolinesbefore) {
 	<?php } ?>
 	<td class="linecolvat right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
 	<td class="linecoluht right"><span id="title_up_ht"><?php echo $langs->trans('PriceUHT'); ?></span></td>
-	<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { $colspan++;?>
+	<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { //steve remove colspan  $colspan++; ?>
 	<td class="linecoluht_currency right"><span id="title_up_ht_currency"><?php echo $langs->trans('PriceUHTCurrency'); ?></span></td>
 	<?php } ?>
 	<?php if (! empty($inputalsopricewithtax)) { ?>
@@ -348,7 +349,7 @@ else {
 	<input type="text" size="5" name="price_ht" id="price_ht" class="flat right" value="<?php echo (isset($_POST["price_ht"])?GETPOST("price_ht",'alpha',2):''); ?>">
 	</td>
 
-	<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { $colspan++;?>
+	<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {// $colspan++; //steve remove colspan++: already set?>
 	<td class="nobottom linecoluht_currency right valigntop">
 	<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat right" value="<?php echo (isset($_POST["multicurrency_price_ht"])?GETPOST("multicurrency_price_ht",'alpha',2):''); ?>">
 	</td>