abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More tweaking to all of the grid displays. This was mostly visual, but includes some bug fixes as well (such as a manual filter override in the ledger_entries controller).

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@371 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-23 16:53:33 +00:00
parent 3c22378498
commit 4a94fc3798
15 changed files with 77 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
views/elements/ledger_entries.ctp
View File

@@ -11,9 +11,10 @@ $cols['Cr/Dr'] = array('index' => 'LedgerEntry.crdr', 'formatter' =>
$cols['Tender'] = array('index' => 'Tender.name', 'formatter' => 'name');
$cols['Comment'] = array('index' => 'LedgerEntry.comment', 'formatter' => 'comment', 'width'=>150);
$cols['Amount'] = array('index' => 'LedgerEntry.amount', 'formatter' => 'currency');
$cols['Debit'] = array('index' => 'debit', 'formatter' => 'currency');
$cols['Credit'] = array('index' => 'credit', 'formatter' => 'currency');
$cols['Amount'] = array('index' => 'LedgerEntry.amount', 'formatter' => 'currency');
$cols['Balance'] = array('index' => 'balance', 'formatter' => 'currency');
$cols['Sub-Total'] = array('index' => 'subtotal-balance', 'formatter' => 'currency', 'sortable' => false);
@@ -25,5 +26,5 @@ $grid
->defaultFields(array('Entry', 'Date', 'Amount'))
->searchFields(array('Customer', 'Unit'))
->render($this, isset($config) ? $config : null,
array_diff(array_keys($cols), array('Debit', 'Credit', 'Sub-Total', 'Comment')));
array_diff(array_keys($cols), array('Debit', 'Credit', 'Balance', 'Sub-Total', 'Comment')));

5
views/elements/statement_entries.ctp
View File

@@ -22,7 +22,7 @@ $cols['Payment'] = array('index' => 'payment', 'formatter' =>
$cols['Last Payment'] = array('index' => 'last_paid', 'formatter' => 'date');
$cols['Applied'] = array('index' => "applied", 'formatter' => 'currency');
$cols['Sub-Total'] = array('index' => 'subtotal-StatementEntry.amount', 'formatter' => 'currency', 'sortable' => false);
$cols['Sub-Total'] = array('index' => 'subtotal-balance', 'formatter' => 'currency', 'sortable' => false);
/* if (!isset($statement_entry_id)) */
@@ -31,8 +31,7 @@ $cols['Sub-Total'] = array('index' => 'subtotal-StatementEntry.amount', 'f
/* $cols['Sub-Total']['index'] = 'subtotal-applied'; */
// REVISIT <AP>: 20090722
// Disallowing these fields until more of the rework is complete
$grid->invalidFields('Sub-Total');
// Disallowing this field until more of the rework is complete
$grid->invalidFields('Applied');
// Include custom data