diff --git a/admin-dev/themes/template/products/accounting.tpl b/admin-dev/themes/template/products/accounting.tpl
index ae82abf5b..594325385 100644
--- a/admin-dev/themes/template/products/accounting.tpl
+++ b/admin-dev/themes/template/products/accounting.tpl
@@ -24,6 +24,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 {if isset($product->id)}
 
 	<h4>{l s='Accounting'}</h4>
diff --git a/admin-dev/themes/template/products/associations.tpl b/admin-dev/themes/template/products/associations.tpl
index 1bdd818b1..28132ebb4 100644
--- a/admin-dev/themes/template/products/associations.tpl
+++ b/admin-dev/themes/template/products/associations.tpl
@@ -24,6 +24,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 <div class="Associations">
 	<h4>{l s='Product price'}</h4>
 	<div class="separation"></div>
diff --git a/admin-dev/themes/template/products/attachments.tpl b/admin-dev/themes/template/products/attachments.tpl
index 0c2d27f29..0dcd3034c 100644
--- a/admin-dev/themes/template/products/attachments.tpl
+++ b/admin-dev/themes/template/products/attachments.tpl
@@ -24,6 +24,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 {if isset($obj->id)}
 
 	<h4>{l s='Attachment'}</h4>
diff --git a/admin-dev/themes/template/products/combinations.tpl b/admin-dev/themes/template/products/combinations.tpl
index f3e12cf12..aa1ac4c7f 100644
--- a/admin-dev/themes/template/products/combinations.tpl
+++ b/admin-dev/themes/template/products/combinations.tpl
@@ -24,6 +24,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 {if isset($product->id)}
 	<script type="text/javascript">
 		$(document).ready(function(){
diff --git a/admin-dev/themes/template/products/customization.tpl b/admin-dev/themes/template/products/customization.tpl
index 65a2ce5c2..80d6b9dba 100644
--- a/admin-dev/themes/template/products/customization.tpl
+++ b/admin-dev/themes/template/products/customization.tpl
@@ -23,6 +23,19 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
+
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 {if isset($obj->id)}
 	<h4>{l s='Add or modify customizable properties'}</h4>
 	
diff --git a/admin-dev/themes/template/products/features.tpl b/admin-dev/themes/template/products/features.tpl
index 50f7ab40e..440970fa0 100644
--- a/admin-dev/themes/template/products/features.tpl
+++ b/admin-dev/themes/template/products/features.tpl
@@ -24,6 +24,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 {if isset($product->id)}
 	
 	<h4>{l s='Assign features to this product:'}</h4>
diff --git a/admin-dev/themes/template/products/form.tpl b/admin-dev/themes/template/products/form.tpl
index b4b24e265..3417e57d5 100644
--- a/admin-dev/themes/template/products/form.tpl
+++ b/admin-dev/themes/template/products/form.tpl
@@ -142,9 +142,11 @@
 				else
 					$('#desc-product-newCombination').hide();
 			});
+
 			{if $show_product_tab_content}
 				$("div.productTabs a[id$=-{$show_product_tab_content}]").click();
 			{/if}
+
 		});
 	</script>
 	
@@ -279,7 +281,9 @@
 			<div id="product-tab-content-wait" style="display:none" >{l s='loading ...'}</div>
 			{foreach $product_tabs key=numStep item=tab}
 				<div id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content" {if !$tab.selected}style="display:none"{/if}>
-				{if $tab.selected}{$custom_form}{/if}
+					{if $tab.selected}
+						{$custom_form}
+					{/if}
 				</div>
 			{/foreach}
 		</div>
diff --git a/admin-dev/themes/template/products/images.tpl b/admin-dev/themes/template/products/images.tpl
index f256f0c6b..00791bfb5 100644
--- a/admin-dev/themes/template/products/images.tpl
+++ b/admin-dev/themes/template/products/images.tpl
@@ -24,6 +24,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 {if isset($id_product) && isset($product)}
 	<h4 class="tab" >2. {l s='Images'} (<span id="countImage">{$countImages}</span>)</h4>
 	<h4>{if isset($id_image)}{l s='Edit this product image'}{else}{l s='Add a new image to this product'}{/if}</h4>	<div class="separation"></div><br />
diff --git a/admin-dev/themes/template/products/informations.tpl b/admin-dev/themes/template/products/informations.tpl
index da6c2b03a..9b854d8e2 100644
--- a/admin-dev/themes/template/products/informations.tpl
+++ b/admin-dev/themes/template/products/informations.tpl
@@ -24,6 +24,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 <div id="step1">
 	<h4 class="tab">1. {l s='Info.'}</h4>
 	<h4>{l s='Product global information'}</h4>
diff --git a/admin-dev/themes/template/products/prices.tpl b/admin-dev/themes/template/products/prices.tpl
index 78d284f33..4db6d334e 100644
--- a/admin-dev/themes/template/products/prices.tpl
+++ b/admin-dev/themes/template/products/prices.tpl
@@ -24,7 +24,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}price.js"></script>
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 <div class="block_specific_prices_modifications">
 	<h4>{l s='Product price'}</h4>
 	<div class="separation"></div>
@@ -209,15 +220,17 @@
 			</div>
 			<script type="text/javascript">
 				$(document).ready(function(){
-						product_prices['0'] = $('#sp_current_ht_price').html();
-						$('#id_product_attribute').change(function() {
-							$('#sp_current_ht_price').html(product_prices[$('#id_product_attribute option:selected').val()]);
-						});
-						$('.datepicker').datepicker({
-							prevText: '',
-							nextText: '',
-							dateFormat: 'yy-mm-dd'
-						});
+					product_prices['0'] = $('#sp_current_ht_price').html();
+
+					$('#id_product_attribute').change(function() {
+						$('#sp_current_ht_price').html(product_prices[$('#id_product_attribute option:selected').val()]);
+					});
+
+					$('.datepicker').datepicker({
+						prevText: '',
+						nextText: '',
+						dateFormat: 'yy-mm-dd'
+					});
 				});
 			</script>
 		
@@ -284,4 +297,4 @@
 						calcPriceTI();
 						unitPriceWithTax('unit');
 					</script>
-	{/if}
\ No newline at end of file
+				{/if}
\ No newline at end of file
diff --git a/admin-dev/themes/template/products/quantities.tpl b/admin-dev/themes/template/products/quantities.tpl
index 9ee668f9e..38013ea13 100644
--- a/admin-dev/themes/template/products/quantities.tpl
+++ b/admin-dev/themes/template/products/quantities.tpl
@@ -24,6 +24,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 {if isset($product->id)}
 
 	<h4>{l s='Available quantities for sale'}</h4>
diff --git a/admin-dev/themes/template/products/shipping.tpl b/admin-dev/themes/template/products/shipping.tpl
index 9293bdcb5..2e9d6074e 100644
--- a/admin-dev/themes/template/products/shipping.tpl
+++ b/admin-dev/themes/template/products/shipping.tpl
@@ -24,6 +24,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 <h4 class="tab">1. {l s='Info.'}</h4>
 <h4>{l s='Shipping'}</h4>
 
diff --git a/admin-dev/themes/template/products/suppliers.tpl b/admin-dev/themes/template/products/suppliers.tpl
index 018b62134..9c7d42f31 100644
--- a/admin-dev/themes/template/products/suppliers.tpl
+++ b/admin-dev/themes/template/products/suppliers.tpl
@@ -24,6 +24,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 {if isset($product->id)}
 
 	<h4>{l s='Suppliers of the current product'}</h4>
diff --git a/admin-dev/themes/template/products/warehouses.tpl b/admin-dev/themes/template/products/warehouses.tpl
index afedfed50..6eb0e1ffc 100644
--- a/admin-dev/themes/template/products/warehouses.tpl
+++ b/admin-dev/themes/template/products/warehouses.tpl
@@ -24,6 +24,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+<script type="text/javascript">
+
+	$(document).ready(function() {
+		$('input').keypress(function(e) { 
+			var code = null; 
+			code = (e.keyCode ? e.keyCode : e.which);
+			return (code == 13) ? false : true;
+		});
+	});
+
+</script>
+
 {if isset($product->id)}
 
 	<h4>{l s='Product location in warehouses'}</h4>