Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl

@@ -133,6 +133,24 @@
 						<i class="icon-print"></i>
 						{l s='Print order'}
 					</a>
+					{if Configuration::get('PS_ORDER_RETURN')}
+					<a class="btn btn-default" id="desc-order-standard_refund" href="">
+						<i class="icon-exchange"></i>
+						{if $order->hasBeenShipped()}
+							{l s='Return products'}
+						{elseif $order->hasBeenPaid()}
+							{l s='Standard refund'}
+						{else}
+							{l s='Cancel products'}
+						{/if}
+					</a>
+					{/if}
+					{if $order->hasInvoice()}
+					<a class="btn btn-default" id="desc-order-partial_refund" href="">
+						<i class="icon-exchange"></i>
+						{l s='Partial refund'}
+					</a>
+					{/if}
 				</div>
 				<!-- Tab nav -->
 				<ul class="nav nav-tabs" id="tabOrder">

admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl

@@ -29,12 +29,6 @@ $(function() {
 });
 </script>
 
-{if $show_toolbar}
-	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
-	<div class="leadin">{block name="leadin"}{/block}</div>
-{/if}
-
-
 {if isset($features)}
 	<div class="panel">
 	{if !$features}

classes/stock/StockAvailable.php

@@ -305,7 +305,7 @@ class StockAvailableCore extends ObjectModel
 		if (!Validate::isUnsignedId($id_product))
 			return false;
 
-		$existing_id = StockAvailable::getStockAvailableIdByProductId((int)$id_product, (int)$id_product_attribute, (int)$id_shop);
+		$existing_id = StockAvailable::getStockAvailableIdByProductId((int)$id_product, (int)$id_product_attribute, $id_shop);
 		if ($existing_id > 0)
 		{
 			Db::getInstance()->update(