From 6360d73f5352fc2bda99bf015370c0d4b14ca269 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Tue, 28 Aug 2012 12:43:09 +0000
Subject: [PATCH] [-] FO: Fix PSCFV-2911

---
 controllers/front/ProductController.php | 1 +
 themes/default/js/product.js            | 3 ++-
 themes/default/product.tpl              | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 3e6ea6367..4b5965c9e 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -200,6 +200,7 @@ class ProductControllerCore extends FrontController
 				$return_link = 'javascript: history.back();';
 
 			$this->context->smarty->assign(array(
+				'stock_management' => Configuration::get('PS_STOCK_MANAGEMENT'),
 				'customizationFields' => ($this->product->customizable) ? $this->product->getCustomizationFields($this->context->language->id) : false,
 				'accessories' => $this->product->getAccessories($this->context->language->id),
 				'return_link' => $return_link,
diff --git a/themes/default/js/product.js b/themes/default/js/product.js
index 3cc9dc6a1..6921e0da4 100644
--- a/themes/default/js/product.js
+++ b/themes/default/js/product.js
@@ -231,7 +231,8 @@ function updateDisplay()
 			$('#availability_value').text(doesntExist).addClass('warning_inline');
 			$('#oosHook').hide();
 		}
-		$('#availability_statut:hidden').show();
+		if(stock_management == 1)
+			$('#availability_statut:hidden').show();
 		
 		//display availability date
 		if (selectedCombination.length)
diff --git a/themes/default/product.tpl b/themes/default/product.tpl
index 1361afabf..f46c3bfc9 100644
--- a/themes/default/product.tpl
+++ b/themes/default/product.tpl
@@ -69,7 +69,7 @@ var productAvailableForOrder = {if (isset($restricted_country_mode) AND $restric
 var productShowPrice = '{if !$PS_CATALOG_MODE}{$product->show_price}{else}0{/if}';
 var productUnitPriceRatio = '{$product->unit_price_ratio}';
 var idDefaultImage = {if isset($cover.id_image_only)}{$cover.id_image_only}{else}0{/if};
-
+var stock_management = {$stock_management|intval};
 {if !isset($priceDisplayPrecision)}
 	{assign var='priceDisplayPrecision' value=2}
 {/if}