From 38cf360a0b6e1da9824c92ded04c3f3915a13fc7 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Thu, 21 Apr 2011 08:01:09 +0000
Subject: [PATCH] // merge 6001,6010,6012,6013

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6018 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/tabs/AdminCarts.php             |  2 +-
 admin-dev/tabs/AdminProducts.php          |  3 ++-
 classes/Pack.php                          |  7 ++++---
 themes/prestashop/product.tpl             | 10 +++++-----
 themes/prestashop/products-comparison.tpl |  6 +++---
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/admin-dev/tabs/AdminCarts.php b/admin-dev/tabs/AdminCarts.php
index 3d36822ca..afb3f65b5 100644
--- a/admin-dev/tabs/AdminCarts.php
+++ b/admin-dev/tabs/AdminCarts.php
@@ -49,7 +49,7 @@ class AdminCarts extends AdminTab
 		'id_cart' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
 		'customer' => array('title' => $this->l('Customer'), 'width' => 80, 'filter_key' => 'c!lastname'),
 		'total' => array('title' => $this->l('Total'), 'callback' => 'getOrderTotalUsingTaxCalculationMethod', 'orderby' => false, 'search' => false, 'width' => 50, 'align' => 'right', 'prefix' => '<b>', 'suffix' => '</b>', 'currency' => true),
-		'carrier' => array('title' => $this->l('Carrier'), 'width' => 25, 'align' => 'center', 'callback' => 'replaceZeroByShopName'),
+		'carrier' => array('title' => $this->l('Carrier'), 'width' => 25, 'align' => 'center', 'callback' => 'replaceZeroByShopName', 'filter_key' => 'ca!name'),
 		'date_add' => array('title' => $this->l('Date'), 'width' => 90, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'));
 		parent::__construct();
 	}
diff --git a/admin-dev/tabs/AdminProducts.php b/admin-dev/tabs/AdminProducts.php
index d7b3f3c60..6ae3ad986 100644
--- a/admin-dev/tabs/AdminProducts.php
+++ b/admin-dev/tabs/AdminProducts.php
@@ -3556,7 +3556,7 @@ class AdminProducts extends AdminTab
 				</td>
 			</div>
 		</tr>';
-
+		// param multipleSeparator:'||' ajouté à cause de bug dans lib autocomplete
 		echo '<script type="text/javascript">
 								urlToCall = null;
 								/* function autocomplete */
@@ -3571,6 +3571,7 @@ class AdminProducts extends AdminTab
 											mustMatch:true,
 											scroll:false,
 											cacheLength:0,
+											multipleSeparator:\'||\', 
 											formatItem: function(item) {
 												return item[1]+\' - \'+item[0];
 											}
diff --git a/classes/Pack.php b/classes/Pack.php
index 14a20cd2f..009eeaa16 100644
--- a/classes/Pack.php
+++ b/classes/Pack.php
@@ -119,12 +119,13 @@ class PackCore extends Product
 	public static function getPacksTable($id_product, $id_lang, $full = false, $limit = NULL)
 	{
 		$packs = Db::getInstance()->getValue('
-		SELECT GROUP_CONCAT(a.`id_product_pack`, ",")
+		SELECT GROUP_CONCAT(a.`id_product_pack`)
 		FROM `'._DB_PREFIX_.'pack` a
-		WHERE a.`id_product_item` = '.(int)$id_product.')');
+		WHERE a.`id_product_item` = '.(int)$id_product);
+
 		if (!(int)$packs)
 			return array();
-		
+
 		$sql = '
 		SELECT p.*, pl.*, i.`id_image`, il.`legend`, t.`rate`
 		FROM `'._DB_PREFIX_.'product` p
diff --git a/themes/prestashop/product.tpl b/themes/prestashop/product.tpl
index b10914f68..dd76e4151 100644
--- a/themes/prestashop/product.tpl
+++ b/themes/prestashop/product.tpl
@@ -320,7 +320,7 @@ var fieldRequired = '{l s='Please fill in all required fields' js=1}';
 			<p id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}><label for="product_reference">{l s='Reference :'} </label><span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span></p>
 
 			<!-- quantity wanted -->
-			<p id="quantity_wanted_p"{if (!$allow_oosp && $product->quantity == 0) OR $virtual OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
+			<p id="quantity_wanted_p"{if (!$allow_oosp && $product->quantity <= 0) OR $virtual OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
 				<label>{l s='Quantity :'}</label>
 				<input type="text" name="qty" id="quantity_wanted" class="text" value="{if isset($quantityBackup)}{$quantityBackup|intval}{else}{if $product->minimal_quantity > 1}{$product->minimal_quantity}{else}1{/if}{/if}" size="2" maxlength="3" {if $product->minimal_quantity > 1}onkeyup="checkMinimalQuantity({$product->minimal_quantity});"{/if} />
 			</p>
@@ -334,10 +334,10 @@ var fieldRequired = '{l s='Please fill in all required fields' js=1}';
 			{/if}
 
 			<!-- availability -->
-			<p id="availability_statut"{if ($product->quantity == 0 && !$product->available_later && $allow_oosp) OR ($product->quantity != 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
+			<p id="availability_statut"{if ($product->quantity <= 0 && !$product->available_later && $allow_oosp) OR ($product->quantity > 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
 				<span id="availability_label">{l s='Availability:'}</span>
-				<span id="availability_value"{if $product->quantity == 0} class="warning_inline"{/if}>
-					{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 id="availability_value"{if $product->quantity <= 0} class="warning_inline"{/if}>
+					{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>
 			</p>
 
@@ -354,7 +354,7 @@ var fieldRequired = '{l s='Please fill in all required fields' js=1}';
 				{$HOOK_PRODUCT_OOS}
 			</p>
 
-			<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity == 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if} >{l s='Warning: Last items in stock!'}</p>
+			<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if} >{l s='Warning: Last items in stock!'}</p>
 
 			{if $product->online_only}
 				<p>{l s='Online only'}</p>
diff --git a/themes/prestashop/products-comparison.tpl b/themes/prestashop/products-comparison.tpl
index 867885a0e..9610b2e3c 100644
--- a/themes/prestashop/products-comparison.tpl
+++ b/themes/prestashop/products-comparison.tpl
@@ -67,10 +67,10 @@
 				{/if}
 				<!-- availability -->
 				<p class="comparison_availability_statut">
-					{if !(($product->quantity == 0 && !$product->available_later) OR ($product->quantity != 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE)}
+					{if !(($product->quantity <= 0 && !$product->available_later) OR ($product->quantity != 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE)}
 						<span id="availability_label">{l s='Availability:'}</span>
-						<span id="availability_value"{if $product->quantity == 0} class="warning-inline"{/if}>
-							{if $product->quantity == 0}
+						<span id="availability_value"{if $product->quantity <= 0} class="warning-inline"{/if}>
+							{if $product->quantity <= 0}
 								{if $allow_oosp}
 									{$product->available_later|escape:'htmlall':'UTF-8'}
 								{else}