From 5de859d14b0335cf08ac2a2d00041fae23187889 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 16 Mar 2012 17:26:19 +0100
Subject: [PATCH] Fix: missing colspan if view line number is active

---
 htdocs/core/tpl/freeproductline_edit.tpl.php       | 4 ++--
 htdocs/core/tpl/predefinedproductline_edit.tpl.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/tpl/freeproductline_edit.tpl.php b/htdocs/core/tpl/freeproductline_edit.tpl.php
index 91c4824536a..ecb93691832 100644
--- a/htdocs/core/tpl/freeproductline_edit.tpl.php
+++ b/htdocs/core/tpl/freeproductline_edit.tpl.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2010-2011 Regis Houssin       <regis@dolibarr.fr>
- * Copyright (C) 2010-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 <input type="hidden" name="type" value="<?php echo $line->product_type; ?>">
 
 <tr <?php echo $bc[$var]; ?>>
-	<td>
+	<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
 	<a name="<?php echo $line->id; ?>"></a>
 
 	<?php
diff --git a/htdocs/core/tpl/predefinedproductline_edit.tpl.php b/htdocs/core/tpl/predefinedproductline_edit.tpl.php
index 589a4ece078..028b186f73f 100644
--- a/htdocs/core/tpl/predefinedproductline_edit.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_edit.tpl.php
@@ -33,7 +33,7 @@
 <input type="hidden" name="lineid" value="<?php echo $line->id; ?>" />
 
 <tr <?php echo $bc[$var]; ?>>
-	<td>
+	<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
 		<a name="<?php echo $line->id; ?>"></a>
 		<input type="hidden"	name="productid" value="<?php echo $line->fk_product; ?>" />
 		<a href="<?php echo DOL_URL_ROOT.'/product/fiche.php?id='.$line->fk_product; ?>">