diff --git a/models/lease.php b/models/lease.php index 437b607..217b683 100644 --- a/models/lease.php +++ b/models/lease.php @@ -150,6 +150,7 @@ class Lease extends AppModel { 'conditions' => array ('SEx.effective_date = DATE_ADD(StatementEntry.through_date, INTERVAL 1 day)', 'SEx.lease_id = StatementEntry.lease_id', + 'SEx.reverse_transaction_id IS NULL', ), ), ), @@ -159,6 +160,7 @@ class Lease extends AppModel { 'conditions' => array(array('Lease.id' => $id), array('StatementEntry.type' => 'CHARGE'), array('StatementEntry.account_id' => $rent_account_id), + array('StatementEntry.reverse_transaction_id IS NULL'), array('SEx.id' => null), ), ) @@ -259,7 +261,9 @@ class Lease extends AppModel { 'conditions' => array(array('StatementEntry.lease_id' => $id), - array('StatementEntry.account_id' => $rent_account_id)), + array('StatementEntry.account_id' => $rent_account_id), + array('StatementEntry.reverse_transaction_id IS NULL'), + ), 'order' => array('StatementEntry.effective_date'), ), @@ -278,7 +282,9 @@ class Lease extends AppModel { ('CHARGE', array('conditions' => array(array('StatementEntry.lease_id' => $id), - array('StatementEntry.account_id' => $rent_account_id)), + array('StatementEntry.account_id' => $rent_account_id), + array('StatementEntry.reverse_transaction_id IS NULL'), + ), 'order' => array('StatementEntry.through_date DESC'), ),