Replace status with active in tables

modules/adsl/classes/Controller/Admin/Adsl.php

@@ -44,7 +44,7 @@ class Controller_Admin_Adsl extends Controller_Adsl {
 				->columns(array(
 					'id'=>'ID',
 					'supplier_plan->name()'=>'Plan',
-					'supplier_plan->display("status")'=>'Avail',
+					'supplier_plan->display("active")'=>'Avail',
 					'base_down_peak'=>'PD',
 					'base_down_offpeak'=>'OPD',
 					'base_up_peak'=>'PU',
@@ -181,7 +181,7 @@ class Controller_Admin_Adsl extends Controller_Adsl {
 					'service'=>'Service Login',
 					'plan->service->id'=>'Service',
 					'plan->service_number'=>'Service',
-					'plan->service->status'=>'Active',
+					'plan->service->active'=>'Active',
 					'up_peak'=>'Up Peak',
 					'down_peak'=>'Down Peak',
 					'up_offpeak'=>'Up OffPeak',

modules/adsl/classes/Model/ADSL/Supplier/Plan.php

@@ -29,6 +29,9 @@ class Model_ADSL_Supplier_Plan extends ORM {
 	 * Filters used to format the display of values into friendlier values
 	 */
 	protected $_display_filters = array(
+		'active'=>array(
+			array('StaticList_YesNo::get',array(':value',TRUE)),
+		),
 		'base_cost'=>array(
 			array('Tax::add',array(':value')),
 			array('Currency::display',array(':value')),
@@ -49,9 +52,6 @@ class Model_ADSL_Supplier_Plan extends ORM {
 			array('Tax::add',array(':value')),
 			array('Currency::display',array(':value')),
 		),
-		'status'=>array(
-			array('StaticList_YesNo::get',array(':value',TRUE)),
-		),
 	);
 
 	// Map the table fields