diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php
index 013d6adb8c3..2e59d99ce28 100644
--- a/htdocs/core/tpl/freeproductline_create.tpl.php
+++ b/htdocs/core/tpl/freeproductline_create.tpl.php
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- *
  * Need to have following variables defined:
  * $conf
  * $langs
@@ -28,100 +27,114 @@
 
 <!-- BEGIN PHP TEMPLATE freeproductline_create.tpl.php -->
 <tr class="liste_titre nodrag nodrop">
-	<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>><div id="add"></div><?php echo $langs->trans('AddNewLine').' - '.$langs->trans("FreeZone"); ?></td>
+	<td
+	<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>><div
+			id="add"></div> <?php echo $langs->trans('AddNewLine').' - '.$langs->trans("FreeZone"); ?>
+	</td>
 	<td align="right"><?php echo $langs->trans('VAT'); ?></td>
 	<td align="right"><?php echo $langs->trans('PriceUHT'); ?></td>
 	<td align="right"><?php echo $langs->trans('Qty'); ?></td>
 	<td align="right"><?php echo $langs->trans('ReductionShort'); ?></td>
-<?php
-$colspan = 4;
-if (! empty($conf->margin->enabled)) {
-?>
+	<?php
+	$colspan = 4;
+	if (! empty($conf->margin->enabled)) {
+		?>
 	<td align="right"><?php echo $langs->trans('BuyingPrice'); ?></td>
-<?php
-  if($conf->global->DISPLAY_MARGIN_RATES)
-    $colspan++;
-  if($conf->global->DISPLAY_MARK_RATES)
-    $colspan++;
-}
-?>
+	<?php
+	if($conf->global->DISPLAY_MARGIN_RATES)
+		$colspan++;
+	if($conf->global->DISPLAY_MARK_RATES)
+		$colspan++;
+	}
+	?>
 	<td colspan="<?php echo $colspan; ?>">&nbsp;</td>
 </tr>
 
-<form name="addproduct" id="addproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
-<input type="hidden" name="action" value="addline" />
-<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
+<form name="addproduct" id="addproduct"
+	action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add"
+	method="POST">
+	<input type="hidden" name="token"
+		value="<?php echo $_SESSION['newtoken']; ?>" /> <input type="hidden"
+		name="action" value="addline" /> <input type="hidden" name="id"
+		value="<?php echo $this->id; ?>" />
 
-<tr <?php echo $bcnd[$var]; ?>>
-	<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
-	<?php
-	echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1);
-	if (($conf->product->enabled && $conf->service->enabled) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '<br>';
+	<tr <?php echo $bcnd[$var]; ?>>
+		<td
+		<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
+			<?php
+			echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1);
+			if (($conf->product->enabled && $conf->service->enabled) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '<br>';
 
-	if (is_object($hookmanager))
-	{
-	    $parameters=array();
-	    $reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
-	}
+			if (is_object($hookmanager))
+			{
+				$parameters=array();
+				$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
+			}
 
-	// Editor wysiwyg
-	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $nbrows=ROWS_2;
-    if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-	$doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
-	$doleditor->Create();
-	?>
-	</td>
+			// Editor wysiwyg
+			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			$nbrows=ROWS_2;
+			if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+			$doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+			$doleditor->Create();
+			?>
+		</td>
 
-	<td align="right">
-	<?php
-	if ($seller->tva_assuj == "0") echo '<input type="hidden" name="np_tva_tx" value="0">0';
-	else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer);
-	?>
-	</td>
-	<td align="right"><input type="text" size="5" name="price_ht" value="<?php echo (isset($_POST["price_ht"])?$_POST["price_ht"]:''); ?>"></td>
-	<td align="right"><input type="text" size="2" name="qty" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>"></td>
-	<td align="right" nowrap><input type="text" size="1" value="<?php echo $buyer->remise_client; ?>" name="remise_percent">%</td>
-<?php
-$colspan = 4;
-if (! empty($conf->margin->enabled)) {
-?>
-	<td align="right"><input type="text" size="5" name="buying_price" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>"></td>
-<?php
-  if($conf->global->DISPLAY_MARGIN_RATES)
-    $colspan++;
-  if($conf->global->DISPLAY_MARK_RATES)
-    $colspan++;
-}
-?>
-	<td align="center" valign="middle" colspan="<?php echo $colspan; ?>"><input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline"></td>
-</tr>
+		<td align="right"><?php
+		if ($seller->tva_assuj == "0") echo '<input type="hidden" name="np_tva_tx" value="0">0';
+		else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer);
+		?>
+		</td>
+		<td align="right"><input type="text" size="5" name="price_ht"
+			value="<?php echo (isset($_POST["price_ht"])?$_POST["price_ht"]:''); ?>">
+		</td>
+		<td align="right"><input type="text" size="2" name="qty"
+			value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>"></td>
+		<td align="right" nowrap><input type="text" size="1"
+			value="<?php echo $buyer->remise_client; ?>" name="remise_percent">%</td>
+		<?php
+		$colspan = 4;
+		if (! empty($conf->margin->enabled)) {
+			?>
+		<td align="right"><input type="text" size="5" name="buying_price"
+			value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
+		</td>
+		<?php
+		if($conf->global->DISPLAY_MARGIN_RATES)
+			$colspan++;
+		if($conf->global->DISPLAY_MARK_RATES)
+			$colspan++;
+		}
+		?>
+		<td align="center" valign="middle" colspan="<?php echo $colspan; ?>"><input
+			type="submit" class="button"
+			value="<?php echo $langs->trans('Add'); ?>" name="addline"></td>
+	</tr>
 
 
-<?php if ($conf->service->enabled && $dateSelector) {
-if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
-	$colspan = 10;
-else
-	$colspan = 9;
-if (! empty($conf->margin->enabled)) {
-  if($conf->global->DISPLAY_MARGIN_RATES)
-    $colspan++;
-  if($conf->global->DISPLAY_MARK_RATES)
-    $colspan++;
-}
-?>
-<tr <?php echo $bcnd[$var]; ?>>
-	<td colspan="<?php echo $colspan; ?>">
-	<?php
-	echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
-	echo $form->select_date('','date_start',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addproduct");
-	echo ' '.$langs->trans('to').' ';
-	echo $form->select_date('','date_end',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addproduct");
-	?>
-	</td>
-</tr>
-<?php } ?>
+	<?php if ($conf->service->enabled && $dateSelector) {
+		if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+			$colspan = 10;
+		else
+			$colspan = 9;
+		if (! empty($conf->margin->enabled)) {
+			$colspan++; // For the buying price
+			if($conf->global->DISPLAY_MARGIN_RATES)
+				$colspan++;
+			if($conf->global->DISPLAY_MARK_RATES)
+				$colspan++;
+		}
+		?>
+	<tr <?php echo $bcnd[$var]; ?>>
+		<td colspan="<?php echo $colspan; ?>"><?php
+		echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
+		echo $form->select_date('','date_start',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addproduct");
+		echo ' '.$langs->trans('to').' ';
+		echo $form->select_date('','date_end',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addproduct");
+		?>
+		</td>
+	</tr>
+	<?php } ?>
 
 </form>
 <!-- END PHP TEMPLATE freeproductline_create.tpl.php -->
diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php
index f0c11c07f87..2acf77a5360 100644
--- a/htdocs/core/tpl/predefinedproductline_create.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php
@@ -115,6 +115,7 @@ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 else
 	$colspan = 9;
 if (! empty($conf->margin->enabled)) {
+	$colspan++; // For the buying price
 	if($conf->global->DISPLAY_MARGIN_RATES)
 		$colspan++;
 	if($conf->global->DISPLAY_MARK_RATES)