Merge remote-tracking branch 'origin/development' into development

admin-dev/themes/default/template/controllers/orders/_product_line.tpl

@@ -56,7 +56,7 @@
 		</span>
 		{/if}
 	</td>
-	{if $display_warehouse}<td>{$product.warehouse_name|escape:'htmlall':'UTF-8'}</td>{/if}
+	{if $display_warehouse}<td align="center">{$product.warehouse_name|escape:'htmlall':'UTF-8'}</td>{/if}
 	{if ($order->hasBeenPaid())}
 		<td align="center" class="productQuantity">
 			{$product['product_quantity_refunded']}

classes/order/Order.php

@@ -1890,10 +1890,9 @@ class OrderCore extends ObjectModel
 	}
 	
 	/**
-	 * Return a unique reference like : GWJTHMZUN#2
+	 * Return id of carrier
 	 * 
-	 * With multishipping, order reference are the same for all orders made with the same cart
-	 * in this case this method suffix the order reference by a # and the order number
+	 * Get id of the carrier used in order
 	 * 
 	 * @since 1.5.5.0
 	 */	

modules/blocklayered/blocklayered.php

@@ -1940,7 +1940,7 @@ class BlockLayered extends Module
 									$(\'#error-treeview\').hide();
 								updElements(0, 0);
 							},
-							\'onComplete\': function() {
+							\'afterLoad\': function() {
 								lock_treeview_hidding = true;
 								$(\'#categories-treeview\').parent().parent().show();
 								if($($(\'#categories-treeview li\')[0]).attr(\'cleaned\'))
@@ -1949,13 +1949,6 @@ class BlockLayered extends Module
 								$($(\'#categories-treeview li\')[0]).removeClass(\'static\');
 								$($(\'#categories-treeview li span\')[0]).trigger(\'click\');
 								$($(\'#categories-treeview li\')[0]).children(\'div\').remove();
-								$($(\'#categories-treeview li\')[0]).
-									removeClass(\'collapsable lastCollapsable\').
-									addClass(\'last static\');
-								$(\'.hitarea\').live(\'click\', function(it)
-								{
-									$(this).parent().find(\'> .category_label\').click();
-								});
 							}
 						});