// Fix change currency on editing order

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10664 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-25 13:43:40 +00:00
parent af8875217e
commit 0eccf98592
1 changed files with 4 additions and 3 deletions
@@ -634,12 +634,13 @@ class AdminOrdersControllerCore extends AdminController
 						$payment->amount = Tools::convertPriceFull((float)$payment->amount, $old_currency, $currency);
 						$payment->update();
 					}
-
-					$order_carrier = Db::getInstance()->executeS('
+					
+					$order_carrier = Db::getInstance()->getRow('
 						SELECT *
 						FROM `'._DB_PREFIX_.'order_carrier`
 						WHERE `id_order` = '.(int)$order->id);
-					// Update order carrier amount
+					
+					// Update order carrier amount					
 					Db::getInstance()->execute('
 						UPDATE `'._DB_PREFIX_.'order_carrier`
 						SET `shipping_cost_tax_excl` = '.(float)Tools::convertPriceFull($order_carrier['shipping_cost_tax_excl'], $old_currency, $currency).',