Some cleanup, setup improvements and other misc items

modules/charge/classes/Controller/Reseller/Charge.php

@@ -148,15 +148,16 @@ $(document).ready(function() {
 			->title_icon('icon-th-list')
 			->body(Table::factory()
 				->page_items(50)
-				->data(ORM::factory('Charge')->where('account_id','IN',$this->ao->RTM->customers($this->ao->RTM))->order_by('id DESC')->find_all())
+				->data(ORM::factory('Charge')->where_authorised('account_id',$this->ao)->where('void','is',NULL)->order_by('id DESC')->find_all())
 				->columns(array(
 					'id'=>'ID',
-					'date_orig'=>'Processed',
 					'date_charge'=>'Date',
+					'processed(TRUE)'=>'Processed',
+					'invoice_item->invoice_id'=>'Invoice',
 					'sweep_type'=>'Sweep',
-					'status'=>'Status',
 					'quantity'=>'Quantity',
 					'amount'=>'Amount',
+					'total(TRUE)'=>'Total',
 					'description'=>'Description',
 					'service_id'=>'Service',
 					'account->accnum()'=>'Cust ID',
@@ -164,6 +165,7 @@ $(document).ready(function() {
 				))
 				->prepend(array(
 					'id'=>array('url'=>URL::link('reseller','charge/edit/')),
+					'invoice_item->invoice_id'=>array('url'=>URL::link('user','invoice/view/')),
 				))
 			);
 	}