From fcc2930693527ac7067f53edaf15d9bf4010da11 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Wed, 25 Sep 2013 18:41:52 +0200
Subject: [PATCH 1/3] [-] BO : Remove duplicate sql insert in
 setProductOutOfStock in monoshop

---
 classes/stock/StockAvailable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/stock/StockAvailable.php b/classes/stock/StockAvailable.php
index 2e47abb49..dbe95389f 100644
--- a/classes/stock/StockAvailable.php
+++ b/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(

From 5a4548bd5199450da0302b92c9d20eb330ecba03 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Wed, 9 Oct 2013 09:41:10 +0200
Subject: [PATCH 2/3] // Toolbar for search

---
 .../template/controllers/search/helpers/view/view.tpl       | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
index 953857f88..afbf00c25 100644
--- a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+++ b/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}

From 57c34488fff6664bbe1b38e871632d971cf7aff6 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Wed, 9 Oct 2013 09:41:51 +0200
Subject: [PATCH 3/3] // Orders refund buttons

---
 .../controllers/orders/helpers/view/view.tpl   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
index 554eb4f54..a492e2e3d 100755
--- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/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">