Merge in from pre_0.1 branch

git-svn-id: file:///svn-source/pmgr/trunk/site@847 97e9348a-65ac-dc4b-aefc-98561f571b83

views/statement_entries/view.ctp

@@ -29,10 +29,12 @@ if (in_array($entry['type'], array('CHARGE', 'PAYMENT')))
   $rows[] = array('Through',          FormatHelper::date($entry['through_date']));
 $rows[] = array('Type',             $entry['type']);
 $rows[] = array('Amount',           FormatHelper::currency($entry['amount']));
-$rows[] = array('Account',          $html->link($account['name'],
-						array('controller' => 'accounts',
-						      'action'     => 'view',
-						      $account['id'])));
+$rows[] = array('Account',          ($account['link']
+				     ? $html->link($account['name'],
+						   array('controller' => 'accounts',
+							 'action'     => 'view',
+							 $account['id']))
+				     : $account['name']));
 $rows[] = array('Customer',         (isset($customer['name'])
 				     ? $html->link($customer['name'],
 						   array('controller' => 'customers',
@@ -40,7 +42,7 @@ $rows[] = array('Customer',         (isset($customer['name'])
 							 $customer['id']))
 				     : null));
 $rows[] = array('Lease',            (isset($lease['id'])
-				     ? $html->link('#'.$lease['id'],
+				     ? $html->link('#'.$lease['number'],
 						   array('controller' => 'leases',
 							 'action'     => 'view',
 							 $lease['id']))
@@ -115,7 +117,6 @@ echo $this->element('statement_entries', array
 		     'config' => array
 		     ('caption'     => $applied_caption,
 		      //'filter' => array('id' => $entry['id']),
-		      'exclude' => array('Transaction'),
 		      )));