diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index 9574841c1..74524e77d 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -65,6 +65,8 @@ class CartControllerCore extends FrontController
 		require_once(_PS_MODULE_DIR_.'/blockcart/blockcart-ajax.php');
 	}
 
+
+
 	public function init()
 	{
 		parent::init();
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index 3ed46dfcd..b8976f06a 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -260,7 +260,11 @@ class ParentOrderControllerCore extends FrontController
 		foreach ($summary['products'] AS $key => &$product)
 		{
 			$product['quantity'] = $product['cart_quantity'];// for compatibility with 1.2 themes
-			$product['price_without_specific_price'] = Product::getPriceStatic($product['id_product'], !Product::getTaxCalculationMethod(), $product['id_product_attribute']);
+			$product['price_without_specific_price'] = Product::getPriceStatic($product['id_product'], !Product::getTaxCalculationMethod(), $product['id_product_attribute'], 2);
+			if (Product::getTaxCalculationMethod())
+				$product['is_discounted'] = $product['price_without_specific_price'] != $product['price'];
+			else
+				$product['is_discounted'] = $product['price_without_specific_price'] != $product['price_wt'];
 		}
 
 		$this->context->smarty->assign($summary);
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index baa277bd8..886765787 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -277,8 +277,7 @@ class ProductControllerCore extends FrontController
 							$groups[$row['id_attribute_group']]['attributes_quantity'][$row['id_attribute']] = 0;
 						$groups[$row['id_attribute_group']]['attributes_quantity'][$row['id_attribute']] += (int)($row['quantity']);
 
-						//french date format
-						$availableDate = date('j-m-Y',strtotime($row['available_date']));
+						$availableDate = Tools::displayDate(strtotime($row['available_date']), $this->context->language->id);
 
 						$combinations[$row['id_product_attribute']]['attributes_values'][$row['id_attribute_group']] = $row['attribute_name'];
 						$combinations[$row['id_product_attribute']]['attributes'][] = (int)($row['id_attribute']);
diff --git a/install-dev/sql/db.sql b/install-dev/sql/db.sql
index 6b33f30b4..a4888492f 100644
--- a/install-dev/sql/db.sql
+++ b/install-dev/sql/db.sql
@@ -1204,7 +1204,7 @@ CREATE TABLE `PREFIX_product` (
   `text_fields` tinyint(4) NOT NULL default '0',
   `active` tinyint(1) unsigned NOT NULL default '0',
   `available_for_order` tinyint(1) NOT NULL default '1',
-  `available_date` datetime NOT NULL,
+  `available_date` date NOT NULL,
   `condition` ENUM('new', 'used', 'refurbished') NOT NULL DEFAULT 'new',
   `show_price` tinyint(1) NOT NULL default '1',
   `indexed` tinyint(1) NOT NULL default '0',
@@ -1236,7 +1236,7 @@ CREATE TABLE `PREFIX_product_attribute` (
   `unit_price_impact` decimal(17,2) NOT NULL default '0.00',
   `default_on` tinyint(1) unsigned NOT NULL default '0',
   `minimal_quantity` int(10) unsigned NOT NULL DEFAULT '1',
-  `available_date` datetime NOT NULL,
+  `available_date` date NOT NULL,
   PRIMARY KEY  (`id_product_attribute`),
   KEY `product_attribute_product` (`id_product`),
   KEY `reference` (`reference`),
diff --git a/install-dev/sql/upgrade/1.5.0.1.sql b/install-dev/sql/upgrade/1.5.0.1.sql
index 26d47a683..7d8f92220 100644
--- a/install-dev/sql/upgrade/1.5.0.1.sql
+++ b/install-dev/sql/upgrade/1.5.0.1.sql
@@ -74,9 +74,9 @@ INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VAL
 
 /* PHP:update_feature_detachable_cache(); */;
 
-ALTER TABLE `PREFIX_product` ADD `available_date` DATETIME NOT NULL AFTER `available_for_order`;
+ALTER TABLE `PREFIX_product` ADD `available_date` DATE NOT NULL AFTER `available_for_order`;
 
-ALTER TABLE `PREFIX_product_attribute` ADD `available_date` DATETIME NOT NULL;
+ALTER TABLE `PREFIX_product_attribute` ADD `available_date` DATE NOT NULL;
 
 /* Index was only used by deprecated function Image::positionImage() */
 ALTER TABLE `PREFIX_image` DROP INDEX `product_position`;
diff --git a/themes/prestashop/lang/fr.php b/themes/prestashop/lang/fr.php
index f1969e3c3..666d363e1 100644
--- a/themes/prestashop/lang/fr.php
+++ b/themes/prestashop/lang/fr.php
@@ -89,9 +89,6 @@ $_LANG['authentication_b60bb13a87fe3ae5463aeb0980a5a8a1'] = 'Numéro d\'identifi
 $_LANG['authentication_ea318a4ad37f0c2d2c368e6c958ed551'] = 'DNI / NIF / NIE';
 $_LANG['authentication_19f823c6453c2b1ffd09cb715214813d'] = 'Champs requis';
 $_LANG['authentication_a0bfb8e59e6c13fc8d990781f77694fe'] = 'Continuer';
-$_LANG['authentication_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Vos informations personnelles';
-$_LANG['authentication_1e884e3078d9978e216a027ecd57fb34'] = 'E-mail';
-$_LANG['authentication_bf2957630c4209f61a388a08c2154915'] = '(5 caractères min.)';
 $_LANG['authentication_455175f3f5be6306247babb349c0515a'] = 'Votre adresse';
 $_LANG['authentication_ae47812e00631626815f5f75ad1abbbd'] = 'Rue, adresse de boite postale, nom de compagnie, c / o';
 $_LANG['authentication_846a54955f32846032981f8fe48c35ff'] = 'Adresse (2)';
@@ -102,6 +99,9 @@ $_LANG['authentication_fe66abce284ec8589e7d791185b5c442'] = 'Téléphone domicil
 $_LANG['authentication_41c2fff4867cc204120f001e7af20f7a'] = 'Téléphone portable';
 $_LANG['authentication_6c1c4d5a22e3d6ed8385e7287233396f'] = 'Donnez un titre à cette adresse pour la retrouver plus facilement';
 $_LANG['authentication_0ba7583639a274c434bbe6ef797115a4'] = 'S\'inscrire';
+$_LANG['authentication_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Vos informations personnelles';
+$_LANG['authentication_1e884e3078d9978e216a027ecd57fb34'] = 'E-mail';
+$_LANG['authentication_bf2957630c4209f61a388a08c2154915'] = '(5 caractères min.)';
 $_LANG['best-sales_3cb29f0ccc5fd220a97df89dafe46290'] = 'Meilleures ventes';
 $_LANG['best-sales_32af07c9205de16855c50c3d20a51698'] = 'Pas de meilleure vente pour le moment.';
 $_LANG['breadcrumb_157f518779095e8206908ff1268f10a7'] = 'retour à';
@@ -160,17 +160,10 @@ $_LANG['errors_4ce81305b7edb043d0a7a5c75cab17d0'] = 'Il y a';
 $_LANG['errors_07213a0161f52846ab198be103b5ab43'] = 'erreurs';
 $_LANG['errors_cb5e100e5a9a3e7f6d1fd97512215282'] = 'erreur';
 $_LANG['errors_0557fa923dcee4d0f86b1409f5c2167f'] = 'Retour';
-$_LANG['guest-tracking_4fb8550e52b59f7f93d60c1d1b56e93e'] = 'Suivi de commande';
-$_LANG['guest-tracking_3aedb5d3a3e36f7bb6baf1fbb9497894'] = 'Suivi de commande';
-$_LANG['guest-tracking_43b2f3ca9c34b5934ff858549406f556'] = 'Pour plus d\'avantages...';
 $_LANG['guest-tracking_c2f0859d6f7e84914b60403fa423e9ad'] = 'Votre compte invité a été transformé en compte client avec succès, vous pouvez vous connecter sur cette';
 $_LANG['guest-tracking_71860c77c6745379b0d44304d66b6a13'] = 'page';
-$_LANG['guest-tracking_97d9d28ac07df244f7fbc9c51bfcd19c'] = 'Transformer votre compte invité en compte client et profiter de nombreux avantages:';
-$_LANG['guest-tracking_7a8fe8aaa64e691d82f429d39e0df3a5'] = 'Profiter d\'un accès sécurisé et personnalisé';
-$_LANG['guest-tracking_dec9cc6702179299ae451c11633915c6'] = 'Réaliser des commandes plus rapidement';
 $_LANG['guest-tracking_1f1015bbef5f42d858e8486397ad8f3e'] = 'Réaliser des retours produits facilement';
 $_LANG['guest-tracking_6f789eb510f8b335b306e05ac7b17bec'] = 'Définissez votre mot de passe:';
-$_LANG['guest-tracking_94966d90747b97d1f0f206c98a8b1ac3'] = 'Envoyer';
 $_LANG['guest-tracking_d2948a89e47a4ad7eb8412c1c260ea88'] = 'Afin de suivre votre commande, merci d\'entrer les informations suivantes:';
 $_LANG['guest-tracking_83fa39a28a4d159061c408fbd6a249e7'] = 'Numéro de commande:';
 $_LANG['guest-tracking_d51b1df43394fe14cd03d5bcb3a7216b'] = 'Par exemple: 010123';
@@ -556,6 +549,7 @@ $_LANG['product_2c59ffd0a6631127450d729861975719'] = 'Quantité :';
 $_LANG['product_07d814a3df5cfd2d637e77b215519034'] = 'Vous devez ajouter au minimum ';
 $_LANG['product_f3bbad73b35f19730399b3da21c3ef32'] = ' quantités pour acheter ce produit.';
 $_LANG['product_8c751c4aab0db0b811cdfbddf0b4ea56'] = 'Disponibilité :';
+$_LANG['product_100f1a22cb79da8d72ce3379a4e834ed'] = 'Produit disponible le: ';
 $_LANG['product_0aaaa7c13d1b589640482d1e53135eb4'] = 'Réapprovisionnement le:';
 $_LANG['product_4b98be16b76b0941840140f2043432a9'] = 'pièce disponible';
 $_LANG['product_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'pièces disponibles';
diff --git a/themes/prestashop/product.tpl b/themes/prestashop/product.tpl
index 632498f34..952dc81f0 100644
--- a/themes/prestashop/product.tpl
+++ b/themes/prestashop/product.tpl
@@ -349,9 +349,9 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
 					{if $product->quantity <= 0}{if $allow_oosp}{$product->available_later}{else}{l s='This product is no longer in stock'}{/if}{else}{$product->available_now}{/if}
 				</span>
 				
-				{if ($product->available_date && $product->available_date != 0) && ($product->available_date|date_format:"%Y-%m-%d" >= $smarty.now|date_format:"%Y-%m-%d") && $product->quantity <= 0}<br /><span id="availability_date_label">{l s='Restocking:'}</span><span id="availability_date_value" class="success_inline">{$product->available_date|date_format:"%d-%m-%Y"}</span>
+				{if ($product->available_date && $product->available_date != 0) && ($product->available_date >= $smarty.now|date_format:"%Y-%m-%d") && $product->quantity <= 0}<br /><span id="availability_date_label">{l s='Product available on:'}</span><span id="availability_date_value" class="success_inline">{$product->available_date}</span>
 				{else}
-				<br /><span id="availability_date_label" style="display:none">{l s='Restocking:'}</span><span id="availability_date_value" class="success_inline" style="display:none">{$product->available_date|date_format:"%d-%m-%Y"}</span>
+				<br /><span id="availability_date_label" style="display:none">{l s='Product available on:'}</span><span id="availability_date_value" class="success_inline" style="display:none">{$product->available_date}</span>
 				{/if}
 			</p>
 
diff --git a/themes/prestashop/shopping-cart-product-line.tpl b/themes/prestashop/shopping-cart-product-line.tpl
index f4036eaae..87ade0f29 100644
--- a/themes/prestashop/shopping-cart-product-line.tpl
+++ b/themes/prestashop/shopping-cart-product-line.tpl
@@ -42,15 +42,12 @@
 	</td>
 	<td class="cart_unit">
 		<span class="price" id="product_price_{$product.id_product}_{$product.id_product_attribute}">
+			{if isset($product.is_discounted) && $product.is_discounted}
+				<span style="text-decoration:line-through;">{convertPrice price=$product.price_without_specific_price}</span><br />
+			{/if}
 			{if !$priceDisplay}
-				{if {convertPrice price=$product.price_without_specific_price} != {convertPrice price=$product.price_wt}}
-					<span style="text-decoration:line-through;">{convertPrice price=$product.price_without_specific_price}</span><br />
-				{/if}
 				{convertPrice price=$product.price_wt}
 			{else}
-				{if {convertPrice price=$product.price_without_specific_price} != {convertPrice price=$product.price}}
-					<span style="text-decoration:line-through;">{convertPrice price=$product.price_without_specific_price}</span><br />
-				{/if}
 				{convertPrice price=$product.price}
 			{/if}
 		</span>