From 24273960cc341e4745d65bd999daad91becdd016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Thu, 24 Jan 2013 18:25:42 +0100
Subject: [PATCH] [-] FO: Fix #PSCFV-7322 Product::getProductProperties
 quantity cache

---
 classes/Product.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/classes/Product.php b/classes/Product.php
index 7a90ea8abcecb..31b781f9f3b86 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -244,7 +244,7 @@ class ProductCore extends ObjectModel
 		'multilang' => true,
 		'multilang_shop' => true,
 		'fields' => array(
-			/* Classic fields */
+			// Classic fields
 			'id_shop_default' => 			array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
 			'id_manufacturer' => 			array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
 			'id_supplier' => 				array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
@@ -3722,14 +3722,21 @@ public static function getProductProperties($id_lang, $row, Context $context = n
 
 		$row['specific_prices'] = $specific_prices;
 
+		$row['quantity'] = Product::getQuantity(
+			(int)$row['id_product'],
+			0,
+			isset($row['cache_is_pack']) ? $row['cache_is_pack'] : null
+		);
+
 		if ($row['id_product_attribute'])
-			$row['quantity_all_versions'] = Product::getQuantity(
+		{
+			$row['quantity_all_versions'] = $row['quantity'];
+			$row['quantity'] = Product::getQuantity(
 				(int)$row['id_product'],
-				0,
-				isset($row['cache_is_pack']) ? $row['cache_is_pack'] : null
+    			$row['id_product_attribute'],
+			   isset($row['cache_is_pack']) ? $row['cache_is_pack'] : null
 			);
-		else
-			$row['quantity'] = Product::getQuantity((int)$row['id_product']);
+		}	
 
 		$row['id_image'] = Product::defineProductImage($row, $id_lang);
 		$row['features'] = Product::getFrontFeaturesStatic((int)$id_lang, $row['id_product']);