Update to statements and other minor items

application/classes/Controller/Reseller/Account.php

@@ -117,7 +117,7 @@ class Controller_Reseller_Account extends Controller_Account {
 
 		$i = Invoice::instance();
 		foreach ($ao->service->list_active() as $io)
-			if (! $io->suspend_billing)
+			if (! $io->suspend_billing AND ! $io->external_billing)
 				$i->add_service($io);
 
 		Block::factory()

application/classes/Model/Account.php

@@ -40,6 +40,8 @@ class Model_Account extends Model_Auth_UserDefault {
 		),
 	);
 
+	protected $_form = array('id'=>'id','value'=>'name(TRUE)');
+
 	protected $_save_message = TRUE;
 
 	/**

application/classes/ORM.php

@@ -209,6 +209,23 @@ abstract class ORM extends Kohana_ORM {
 		return $result;
 	}
 
+	/**
+	 * Return an array of data that can be used in a SELECT statement.
+	 * The ID and VALUE is defined in the model for the select.
+	 */
+	public function list_select($blank=FALSE) {
+		$result = array();
+
+		if ($blank)
+			$result[] = '';
+
+		if ($this->_form AND array_intersect(array('id','value'),$this->_form))
+			foreach ($this->find_all() as $o)
+				$result[$o->{$this->_form['id']}] = $o->resolve($this->_form['value']);
+
+		return $result;
+	}
+
 	/**
 	 * This function is used so that methods can be called via variables
 	 */

application/classes/ORM/OSB.php

@@ -283,22 +283,5 @@ abstract class ORM_OSB extends ORM {
 
 		return $x->find_all()->count();
 	}
-
-	/**
-	 * Return an array of data that can be used in a SELECT statement.
-	 * The ID and VALUE is defined in the model for the select.
-	 */
-	public function list_select($blank=FALSE) {
-		$result = array();
-
-		if ($blank)
-			$result[] = '';
-
-		if ($this->_form AND array_intersect(array('id','value'),$this->_form))
-			foreach ($this->find_all() as $o)
-				$result[$o->{$this->_form['id']}] = $o->resolve($this->_form['value']);
-
-		return $result;
-	}
 }
 ?>