From c8cd1481014c5f82d0b9f5d14d65b7dac8f7e058 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Tue, 16 Oct 2012 12:41:13 +0000
Subject: [PATCH] [-] BO : fixed bug #PSCFV-4865

---
 .../themes/default/template/controllers/orders/form.tpl     | 2 +-
 controllers/admin/AdminOrdersController.php                 | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
index ada7569e4..ff504f15b 100755
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -1228,7 +1228,7 @@
 		<div class="margin-form">
 			<select name="payment_module_name" id="payment_module_name">
 				{foreach from=$payment_modules item='module'}
-					<option value="{$module.name}" {if isset($smarty.post.payment_module_name) && $module.name == $smarty.post.payment_module_name}selected="selected"{/if}>{$module.name}</option>
+					<option value="{$module->name}" {if isset($smarty.post.payment_module_name) && $module->name == $smarty.post.payment_module_name}selected="selected"{/if}>{$module->displayName}</option>
 				{/foreach}
 			</select>
 		</div>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index eb722d780..c97867f2b 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -168,13 +168,17 @@ class AdminOrdersControllerCore extends AdminController
 												'bankwire' => (int)Configuration::get('PS_OS_BANKWIRE'),
 												'cashondelivery' => (int)Configuration::get('PS_OS_PREPARATION'),
 												'other' => (int)Configuration::get('PS_OS_PAYMENT'));
+		$payment_modules = array();
+		foreach (PaymentModule::getInstalledPaymentModules() as $p_module)
+			$payment_modules[] = Module::getInstanceById((int)$p_module['id_module']);
+
 		$this->context->smarty->assign(array(
 			'recyclable_pack' => (int)Configuration::get('PS_RECYCLABLE_PACK'),
 			'gift_wrapping' => (int)Configuration::get('PS_GIFT_WRAPPING'),
 			'cart' => $cart,
 			'currencies' => Currency::getCurrencies(),
 			'langs' => Language::getLanguages(true, Context::getContext()->shop->id),
-			'payment_modules' => PaymentModule::getInstalledPaymentModules(),
+			'payment_modules' => $payment_modules,
 			'order_states' => OrderState::getOrderStates((int)Context::getContext()->language->id),
 			'defaults_order_state' => $defaults_order_state,
 			'show_toolbar' => $this->show_toolbar,