Work on Email and other major consistency work

modules/payment/classes/Controller/Admin/Payment.php

@@ -96,12 +96,7 @@ class Controller_Admin_Payment extends Controller_Payment {
 					$pio->alloc_amt = is_numeric($v) ? $v : 0;
 				}
 
-			// Entry updated
-			if ($po->values($_POST)->check() AND $po->save())
-				SystemMessage::factory()
-					->title('Record updated')
-					->type('success')
-					->body(_('Your Payment record has been recorded/updated.'));
+			$this->save($po);
 		}
 
 		Script::factory()

modules/payment/classes/Model/Payment.php

@@ -200,7 +200,7 @@ class Model_Payment extends ORM_OSB {
 			throw HTTP_Exception::factory(501,'Problem saving payment :id - Failed save()',array(':id'=>$this->id));
 		}
 
-		return TRUE;
+		return $this;
 	}
 
 	/**