Fixes from live

modules/checkout/classes/Checkout/Plugin/Paypal.php

@@ -86,7 +86,6 @@ abstract class Checkout_Plugin_Paypal extends Checkout_Plugin {
 				// Verify that the IPN is for us.
 				// @todo This should be in the DB.
 				if ($cno->data['business'] == ($this->test_mode ? $this->email_test : $this->email_prod)) {
-
 					switch ($cno->data['payment_status']) {
 						case 'Completed':
 							// Our cart items total.

modules/checkout/classes/Model/Checkout.php

@@ -11,8 +11,8 @@
  */
 class Model_Checkout extends ORM_OSB {
 	protected $_has_many = array(
-		'account'=>array('through'=>'account_billing','foreign_key'=>'checkout_id'),
 		'payment'=>array(),
+		'service'=>array('through'=>'account_billing','foreign_key'=>'checkout_id'),
 	);
 
 	protected $_sorting = array('name'=>'ASC');