diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index d0f838c6b5f..4b079ef78d2 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -133,7 +133,7 @@
 	</td>
 </tr>
 
-<?php if ($conf->service->enabled && $line->product_type == 1 && $dateSelector)	 { ?>
+<?php if (! empty($conf->service->enabled) && $line->product_type == 1 && $dateSelector)	 { ?>
 <tr id="service_duration_area" <?php echo $bc[$var]; ?>>
 	<td colspan="11"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
 	<?php
@@ -329,9 +329,9 @@ $(document).ready(function() {
 
 <?php } ?>
 
-	<?php if (! empty($conf->margin->enabled)) { ?>
-	$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product; ?>}, function(data) {
-		if (data.length > 0) {
+	<?php if (! empty($conf->margin->enabled)) { ?>         
+	$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product?$line->fk_product:0; ?>}, function(data) {
+		if (data && data.length > 0) {
 			var options = '';
 			var trouve=false;
 			$(data).each(function() {
diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php
index f0c11c07f87..e10dc184ccb 100644
--- a/htdocs/core/tpl/predefinedproductline_create.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php
@@ -32,7 +32,7 @@
 	<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>>
 	<?php
 	echo $langs->trans("AddNewLine").' - ';
-	if ($conf->service->enabled)
+	if (! empty($conf->service->enabled))
 	echo $langs->trans('RecordedProductsAndServices');
 	else
 	echo $langs->trans('RecordedProducts');
@@ -46,9 +46,9 @@ if (! empty($conf->margin->enabled)) {
 ?>
 	<td align="right"><?php echo $langs->trans('BuyingPrice'); ?></td>
 <?php
-  if($conf->global->DISPLAY_MARGIN_RATES)
+  if (! empty($conf->global->DISPLAY_MARGIN_RATES))
     $colspan++;
-  if($conf->global->DISPLAY_MARK_RATES)
+  if (! empty($conf->global->DISPLAY_MARK_RATES))
     $colspan++;
 }
 ?>
@@ -100,9 +100,9 @@ if (! empty($conf->margin->enabled)) {
   <input type="text" size="5" id="buying_price" name="buying_price" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
   </td>
 <?php
-  if($conf->global->DISPLAY_MARGIN_RATES)
+  if (! empty($conf->global->DISPLAY_MARGIN_RATES))
     $colspan++;
-  if($conf->global->DISPLAY_MARK_RATES)
+  if (! empty($conf->global->DISPLAY_MARK_RATES))
     $colspan++;
 }
 ?>
@@ -115,9 +115,10 @@ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 else
 	$colspan = 9;
 if (! empty($conf->margin->enabled)) {
-	if($conf->global->DISPLAY_MARGIN_RATES)
+	$colspan++; // For the buying price
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
 		$colspan++;
-	if($conf->global->DISPLAY_MARK_RATES)
+	if (! empty($conf->global->DISPLAY_MARK_RATES))
 		$colspan++;
 }
 ?>
@@ -139,10 +140,12 @@ if (! empty($conf->margin->enabled)) {
 ?>
 <script type="text/javascript">
 $("#idprod").change(function() {
-  $("#np_fournprice options").remove();
-  $("#np_buying_price").show();
+  $("#fournprice options").remove();
+  $("#fournprice").hide();
+  $("#buying_price").val("");
+  $("#buying_price").show();
   $.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': $(this).val()}, function(data) {
-    if (data.length > 0) {
+    if (data && data.length > 0) {
       var options = '';
       var i = 0;
       $(data).each(function() {
@@ -150,20 +153,20 @@ $("#idprod").change(function() {
         options += '<option value="'+this.id+'" price="'+this.price+'"';
         if (i == 1) {
           options += ' selected';
-          $("#np_buying_price").val(this.price);
+          $("#buying_price").val(this.price);
         }
         options += '>'+this.label+'</option>';
       });
       options += '<option value=null><?php echo $langs->trans("InputPrice"); ?></option>';
-      $("#np_fournprice").html(options);
-      $("#np_buying_price").hide();
-      $("#np_fournprice").show();
-      $("#np_fournprice").change(function() {
+      $("#fournprice").html(options);
+      $("#buying_price").hide();
+      $("#fournprice").show();
+      $("#fournprice").change(function() {
         var selval = $(this).find('option:selected').attr("price");
         if (selval)
-          $("#np_buying_price").val(selval).hide();
+          $("#buying_price").val(selval).hide();
         else
-          $('#np_buying_price').show();
+          $('#buying_price').show();
       });
     }
   },