Work on Email and other major consistency work

modules/invoice/classes/Model/Invoice.php

@@ -215,7 +215,6 @@ class Model_Invoice extends ORM_OSB implements Cartable {
 		return $format ? Currency::display($result) : $result;
 	}
 
-//ZZ
 	/**
 	 * Return a list of valid checkout options for this invoice
 	 */
@@ -508,11 +507,6 @@ class Model_Invoice extends ORM_OSB implements Cartable {
 				if (! $iio->changed())
 					continue;
 
-				if (! $iio->check()) {
-					// @todo Mark invoice as cancelled and write a memo, then...
-					throw new Kohana_Exception('Problem saving invoice_item for invoice :invoice - Failed check()',array(':invoice'=>$this->id));
-				}
-
 				$iio->save();
 
 				if (! $iio->saved()) {
@@ -548,7 +542,7 @@ class Model_Invoice extends ORM_OSB implements Cartable {
 		} else
 			throw new Kohana_Exception('Couldnt save invoice for some reason?');
 
-		return TRUE;
+		return $this;
 	}
 
 	public function set_remind($key,$value,$add=FALSE) {