From 393d9c9d77b5cd8d06dd726d6d7d08eade89ade0 Mon Sep 17 00:00:00 2001 From: abijah Date: Fri, 31 Jul 2009 01:34:45 +0000 Subject: [PATCH] Removed the Tender column from grids where the account does not support payments and so the ledger entries should never have a Tender anyway (except for our special case Closing account, which is fine to ignore). git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@441 97e9348a-65ac-dc4b-aefc-98561f571b83 --- views/accounts/view.ctp | 6 ++++-- views/ledgers/view.ctp | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/views/accounts/view.ctp b/views/accounts/view.ctp index 0b3c6f3..c4b3f3d 100644 --- a/views/accounts/view.ctp +++ b/views/accounts/view.ctp @@ -81,7 +81,8 @@ echo $this->element('ledger_entries', array 'caption' => ("Current Ledger: " . "(". $current_ledger['name'] .")"), 'filter' => array('Ledger.id' => $current_ledger['id']), - 'exclude' => array('Account', 'Amount', 'Cr/Dr', 'Balance'), + 'exclude' => array('Account', 'Amount', 'Cr/Dr', 'Balance', + empty($account['payments']) ? 'Tender' : null), 'include' => array('Debit', 'Credit', 'Sub-Total'), ))); @@ -98,7 +99,8 @@ echo $this->element('ledger_entries', array 'grid_setup' => array('hiddengrid' => true), 'caption' => "Entire Ledger", 'filter' => array('Account.id' => $account['id']), - 'exclude' => array('Account', 'Amount', 'Cr/Dr', 'Balance'), + 'exclude' => array('Account', 'Amount', 'Cr/Dr', 'Balance', + empty($account['payments']) ? 'Tender' : null), 'include' => array('Debit', 'Credit', 'Sub-Total'), ))); diff --git a/views/ledgers/view.ctp b/views/ledgers/view.ctp index 2535824..3ae23b7 100644 --- a/views/ledgers/view.ctp +++ b/views/ledgers/view.ctp @@ -70,7 +70,9 @@ echo $this->element('ledger_entries', array 'config' => array ('caption' => "Ledger Entries", 'filter' => array('Ledger.id' => $ledger['id']), - 'exclude' => array('Ledger', 'Account', 'Amount', 'Cr/Dr', 'Balance'), + 'exclude' => array('Ledger', 'Account', + 'Amount', 'Cr/Dr', 'Balance', + empty($account['payments']) ? 'Tender' : null), 'include' => array('Debit', 'Credit', 'Sub-Total'), )));