Experiment to allow payments to trace back to the charge, even if the amount crosses several ledgers. I'd really like to go a different direction.

git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@179 97e9348a-65ac-dc4b-aefc-98561f571b83

build.cmd

@@ -0,0 +1,3 @@
+@echo off
+%~dp0\scripts\sitelink2pmgr.pl %~dp0\db\schema.sql %~dp0db\vss.mdb > NUL
+echo Done!

site/app_controller.php

@@ -305,13 +305,7 @@ class AppController extends Controller {
       $id = 'id';
       extract(array_intersect_key($fields, array_flip($special)));
       foreach ($records AS &$record) {
-	if (!isset($record[$table]))
-	  continue;
-
 	foreach (array_diff_key($fields, array_flip($special)) AS $field) {
-	  if (!isset($record[$table][$id]) || !isset($record[$table][$field]))
-	    continue;
-
 	  // DEBUG PURPOSES ONLY!
 	  //$params['linkrecord'][] = compact('table', 'field', 'id', 'controller', 'record');
 	  $record[$table][$field] =
@@ -344,38 +338,28 @@ class AppController extends Controller {
   }
 
   function jqGridDataOutputRecords(&$params, &$model, &$records) {
-    $id_field    = 'jqGrid_id';
+    $model_alias = $model->alias;
+    $id          = 'jqGrid_id';
+
     foreach ($records AS $record) {
-      $this->jqGridDataOutputRecord($params, $model, $record,
-				    $record[$id_field], $params['fields']);
-    }
-  }
+      echo " <row id='{$record[$id]}'>\n";
+      foreach ($params['fields'] AS $field) {
+	if (preg_match("/\./", $field)) {
+	  list($tbl, $col) = explode(".", $field);
+	  $data = $record[$tbl][$col];
+	}
+	else {
+	  $data = $record[$model_alias][$field];
+	}
 
-  function jqGridDataOutputRecord(&$params, &$model, &$record, $id, $fields) {
-    echo " <row id='$id'>\n";
-    foreach ($fields AS $field) {
-      $this->jqGridDataOutputRecordField($params, $model, $record, $field);
+	// be sure to put text data in CDATA
+	if (preg_match("/^\d*$/", $data))
+	  echo "  <cell>$data</cell>\n"; 
+	else
+	  echo "  <cell><![CDATA[$data]]></cell>\n"; 
+      }
+      echo " </row>\n";
     }
-    echo " </row>\n";
-  }
-
-  function jqGridDataOutputRecordField(&$params, &$model, &$record, $field) {
-    if (preg_match("/\./", $field)) {
-      list($tbl, $col) = explode(".", $field);
-      $data = $record[$tbl][$col];
-    }
-    else {
-      $data = $record[$model->alias][$field];
-    }
-    $this->jqGridDataOutputRecordCell($params, $model, $record, $field, $data);
-  }
-
-  function jqGridDataOutputRecordCell(&$params, &$model, &$record, $field, $data) {
-    // be sure to put text data in CDATA
-    if (preg_match("/^\d*$/", $data))
-      echo "  <cell>$data</cell>\n"; 
-    else
-      echo "  <cell><![CDATA[$data]]></cell>\n"; 
   }
 
   function jqGridDataFinalize(&$params) {

site/controllers/leases_controller.php

@@ -71,7 +71,6 @@ class LeasesController extends AppController {
   function jqGridRecordLinks(&$params, &$model, &$records, $links) {
     $links['Lease'] = array('number');
     $links['Unit'] = array('name');
-    $links['Customer'] = array('name');
     return parent::jqGridRecordLinks($params, $model, $records, $links);
   }
 
@@ -108,6 +107,7 @@ class LeasesController extends AppController {
 	     array(// Models
 		   'LeaseType',
 		   'Unit',
+		   'Account' => array('CurrentLedger'),
 		   'Customer',
 		   ),
 	     'conditions' => array(array('Lease.id' => $id)),
@@ -115,15 +115,23 @@ class LeasesController extends AppController {
 	     )
        );
 
+    // Summarize each ledger
+    $this->Lease->statsMerge($lease, 
+			     $this->Lease->stats($lease['Lease']['id']));
+
     // Obtain the overall lease balance
     $this->Lease->statsMerge($lease['Lease'],
 			     array('stats' => $this->Lease->stats($id)));
-    $outstanding_balance = $lease['Lease']['stats']['balance'];
+    $outstanding_balance = $lease['Lease']['stats']['Account']['Ledger']['balance'];
 
     // Determine the lease security deposit
     $deposits = $this->Lease->findSecurityDeposits($lease['Lease']['id']);
     $outstanding_deposit = $deposits['summary']['balance'];
 
+    // Move the Leder stats into our alias 'CurrentLedger'
+    $lease['Account']['CurrentLedger'] += $lease['Account']['Ledger'];
+    unset($lease['Account']['Ledger']);
+
     // Prepare to render
     $title = 'Lease: #' . $lease['Lease']['id'];
     $this->set(compact('lease', 'title',

site/controllers/ledger_entries_controller.php

@@ -25,14 +25,6 @@ class LedgerEntriesController extends AppController {
    *    to jqGrid.
    */
 
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
-    if (isset($params['custom']['ar_account'])) {
-      $params['custom']['account_id'] = 
-	$this->LedgerEntry->DebitLedger->Account->accountReceivableAccountID();
-    }
-  }
-
   function jqGridDataTables(&$params, &$model) {
     $link =
       array(// Models
@@ -44,16 +36,6 @@ class LedgerEntriesController extends AppController {
 	     array('fields' => array('id', 'name'),
 		   ),
 
-	     'Customer' =>
-	     array('fields' => array('id', 'name'),
-		   ),
-
-	     'Lease' =>
-	     array('fields' => array('id', 'number'),
-		   'Unit' => 
-		   array('fields' => array('id', 'name'),
-			 ),
-		   ),
 	    );
 
     if (isset($params['custom']['account_ftype'])) {
@@ -95,19 +77,6 @@ class LedgerEntriesController extends AppController {
 	      );
     }
 
-    if (isset($params['custom']['account_id'])) {
-      $account_id = $params['custom']['account_id'];
-      $link['Ledger'] =
-	array('fields' => array('id', 'sequence'),
-	      'conditions' => ("Ledger.id = IF(DebitLedger.account_id = $account_id," .
-			       "               LedgerEntry.credit_ledger_id," .
-			       "               LedgerEntry.debit_ledger_id)"),
-	      'Account' => array(
-				 'fields' => array('id', 'name'),
-				 ),
-	      );
-    }
-
     if (isset($params['custom']['reconcile_id'])) {
       $ftype = $params['custom']['account_ftype'];
       $ftype = $this->LedgerEntry->DebitLedger->Account->fundamentalOpposite($ftype);
@@ -123,14 +92,11 @@ class LedgerEntriesController extends AppController {
     $ledger_id = (isset($params['custom']['ledger_id'])
 		  ? $params['custom']['ledger_id']
 		  : null);
-    $account_id = (isset($params['custom']['account_id'])
-		     ? $params['custom']['account_id']
-		     : null);
     $account_type = (isset($params['custom']['account_type'])
 		     ? $params['custom']['account_type']
 		     : null);
 
-    return $model->ledgerContextFields2($ledger_id, $account_id, $account_type);
+    return $model->ledgerContextFields2($ledger_id, $account_type);
   }
 
   function jqGridDataConditions(&$params, &$model) {
@@ -152,71 +118,20 @@ class LedgerEntriesController extends AppController {
       $conditions[] = array('Reconciliation.'.$ftype.'_ledger_entry_id' => $params['custom']['reconcile_id']);
     }
 
-    if (isset($params['custom']['account_id'])) {
-      $conditions[] =
-	array('OR' => 
-	      array(array('CreditAccount.id' => $params['custom']['account_id']),
-		    array('DebitAccount.id' => $params['custom']['account_id'])));
-    }
-
-    if (isset($params['custom']['customer_id'])) {
-      $conditions[] = 
-	array('Customer.id' => $params['custom']['customer_id']);
-
-/*       $Account = new Account(); */
-/*       if (isset($params['custom']['account_ftype']) || */
-/* 	  isset($params['custom']['ledger_id'])) { */
-/* 	$conditions[] =  */
-/* 	  array('OR' => array('Account.id' => $Account->invoiceAccountID(), */
-/* 			      'Account.id' => $Account->receiptAccountID())); */
-/*       } else { */
-/* 	$conditions[] =  */
-/* 	  array('OR' => array('DebitAccount.id' => $Account->invoiceAccountID(), */
-/* 			      //'CreditAccount.id' => $Account->invoiceAccountID(), */
-/* 			      //'DebitAccount.id' => $Account->receiptAccountID(), */
-/* 			      'CreditAccount.id' => $Account->receiptAccountID(), */
-/* 			      )); */
-/*       } */
-    }
-
-    if (isset($params['custom']['lease_id'])) {
-      $conditions[] = 
-	array('Lease.id' => $params['custom']['lease_id']);
-
-/*       $Account = new Account(); */
-/*       if (isset($params['custom']['account_ftype']) || */
-/* 	  isset($params['custom']['ledger_id'])) { */
-/* 	$conditions[] =  */
-/* 	  array('OR' => array('Account.id' => $Account->invoiceAccountID(), */
-/* 			      'Account.id' => $Account->receiptAccountID())); */
-/*       } else { */
-/* 	$conditions[] =  */
-/* 	  array('OR' => array('DebitAccount.id' => $Account->invoiceAccountID(), */
-/* 			      //'CreditAccount.id' => $Account->invoiceAccountID(), */
-/* 			      //'DebitAccount.id' => $Account->receiptAccountID(), */
-/* 			      'CreditAccount.id' => $Account->receiptAccountID(), */
-/* 			      )); */
-/*       } */
-    }
-
-    if (isset($params['custom']['transaction_id'])) {
-      $conditions[] = 
-	array('Transaction.id' => $params['custom']['transaction_id']);
-    }
-
     return $conditions;
   }
 
   function jqGridRecordLinks(&$params, &$model, &$records, $links) {
     $links['Transaction']    = array('id');
     $links['LedgerEntry']    = array('id');
-    $links['Account']        = array('controller' => 'accounts', 'name');
-    $links['DebitAccount']   = array('controller' => 'accounts', 'name');
-    $links['CreditAccount']  = array('controller' => 'accounts', 'name');
+    if (isset($params['custom']['account_ftype']) || isset($params['custom']['ledger_id'])) {
+      $links['Account']   = array('controller' => 'accounts', 'name');
+    }
+    else {
+      $links['DebitAccount']   = array('controller' => 'accounts', 'name');
+      $links['CreditAccount']  = array('controller' => 'accounts', 'name');
+    }
     $links['MonetarySource'] = array('name');
-    $links['Customer']       = array('name');
-    $links['Lease']          = array('number');
-    $links['Unit']           = array('name');
     return parent::jqGridRecordLinks($params, $model, $records, $links);
   }
 
@@ -230,39 +145,8 @@ class LedgerEntriesController extends AppController {
   function jqGridDataOrder(&$params, &$model, $index, $direction) {
 /*     if ($index === 'balance') */
 /*       return ($index .' '. $direction); */
-    $order = parent::jqGridDataOrder($params, $model, $index, $direction);
 
-    if ($index === 'Transaction.stamp') {
-      $order[] = 'LedgerEntry.id ' . $direction;
-    }
-
-    return $order;
-  }
-
-  function jqGridRecordsPostProcess(&$params, &$model, &$records) {
-    parent::jqGridRecordsPostProcess($params, $model, $records);
-
-    $subtotal = 0;
-    foreach ($records AS &$record) {
-      $amount = (isset($record['LedgerEntry']['balance'])
-		 ? $record['LedgerEntry']['balance']
-		 : $record['LedgerEntry']['amount']);
-      $record['LedgerEntry']['subtotal'] = ($subtotal += $amount);
-
-      continue;
-      // Experiment to minimize columns by putting the monetary source
-      // as the Account, when available
-      if ($record['MonetarySource']['name'])
-	$record['Account']['name'] = $record['MonetarySource']['name'];
-    }
-  }
-
-  function jqGridDataOutputRecordCell(&$params, &$model, &$record, $field, $data) {
-/*     if ($field === 'CreditAccount.name') { */
-/*       $data .= '-OK'; */
-/*     } */
-
-    parent::jqGridDataOutputRecordCell($params, $model, $record, $field, $data);
+    return parent::jqGridDataOrder($params, $model, $index, $direction);
   }
 
 
@@ -283,7 +167,6 @@ class LedgerEntriesController extends AppController {
     $entry = $this->LedgerEntry->find
       ('first',
        array('contain' => array('MonetarySource.id',
-				'MonetarySource.name',
 				'MonetarySource.MonetaryType.id',
 				'Transaction.id',
 				'Transaction.stamp',
@@ -293,9 +176,6 @@ class LedgerEntriesController extends AppController {
 				'CreditLedger.id',
 				'CreditLedger.sequence',
 				'CreditLedger.account_id',
-				'Customer.id',
-				'Customer.name',
-				'Lease.id',
 				),
 
 	     'fields' => array('LedgerEntry.id',
@@ -304,7 +184,6 @@ class LedgerEntriesController extends AppController {
 
 	     'conditions' => array('LedgerEntry.id' => $id),
 	     ));
-    pr($entry);
 
     // Because 'DebitLedger' and 'CreditLedger' both relate to 'Account',
     // CakePHP will not include them in the LedgerEntry->find (or so it

site/controllers/units_controller.php

@@ -121,7 +121,7 @@ class UnitsController extends AppController {
     // Get the balance on each lease.
     foreach ($unit['Lease'] AS &$lease) {
       $stats = $this->Unit->Lease->stats($lease['id']);
-      $lease['balance'] = $stats['balance'];
+      $lease['balance'] = $stats['Account']['Ledger']['balance'];
     }
 
     $outstanding_balance = 0;
@@ -130,7 +130,7 @@ class UnitsController extends AppController {
       // Figure out the outstanding balance of the current lease.
       $stats = $this->Unit->stats($id);
       $outstanding_balance =
-	$stats['CurrentLease']['balance'];
+	$stats['CurrentLease']['Account']['Ledger']['balance'];
 
       // Figure out the total security deposit for the current lease.
       $deposits = $this->Unit->Lease->findSecurityDeposits($unit['CurrentLease']['id']);

site/models/account.php

@@ -82,26 +82,37 @@ class Account extends AppModel {
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: accountNameToID
-   *  - Returns the ID of the named account
+   * function: securityDepositAccountID
+   *  - Returns the ID of the Security Deposit Account
    */
-  function accountNameToID($name) {
+  function securityDepositAccountID() {
     $this->cacheQueries = true;
     $account = $this->find('first', array
 			   ('recursive' => -1,
-			    'conditions' => compact('name'),
+			    'conditions' => array
+			    (array('name' => 'Security Deposit')),
 			    ));
     $this->cacheQueries = false;
     return $account['Account']['id'];
   }
 
-  function securityDepositAccountID()   { return $this->accountNameToID('Security Deposit'); }
-  function rentAccountID()              { return $this->accountNameToID('Rent'); }
-  function accountReceivableAccountID() { return $this->accountNameToID('A/R'); }
-  function invoiceAccountID()           { return $this->accountReceivableAccountID(); }
-  function receiptAccountID()           { return $this->accountReceivableAccountID(); }
-  //function invoiceAccountID()           { return $this->accountNameToID('Invoice'); }
-  //function receiptAccountID()           { return $this->accountNameToID('Receipt'); }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function:rentAccountID
+   *  - Returns the ID of the Rent Account
+   */
+  function rentAccountID() {
+    $this->cacheQueries = true;
+    $account = $this->find('first', array
+			   ('recursive' => -1,
+			    'conditions' => array
+			    (array('name' => 'Rent')),
+			    ));
+    $this->cacheQueries = false;
+    return $account['Account']['id'];
+  }
 
 
   /**************************************************************************
@@ -111,19 +122,22 @@ class Account extends AppModel {
    *  - Returns an array of ledger ids from the given account
    */
   function ledgers($id, $all = false) {
+    $cachekey = $all ? 'all' : 'current';
+    if (isset($this->cache[$id]['ledgers'][$cachekey])) {
+      return $this->cache[$id]['ledgers'][$cachekey];
+    }
+
     if ($all) {
       $contain = array('Ledger' => array('fields' => array('Ledger.id')));
     } else {
       $contain = array('CurrentLedger' => array('fields' => array('CurrentLedger.id')));
     }
 
-    $this->cacheQueries = true;
     $account = $this->find('first', array
 			   ('contain' => $contain,
 			    'fields' => array(),
 			    'conditions' => array(array('Account.id' => $id)),
 			    ));
-    $this->cacheQueries = false;
 
     if ($all) {
       $ledger_ids = array();
@@ -134,11 +148,14 @@ class Account extends AppModel {
       $ledger_ids = array($account['CurrentLedger']['id']);
     }
 
+    // Save the ledgers in our cache for future reference
+    $this->cache[$id]['ledgers'][$cachekey] = $ledger_ids;
+
 /*     pr(array('function' => 'Account::ledgers', */
 /* 	     'args' => compact('id', 'all'), */
-/* 	     'return' => $ledger_ids)); */
+/* 	     'return' => $this->cache[$id]['ledgers'][$cachekey])); */
 
-    return $ledger_ids;
+    return $this->cache[$id]['ledgers'][$cachekey];
   }
 
 
@@ -217,11 +234,7 @@ class Account extends AppModel {
    *    (such as charges not paid).
    */
 
-  function findUnreconciledLedgerEntries($id = null, $fundamental_type = null, $cond = null) {
-    if (!isset($cond))
-      $cond = array();
-    $cond[] = array('Account.id' => $id);
-
+  function findUnreconciledLedgerEntries($id = null, $fundamental_type = null) {
     foreach (($fundamental_type
 	      ? array($fundamental_type)
 	      : array('debit', 'credit')) AS $fund) {
@@ -247,7 +260,7 @@ class Account extends AppModel {
 	  'group' => ("LedgerEntry.id" .
 		      " HAVING LedgerEntry.amount" .
 		      " <> COALESCE(SUM(Reconciliation.amount),0)"),
-	  'conditions' => $cond,
+	  'conditions' => array('Account.id' => $id),
 	  'fields' => array(),
 	  ));
       $balance = 0;
@@ -277,7 +290,7 @@ class Account extends AppModel {
    *    whatever algorithm is simplest.
    */
 
-  function reconcileNewLedgerEntry($id, $fundamental_type, $amount, $cond = null) {
+  function reconcileNewLedgerEntry($id, $fundamental_type, $amount) {
     $ofund = $this->fundamentalOpposite($fundamental_type);
     $unreconciled = array($ofund => array('entry'=>array(), 'balance'=>0));
     $applied = 0;
@@ -285,7 +298,7 @@ class Account extends AppModel {
     // if there is no money in the entry, it can reconcile nothing
     // don't bother wasting time sifting ledger entries.
     if ($amount > 0) {
-      $unreconciled = $this->findUnreconciledLedgerEntries($id, $ofund, $cond);
+      $unreconciled = $this->findUnreconciledLedgerEntries($id, $ofund);
 
       foreach ($unreconciled[$ofund]['entry'] AS $i => &$entry) {
 	// Determine if amount is sufficient to cover the entry

site/models/customer.php

@@ -8,6 +8,7 @@ class Customer extends AppModel {
 	);
 
 	var $belongsTo = array(
+		'Account',
 		'PrimaryContact' => array(
 			'className' => 'Contact',
 		),
@@ -19,19 +20,11 @@ class Customer extends AppModel {
 			'conditions' => 'CurrentLease.close_date IS NULL',
 		),
 		'Lease',
-		'LedgerEntry',
-
-		// Cheat to get Account set as part of this class
-		'Account',
+		'Transaction',
 	);
 
 	var $hasAndBelongsToMany = array(
 		'Contact',
-		'Transaction' => array(
-			'joinTable' => 'ledger_entries',
-			'foreignKey' => 'customer_id',
-			'associationForeignKey' => 'transaction_id',
-		),
 	);
 
 
@@ -87,9 +80,16 @@ class Customer extends AppModel {
 /* 	     )); */
 
     $entries = $this->Account->findLedgerEntriesRelatedToAccount
-      ($this->Account->invoiceAccountID(),
+      ($this->accountId($id),
        $this->Account->securityDepositAccountID(),
-       true, array('LedgerEntry.customer_id' => $id), $link);
+       true, null, $link);
+
+    foreach ($this->leaseIds($id) AS $lease_id) {
+      $ledger_entries = $this->Lease->findSecurityDeposits($lease_id, $link);
+      $this->statsMerge($entries['summary'], $ledger_entries['summary']);
+      $entries['Entries'] = array_merge($entries['Entries'],
+					$ledger_entries['Entries']);
+    }
 
 /*     pr(array('function' => 'Customer::findSecurityDeposits', */
 /* 	     'args' => compact('id', 'link'), */
@@ -110,10 +110,22 @@ class Customer extends AppModel {
    */
 
   function findUnreconciledLedgerEntries($id = null, $fundamental_type = null) {
+
     $unreconciled = $this->Account->findUnreconciledLedgerEntries
-      ($this->Account->accountReceivableAccountID(),
-       $fundamental_type,
-       array('LedgerEntry.customer_id' => $id));
+      ($this->accountId($id), $fundamental_type);
+
+    foreach ($this->leaseIds($id) AS $lease_id) {
+      $unrec = $this->Lease->findUnreconciledLedgerEntries($lease_id,
+							   $fundamental_type);
+
+      foreach (array_keys($unreconciled) AS $type) {
+	$left  = &$unreconciled[$type];
+	$right = &$unrec[$type];
+
+	$left['entry']    = array_merge($left['entry'], $right['entry']);
+	$left['balance'] += $right['balance'];
+      }
+    }
 
     return $unreconciled;
   }
@@ -134,11 +146,25 @@ class Customer extends AppModel {
    */
 
   function reconcileNewLedgerEntry($id, $fundamental_type, $amount) {
+
     $reconciled = $this->Account->reconcileNewLedgerEntry
-      ($this->Account->accountReceivableAccountID(),
-       $fundamental_type,
-       $amount,
-       array('LedgerEntry.customer_id' => $id));
+      ($this->accountId($id), $fundamental_type, $amount);
+
+    foreach ($this->leaseIds($id) AS $lease_id) {
+      foreach (array_keys($reconciled) AS $type) {
+	$rec = $this->Lease->reconcileNewLedgerEntry($lease_id,
+						     $fundamental_type,
+						     $reconciled[$type]['unapplied']);
+
+	$left  = &$reconciled[$type];
+	$right = &$rec[$type];
+
+	$left['entry']      = array_merge($left['entry'], $right['entry']);
+	$left['balance']   += $right['balance'];
+	$left['applied']   += $right['applied'];
+	$left['unapplied']  = $right['unapplied'];
+      }
+    }
 
     return $reconciled;
   }
@@ -163,6 +189,7 @@ class Customer extends AppModel {
 	       'ContactEmail',
 	       'ContactAddress',
 	       ),
+	 'Account',
 	 'Lease' =>
 	 array('Unit' =>
 	       array('order'  => array('sort_order'),
@@ -174,12 +201,22 @@ class Customer extends AppModel {
 	'conditions' => array('Customer.id' => $id),
 	));
 
-    // Figure out the outstanding balance for this customer
+    // Add the lease balance to each lease.
+    foreach ($customer['Lease'] AS &$lease) {
+      $stats = $this->Lease->stats($lease['id']);
+      $lease['balance'] = $stats['Account']['Ledger']['balance'];
+    }
+
+    // Figure out the outstanding balance of the current lease.
     $customer['stats'] = $this->stats($id);
 
     // Figure out the total security deposit for the current lease.
     $customer['deposits'] = $this->findSecurityDeposits($id);
 
+    // Add statistics into the customer account.
+    $customer['Account'] = array_merge($customer['Account'],
+				       $customer['stats']['Account']['Ledger']);
+
     return $customer;
   }
 
@@ -195,11 +232,29 @@ class Customer extends AppModel {
     if (!$id)
       return null;
 
-    $stats = $this->Account->stats($this->Account->accountReceivableAccountID(), true,
-				   array('LedgerEntry.customer_id' => $id));
+    // Get the basic information necessary
+    $customer = $this->find('first',
+			    array('contain' =>
+				  array('Account' => array
+					('fields' => array('Account.id')),
+
+					'Lease'   => array
+					('fields' => array('Lease.id'))
+					),
+				  'conditions' => array
+				  (array('Customer.id' => $id))));
+
+    // Get stats from the customer account, and each lease
+    $stats['Account'] = $this->Account->stats($customer['Account']['id']);
+    foreach ($customer['Lease'] AS $lease) {
+      $this->statsMerge($stats['Lease'], $this->Lease->stats($lease['id']));
+    }
+
+    // Merge the stats from both the customer specific account, as
+    // well as the leases.  This will provide current customer standing.
+    $this->statsMerge($stats, $stats['Account']['Ledger']);
+    $this->statsMerge($stats, $stats['Lease']['Account']['Ledger']);
 
-    // Pull to the top level and return
-    $stats = $stats['Ledger'];
     return $stats;
   }
 

site/models/lease.php

@@ -25,18 +25,11 @@ class Lease extends AppModel {
 	var $belongsTo = array(
 		'LeaseType',
 		'Unit',
+		'Account',
 		'Customer',
 		'LateSchedule',
 	);
 
-	var $hasMany = array(
-		'LedgerEntry',
-
-		// Cheat to get Account set as part of this class
-		'Account',
-	);
-
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -44,7 +37,15 @@ class Lease extends AppModel {
    *  - Returns the accountId of the given lease
    */
   function accountId($id) {
-    return $this->Account->invoiceAccountID();
+    $this->cacheQueries = true;
+    $lease = $this->find('first', array
+			  ('recursive' => -1,
+			   'fields' => array('account_id'),
+			   'conditions' => array(array('id' => $id)),
+			   ));
+    $this->cacheQueries = false;
+
+    return $lease['Lease']['account_id'];
   }
 
 
@@ -60,10 +61,6 @@ class Lease extends AppModel {
 /* 	     'args' => compact('id', 'all', 'cond', 'link'), */
 /* 	     )); */
 
-    if (!isset($cond))
-      $cond = array();
-    $cond[] = array('LedgerEntry.lease_id' => $id);
-
     $entries = $this->Account->findLedgerEntries($this->accountId($id),
 						 $all, $cond, $link);
 
@@ -90,7 +87,7 @@ class Lease extends AppModel {
     $entries = $this->Account->findLedgerEntriesRelatedToAccount
       ($this->accountId($id),
        $this->Account->securityDepositAccountID(),
-       true, array('LedgerEntry.lease_id' => $id), $link);
+       true, null, $link);
 
 /*     pr(array('function' => 'Lease::findSecurityDeposits', */
 /* 	     'args' => compact('id', 'link'), */
@@ -111,7 +108,7 @@ class Lease extends AppModel {
 
   function findUnreconciledLedgerEntries($id = null, $fundamental_type = null) {
     return $this->Account->findUnreconciledLedgerEntries
-      ($this->accountId($id), $fundamental_type, array('LedgerEntry.lease_id' => $id));
+      ($this->accountId($id), $fundamental_type);
   }
 
 
@@ -131,7 +128,7 @@ class Lease extends AppModel {
 
   function reconcileNewLedgerEntry($id, $fundamental_type, $amount) {
     return $this->Account->reconcileNewLedgerEntry
-      ($this->accountId($id), $fundamental_type, $amount, array('LedgerEntry.lease_id' => $id));
+      ($this->accountId($id), $fundamental_type, $amount);
   }
 
 
@@ -146,11 +143,18 @@ class Lease extends AppModel {
     if (!$id)
       return null;
 
-    $stats = $this->Account->stats($this->Account->accountReceivableAccountID(), true,
-				   array('LedgerEntry.lease_id' => $id));
+    // Find the associated account.
+    $lease = $this->find('first',
+			 array('recursive' => -1,
+			       'conditions' => array(array('Lease.id' => $id))));
+
+    // Pull the stats from the account.
+    $stats['Account'] = $this->Account->stats($lease['Lease']['account_id']);
+
+    // Place a summary of the stats (one lease account in this case)
+    // at the top level for easy summarized access.
+    $this->statsMerge($stats, $stats['Account']['Ledger']);
 
-    // Pull to the top level and return
-    $stats = $stats['Ledger'];
     return $stats;
   }
 

site/models/ledger.php

@@ -115,9 +115,6 @@ class Ledger extends AppModel {
    *  - Returns summary data from the requested ledger.
    */
   function stats($id, $cond = null) {
-    if (!isset($cond))
-      $cond = array();
-    $cond[] = array('Ledger.id' => $id);
 
     $stats = $this->find
       ('first', array
@@ -141,7 +138,8 @@ class Ledger extends AppModel {
                       ) * IF(LedgerEntry.amount, LedgerEntry.amount, 0)
                    ) AS balance",
 	      "COUNT(LedgerEntry.id) AS entries"),
-	'conditions' => $cond,
+	'conditions' => array(isset($cond) ? $cond : array(),
+			      array('Ledger.id' => $id)),
 	'group' => 'Ledger.id',
 	));
 

site/models/ledger_entry.php

@@ -11,8 +11,6 @@ class LedgerEntry extends AppModel {
 	var $belongsTo = array(
 		'MonetarySource',
 		'Transaction',
-		'Customer',
-		'Lease',
 
 		'DebitLedger' => array(
 			'className' => 'Ledger',
@@ -86,7 +84,7 @@ class LedgerEntry extends AppModel {
     return $fields;
   }
 
-  function ledgerContextFields2($ledger_id = null, $account_id = null, $account_type = null) {
+  function ledgerContextFields2($ledger_id = null, $account_type = null) {
     $fields = array('id', 'name', 'comment', 'amount');
 
     if (isset($ledger_id)) {
@@ -95,29 +93,20 @@ class LedgerEntry extends AppModel {
       $fields[] = ("IF(LedgerEntry.credit_ledger_id = $ledger_id," .
 		   "   SUM(LedgerEntry.amount), NULL) AS credit");
 
-      if (isset($account_id) || isset($account_type)) {
-	$Account = new Account();
-	$account_ftype = $Account->fundamentalType($account_id ? $account_id : $account_type);
-	$fields[] = ("(IF(LedgerEntry.{$account_ftype}_ledger_id = $ledger_id," .
+      if (isset($account_type)) {
+	if (in_array($account_type, array('ASSET', 'EXPENSE')))
+	  $ledger_type = 'debit';
+	else
+	  $ledger_type = 'credit';
+
+	$fields[] = ("(IF(LedgerEntry.{$ledger_type}_ledger_id = $ledger_id," .
 		     "    1, -1) * SUM(LedgerEntry.amount)) AS balance");
       }
     }
-    elseif (isset($account_id)) {
-      $fields[] = ("IF(DebitLedger.account_id = $account_id," .
-		   "   SUM(LedgerEntry.amount), NULL) AS debit");
-      $fields[] = ("IF(CreditLedger.account_id = $account_id," .
-		   "   SUM(LedgerEntry.amount), NULL) AS credit");
-
-      $Account = new Account();
-      $account_ftype = ucfirst($Account->fundamentalType($account_id));
-      $fields[] = ("(IF({$account_ftype}Ledger.account_id = $account_id," .
-		   "    1, -1) * SUM(LedgerEntry.amount)) AS balance");
-    }
 
     return $fields;
   }
 
-
   function ledgerContextConditions($ledger_id, $account_type) {
     if (isset($ledger_id)) {
       return array

site/views/customers/view.ctp

@@ -63,14 +63,12 @@ echo $this->element('leases',
 
 
 /**********************************************************************
- * Customer Account History
+ * Account
  */
 
-echo $this->element('ledger_entries',
+echo $this->element('accounts',
 		    array('caption' => 'Account',
-			  'customer_id' => $customer['Customer']['id'],
-			  'ar_account' => true,
-			  ));
+			  'accounts' => array($customer['Account'])));
 
 
 /* End "detail supporting" div */