From 50415ca30e86baadac0964f9a8d6a2a8bd585d5a Mon Sep 17 00:00:00 2001
From: mBertholino <mathieu.bertholino@prestashop.com>
Date: Wed, 21 Dec 2011 17:18:21 +0000
Subject: [PATCH] [-] BO : fixed bug -> product/combination ergonomics

---
 admin-dev/themes/template/products/combinations.tpl |  5 +++--
 js/admin-products.js                                | 11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/template/products/combinations.tpl b/admin-dev/themes/template/products/combinations.tpl
index 451e35415..4aecce82d 100644
--- a/admin-dev/themes/template/products/combinations.tpl
+++ b/admin-dev/themes/template/products/combinations.tpl
@@ -195,8 +195,9 @@
 				</td>
 				<td style="padding-bottom:5px;">
 					{if $currency->format % 2 != 0}{$currency->sign}{/if}
-					<input type="text" size="6"  name="attribute_wholesale_price" id="attribute_wholesale_price" value="0.00" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
-					{if $currency->format % 2 == 0} {$currency->sign} {/if}({l s='overrides Wholesale price on Information tab'})
+					<input type="text" size="6"  name="attribute_wholesale_price" id="attribute_wholesale_price" value="" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
+					{if $currency->format % 2 == 0} {$currency->sign} {/if}<span id="attribute_wholesale_price_blank">({l s='leave blank if the price does not change'})</span>
+					<span style="display:none" id="attribute_wholesale_price_full">({l s='overrides Wholesale price on Information tab'})</span>
 				</td>
 			</tr>
 			<tr>
diff --git a/js/admin-products.js b/js/admin-products.js
index d50295932..44c1e6e3a 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -175,7 +175,16 @@ function editProductAttribute(ids, token)
 			var virtual_product_expiration_date_attribute = data[0]['date_expiration'];
 			var virtual_product_nb_days = data[0]['nb_days_accessible'];
 			var is_shareable = data[0]['is_shareable'];
-
+			if (wholesale_price != 0 && wholesale_price > 0)
+			{
+				$("#attribute_wholesale_price_full").show();
+				$("#attribute_wholesale_price_blank").hide();
+			}
+			else
+			{
+				$("#attribute_wholesale_price_full").hide();
+				$("#attribute_wholesale_price_blank").show();
+			}
 			fillCombinaison(
 				wholesale_price,
 				price,