Index: payment/uc_payment/uc_payment_order_pane.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/payment/uc_payment/uc_payment_order_pane.inc,v
retrieving revision 1.5.2.7
diff -u -p -r1.5.2.7 uc_payment_order_pane.inc
--- payment/uc_payment/uc_payment_order_pane.inc	21 Sep 2009 14:34:46 -0000	1.5.2.7
+++ payment/uc_payment/uc_payment_order_pane.inc	27 Feb 2010 04:51:09 -0000
@@ -21,6 +21,7 @@ function uc_order_pane_payment($op, $arg
         $context = array(
           'revision' => 'formatted-original',
           'type' => 'amount',
+          'subject' => array('order' => $arg1)
         );
         $output = t('Balance: @balance', array('@balance' => uc_price(uc_payment_balance($arg1), $context)));
         $output .= ' ('. l(t('View'), 'admin/store/orders/'. $arg1->order_id .'/payments') .')<br />';
Index: payment/uc_paypal/uc_paypal.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/payment/uc_paypal/uc_paypal.pages.inc,v
retrieving revision 1.1.2.11
diff -u -p -r1.1.2.11 uc_paypal.pages.inc
--- payment/uc_paypal/uc_paypal.pages.inc	18 Nov 2009 21:08:06 -0000	1.1.2.11
+++ payment/uc_paypal/uc_paypal.pages.inc	27 Feb 2010 04:51:10 -0000
@@ -93,7 +93,7 @@ function uc_paypal_ipn($order_id = 0) {
 
       case 'Completed':
         $comment = t('PayPal transaction ID: @txn_id', array('@txn_id' => $txn_id));
-        uc_payment_enter($order_id, 'paypal_wps', $payment_amount, $order->uid, NULL, $comment);
+        uc_payment_enter($order_id, 'paypal_wps', $payment_amount, $order->uid, array('payment_currency' => $payment_currency), $comment);
         uc_cart_complete_sale($order);
         uc_order_comment_save($order_id, 0, t('Payment of @amount @currency submitted through PayPal.', array('@amount' => uc_price($payment_amount, $context, $options), '@currency' => $payment_currency)), 'order', 'payment_received');
         uc_order_comment_save($order_id, 0, t('PayPal IPN reported a payment of @amount @currency.', array('@amount' => uc_price($payment_amount, $context, $options), '@currency' => $payment_currency)));
Index: uc_order/uc_order.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_order/uc_order.admin.inc,v
retrieving revision 1.1.2.29
diff -u -p -r1.1.2.29 uc_order.admin.inc
--- uc_order/uc_order.admin.inc	4 Jan 2010 15:13:10 -0000	1.1.2.29
+++ uc_order/uc_order.admin.inc	27 Feb 2010 04:51:14 -0000
@@ -485,6 +485,7 @@ function uc_order_admin($sql = NULL, $ar
 
   $result = pager_query($sql, variable_get('uc_order_number_displayed', 30), 0, NULL, $args);
   while ($order = db_fetch_object($result)) {
+    $context['subject'] = array('order' => $order);
     if ($address == 'shipping') {
       $order_name = $order->delivery_first_name .' '. $order->delivery_last_name;
     }