From cb02fc29d45a7175b1fad0b3875f1f4442b6f6b8 Mon Sep 17 00:00:00 2001
From: bMancone <brice.mancone@prestashop.com>
Date: Tue, 3 Jan 2012 16:01:33 +0000
Subject: [PATCH] // Fixed #PSTEST-261

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12079 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../themes/default/template/orders/form.tpl     | 17 ++++++++++++++++-
 controllers/admin/AdminOrdersController.php     |  7 ++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/template/orders/form.tpl b/admin-dev/themes/default/template/orders/form.tpl
index 7353ab85c..402ab0dc0 100755
--- a/admin-dev/themes/default/template/orders/form.tpl
+++ b/admin-dev/themes/default/template/orders/form.tpl
@@ -778,6 +778,21 @@
 		});
 	}
 </script>
+{if $show_toolbar}
+	<div class="toolbar-placeholder">
+		<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
+				{include file="toolbar.tpl"}
+				<div class="pageTitle">
+				<h3>
+					{block name=pageTitle}
+						<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
+					{/block}
+				</h3>
+				</div>
+		</div>
+	</div>
+	<div class="leadin">{block name="leadin"}{/block}</div>
+{/if}
 <fieldset id="customer_part"><legend><img src="../img/admin/tab-customers.gif" />{l s='Customer'}</legend>
 	<p><label>{l s='Search customers:'}</label><input type="text" id="customer" value="" />
 	<a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')}&addcustomer&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span></a></p>
@@ -1020,4 +1035,4 @@
 <div id="loader_container">
 	<div id="loader">
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 339f38e01..c050b1293 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -86,6 +86,7 @@ class AdminOrdersControllerCore extends AdminController
 	public function renderForm()
 	{
 		parent::renderForm();
+		unset($this->toolbar_btn['save']);
 		$this->addJqueryPlugin(array('autocomplete', 'fancybox', 'typewatch'));
 		$cart = new Cart((int)Tools::getValue('id_cart'));
 		$this->context->smarty->assign(array(
@@ -95,7 +96,11 @@ class AdminOrdersControllerCore extends AdminController
 			'currencies' => Currency::getCurrencies(),
 			'langs' => Language::getLanguages(true, Context::getContext()->shop->id),
 			'payment_modules' => PaymentModule::getInstalledPaymentModules(),
-			'order_states' => OrderState::getOrderStates((int)Context::getContext()->cookie->id_lang)));
+			'order_states' => OrderState::getOrderStates((int)Context::getContext()->cookie->id_lang),
+			'show_toolbar' => $this->show_toolbar,
+			'toolbar_btn' => $this->toolbar_btn,
+			'title' => $this->l('Orders : create order'),
+		));
 		$this->content .= $this->context->smarty->fetch('orders/form.tpl');
 	}