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

Merge in from surplus_account_20090815 r592

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@593 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-08-17 02:22:54 +00:00
parent 893fc74c0a
commit 23cdd0e497
22 changed files with 629 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
views/transactions/view.ctp
View File

@@ -11,13 +11,14 @@ echo '<div class="transaction view">' . "\n";
$account = $transaction['Account'];
$ledger = $transaction['Ledger'];
$nsf_tender = $transaction['NsfTender'];
if (isset($transaction['Transaction']))
$transaction = $transaction['Transaction'];
$rows = array();
$rows[] = array('ID', $transaction['id']);
$rows[] = array('Type', $transaction['type']);
$rows[] = array('Type', str_replace('_', ' ', $transaction['type']));
$rows[] = array('Timestamp', FormatHelper::datetime($transaction['stamp']));
$rows[] = array('Amount', FormatHelper::currency($transaction['amount']));
$rows[] = array('Account', $html->link($account['name'],
@@ -28,7 +29,11 @@ $rows[] = array('Ledger', $html->link($ledger['name'],
array('controller' => 'ledgers',
'action' => 'view',
$ledger['id'])));
$rows[] = array('Comment', $transaction['comment']);
if (!empty($nsf_tender['id']))
$rows[] = array('NSF Tender', $html->link($nsf_tender['name'],
array('controller' => 'tenders',
'action' => 'view',
$nsf_tender['id'])));
echo $this->element('table',
array('class' => 'item transaction detail',
@@ -79,7 +84,8 @@ if ($transaction['type'] === 'INVOICE' ||
'caption' => 'Statement Entries',
'filter' => array('Transaction.id' => $transaction['id'],
'type !=' => 'VOID'),
'exclude' => array('Transaction', 'Account'),
'exclude' => array('Transaction', 'Debit', 'Credit'),
'include' => array('Amount'),
)));
}