// 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

@@ -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();
 	}

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];
 											}