Replace status with active in tables

modules/invoice/classes/Invoice.php

@@ -33,7 +33,7 @@ class Invoice {
 
 		// Set our invoice as valid
 		if (is_null($io))
-			$this->_io->status = 1;
+			$this->_io->active = 1;
 	}
 
 	/**
@@ -73,8 +73,8 @@ class Invoice {
 
 		// Check if there are any charges
 		$c = ORM::factory('Charge')
+			->where_active()
 			->where('service_id','=',$so->id)
-			->where('void','is',NULL)
 			->where('processed','is',NULL);
 
 		foreach ($c->find_all() as $co) {
@@ -172,7 +172,7 @@ class Invoice {
 			case 'html':
 				switch ($section) {
 					case 'body':
-						if (! $this->_io->status)
+						if (! $this->_io->active)
 							Style::factory()
 								->type('file')
 								->data('media/css/pages/invoice.css');