Got the collected reports working again. NSF hasn't been tested yet, because NSF entry is not yet working.

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@402 97e9348a-65ac-dc4b-aefc-98561f571b83

site/views/elements/statement_entries.ctp

@@ -20,23 +20,16 @@ $cols['Comment']        = array('index' => 'StatementEntry.comment', 'formatter'
 $cols['Charge']         = array('index' => 'charge',              'formatter' => 'currency');
 $cols['Payment']        = array('index' => 'payment',             'formatter' => 'currency');
 
-$cols['Last Payment']   = array('index' => 'last_paid',           'formatter' => 'date');
 $cols['Applied']        = array('index' => "applied",             'formatter' => 'currency');
 $cols['Sub-Total']      = array('index' => 'subtotal-balance',    'formatter' => 'currency', 'sortable' => false);
 
 
-/* if (!isset($statement_entry_id)) */
-/*   $grid->invalidFields('Applied'); */
-/* else */
-/*   $cols['Sub-Total']['index'] = 'subtotal-applied'; */
-
-// REVISIT <AP>: 20090722
-//  Disallowing this field until more of the rework is complete
-$grid->invalidFields('Applied');
+if (isset($subtotal_column))
+  $cols['Sub-Total']['index'] =
+    'subtotal-' . $cols[$subtotal_column]['index'];
 
 // Include custom data
-$grid->customData(compact('statement_entry_id', 'from_date', 'through_date',
-			  'payment_accounts', 'charge_accounts'));
+$grid->customData(compact('statement_entry_id'));
 
 // Render the grid
 $grid
@@ -45,5 +38,7 @@ $grid
 ->defaultFields(array('Entry', 'Date', 'Charge', 'Payment'))
 ->searchFields(array('Customer', 'Unit'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Through', 'Lease', 'Last Payment', 'Comment')));
+	 array_diff(array_keys($cols), array('Through', 'Lease',
+					     'Applied', 'Sub-Total',
+					     'Comment')));