Added outstanding charges and outstanding credits to the customer page, and reorded fields in order of presumed importance. Removed items from Unit/Lease which really shouldn't have been there. They were added for convenience, but the redundancy was confusing. Added a couple report links to make it easy to see outstanding charges and collected rents.
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work/site@977 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -21,7 +21,7 @@ $cols['Debit'] = array('index' => 'charge', 'formatter' =>
|
||||
$cols['Credit'] = array('index' => 'disbursement', 'formatter' => 'currency');
|
||||
|
||||
$cols['Amount'] = array('index' => "StatementEntry.amount", 'formatter' => 'currency');
|
||||
$cols['Applied'] = array('index' => "applied", 'formatter' => 'currency');
|
||||
$cols['Received'] = array('index' => "applied", 'formatter' => 'currency');
|
||||
// 'balance' is already in use as part of charge/disbursement/balance.
|
||||
// 'unapplied' isn't quite the right term, but it's not customer visible.
|
||||
$cols['Balance'] = array('index' => "unapplied", 'formatter' => 'currency');
|
||||
@@ -32,6 +32,22 @@ if (isset($subtotal_column))
|
||||
$cols['Sub-Total']['index'] =
|
||||
'subtotal-' . $cols[$subtotal_column]['index'];
|
||||
|
||||
if ((isset($action) && $action == 'unreconciled') ||
|
||||
(isset($config) && isset($config['action']) && $config['action'] == 'unreconciled')) {
|
||||
if (isset($config) && !isset($config['grid_div_id']))
|
||||
$config['grid_div_id'] = 'unpaid';
|
||||
$include_columns = array('Entry', 'Date',
|
||||
'Effective', 'Customer', 'Unit',
|
||||
'Account', 'Amount', 'Received', 'Balance');
|
||||
}
|
||||
else {
|
||||
$include_columns =
|
||||
array_diff(array_keys($cols),
|
||||
array('Transaction', 'Through', 'Lease',
|
||||
'Amount', 'Received', 'Balance', 'Sub-Total',
|
||||
'Comment'));
|
||||
}
|
||||
|
||||
// Include custom data
|
||||
$grid->customData(compact('statement_entry_id'));
|
||||
|
||||
@@ -41,8 +57,5 @@ $grid
|
||||
->sortField('Date', 'DESC')
|
||||
->defaultFields(array('Entry', 'Date', 'Charge', 'Payment'))
|
||||
->searchFields(array('Customer', 'Unit'))
|
||||
->render($this, isset($config) ? $config : null,
|
||||
array_diff(array_keys($cols), array('Transaction', 'Through', 'Lease',
|
||||
'Amount', 'Applied', 'Balance', 'Sub-Total',
|
||||
'Comment')));
|
||||
->render($this, isset($config) ? $config : null, $include_columns);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user