diff --git a/admin-dev/themes/template/products/prices.tpl b/admin-dev/themes/template/products/prices.tpl
index 54e1352dd..d173042ec 100644
--- a/admin-dev/themes/template/products/prices.tpl
+++ b/admin-dev/themes/template/products/prices.tpl
@@ -131,7 +131,7 @@ jQuery(document).ready(Customer.init);
 		<tr>
 			<td class="col-left"><label>{l s='Pre-tax retail price:'}</label></td>
 			<td style="padding-bottom:5px;">
-				{$currency->prefix}<input size="11" maxlength="14" id="priceTE" name="price" type="text" value="{$product->price}" onchange="this.value = this.value.replace(/,/g, '.');" onkeyup="if (isArrowKey(event)) return; calcPriceTI();" />{$currency->suffix}<sup> *</sup>
+				{$currency->prefix}<input size="11" maxlength="14" id="priceTE" name="price" type="text" value="{$product->price}" onchange="this.value = this.value.replace(/,/g, '.');" onkeyup="$('#priceType').val('TE');if (isArrowKey(event)) return; calcPriceTI();" />{$currency->suffix}<sup> *</sup>
 				<p class="preference_description">{l s='The pre-tax retail price to sell this product'}</p>
 			</td>
 		</tr>
@@ -153,13 +153,13 @@ jQuery(document).ready(Customer.init);
 				</script>
 	
 				<span {if $tax_exclude_taxe_option}style="display:none;"{/if} >
-				 <select onChange="javascript:calcPriceTI(); unitPriceWithTax('unit');" name="id_tax_rules_group" id="id_tax_rules_group" {if $tax_exclude_taxe_option}disabled="disabled"{/if} >
-				     <option value="0">{l s='No Tax'}</option>
-					{foreach from=$tax_rules_groups item=tax_rules_group}
-						<option value="{$tax_rules_group.id_tax_rules_group}" {if $product->id_tax_rules_group == $tax_rules_group.id_tax_rules_group}selected="selected"{/if} >
-							{$tax_rules_group['name']|htmlentitiesUTF8}
-						</option>
-					{/foreach}
+					 <select onChange="javascript:calcPrice(); unitPriceWithTax('unit');" name="id_tax_rules_group" id="id_tax_rules_group" {if $tax_exclude_taxe_option}disabled="disabled"{/if} >
+						<option value="0">{l s='No Tax'}</option>
+						{foreach from=$tax_rules_groups item=tax_rules_group}
+							<option value="{$tax_rules_group.id_tax_rules_group}" {if $product->id_tax_rules_group == $tax_rules_group.id_tax_rules_group}selected="selected"{/if} >
+								{$tax_rules_group['name']|htmlentitiesUTF8}
+							</option>
+						{/foreach}
 					</select>
 					<a href="{$link->getAdminLink('AdminTaxRulesGroup')}&addtax_rules_group&id_product={$product->id}" class="confirm_leave">
 					<img src="../img/admin/add.gif" alt="{l s='Create'}" title="{l s='Create'}" /> <b>{l s='Create'}</b>
@@ -175,7 +175,7 @@ jQuery(document).ready(Customer.init);
 			<tr>
 				<td class="col-left"><label>{l s='Eco-tax (tax incl.):'}</label></td>
 				<td style="padding-bottom:5px;">
-					{$currency->prefix}<input size="11" maxlength="14" id="ecotax" name="ecotax" type="text" value="{$product->ecotax}" onkeyup="if (isArrowKey(event))return; calcPriceTE(); this.value = this.value.replace(/,/g, '.'); if (parseInt(this.value) > getE('priceTE').value) this.value = getE('priceTE').value; if (isNaN(this.value)) this.value = 0;" />{$currency->suffix}
+					{$currency->prefix}<input size="11" maxlength="14" id="ecotax" name="ecotax" type="text" value="{$product->ecotax}" onkeyup="$('#priceType').val('TI');if (isArrowKey(event))return; calcPriceTE(); this.value = this.value.replace(/,/g, '.'); if (parseInt(this.value) > getE('priceTE').value) this.value = getE('priceTE').value; if (isNaN(this.value)) this.value = 0;" />{$currency->suffix}
 					<span style="margin-left:10px">({l s='already included in price'})</span>
 				</td>
 			</tr>
@@ -183,7 +183,8 @@ jQuery(document).ready(Customer.init);
 		<tr {if !$country_display_tax_label || $tax_exclude_taxe_option}style="display:none"{/if} >
 			<td class="col-left"><label>{l s='Retail price with tax:'}</label></td>
 			<td style="padding-bottom:5px;">
-				{$currency->prefix}<input size="11" maxlength="14" id="priceTI" type="text" value="" onchange="noComma('priceTI');" onkeyup="if (isArrowKey(event)) return;  calcPriceTE();" />{$currency->suffix}
+				{$currency->prefix}<input size="11" maxlength="14" id="priceTI" type="text" value="" onchange="noComma('priceTI');" onkeyup="$('#priceType').val('TI');if (isArrowKey(event)) return;  calcPriceTE();" />{$currency->suffix}
+				<input id="priceType" name="priceType" type="hidden" value="TE" />
 			</td>
 		</tr>
 		<tr id="tr_unit_price">
diff --git a/js/admin.js b/js/admin.js
index 4f32403d0..3664f437f 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -371,7 +371,7 @@ function formSubmit(e, button)
 		getE(button).click();
 	}
 }
-function	noComma(elem)
+function noComma(elem)
 {
  	getE(elem).value = getE(elem).value.replace(new RegExp(',', 'g'), '.');
 }
diff --git a/js/price.js b/js/price.js
index 365df8987..91dfdec4b 100644
--- a/js/price.js
+++ b/js/price.js
@@ -49,6 +49,15 @@ function formatPrice(price)
 	return (Math.round(fixedToSix) == fixedToSix + 0.000001 ? fixedToSix + 0.000001 : fixedToSix);
 }
 
+function calcPrice()
+{
+	var priceType = $('#priceType').val();
+	if (priceType == 'TE')
+		calcPriceTI();
+	else
+		calcPriceTE();
+}
+
 function calcPriceTI()
 {
 	var tax = getTax();