Moving back to the Invoice/Receipt mechanism. Seems to work fairly well, even if it's non-standard.

git-svn-id: file:///svn-source/pmgr/branches/charge_credit_20090629/site@189 97e9348a-65ac-dc4b-aefc-98561f571b83

build.cmd

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

controllers/ledger_entries_controller.php

@@ -33,7 +33,7 @@ class LedgerEntriesController extends AppController {
     }
   }
 
-  function jqGridDataCountTables(&$params, &$model) {
+  function jqGridDataTables(&$params, &$model) {
     $link =
       array(// Models
 	     'Transaction' =>
@@ -95,13 +95,8 @@ class LedgerEntriesController extends AppController {
 	      );
     }
 
-    if (isset($params['custom']['account_id']) || isset($params['custom']['lease_id'])) {
-      if (isset($params['custom']['account_id']))
-	$account_id = $params['custom']['account_id'];
-      else
-	$account_id =
-	  $this->LedgerEntry->DebitLedger->Account->accountReceivableAccountID();
-
+    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," .
@@ -113,57 +108,18 @@ class LedgerEntriesController extends AppController {
 	      );
     }
 
-    if (isset($params['custom']['lease_id'])) {
-      $account_id = $params['custom']['lease_id'];
-      $link['Transaction']['ReconciledLedgerEntry'] =
-	array('fields' => array('id', 'Reconciliation.amount', 'Reconciliation.type'),
-	      );
-    }
-
     if (isset($params['custom']['reconcile_id'])) {
       $ftype = $params['custom']['account_ftype'];
       $ftype = $this->LedgerEntry->DebitLedger->Account->fundamentalOpposite($ftype);
-      $link['ReconcilingTransaction'] =
-	array('fields' => array('Reconciliation.amount'),
-	      'conditions' => array('Reconciliation.type' => $ftype),
-	      );
+      $ftype = ucfirst($ftype);
+      $link[$ftype.'ReconciliationLedgerEntry'] =
+	array('fields' => array('Reconciliation.amount'));
     }
 
     return array('link' => $link);
   }
 
-  function jqGridDataTables(&$params, &$model) {
-    return $this->jqGridDataCountTables($params, $model);
-  }
-
   function jqGridDataFields(&$params, &$model) {
-    if (isset($params['custom']['lease_id'])) {
-      $account_id =
-	$this->LedgerEntry->DebitLedger->Account->accountReceivableAccountID();
-
-      $fields = array('id', 'name', 'comment', 'amount');
-      $fields[] = ("IF(DebitLedger.account_id = $account_id," .
-		   "   SUM(IF(ReconciledLedgerEntry.amount IS NULL," .
-		   "          LedgerEntry.amount," .
-		   "          ReconciledLedgerEntry.amount))," .
-		   "   NULL) AS debit");
-      $fields[] = ("IF(CreditLedger.account_id = $account_id," .
-		   "   SUM(IF(ReconciledLedgerEntry.amount IS NULL," .
-		   "          LedgerEntry.amount," .
-		   "          ReconciledLedgerEntry.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(IF(ReconciledLedgerEntry.amount IS NULL," .
-		   "          LedgerEntry.amount," .
-		   "          ReconciledLedgerEntry.amount)))" .
-		   " AS balance");
-
-      return $fields;
-    }
-
     $ledger_id = (isset($params['custom']['ledger_id'])
 		  ? $params['custom']['ledger_id']
 		  : null);
@@ -187,39 +143,60 @@ class LedgerEntriesController extends AppController {
 
     $conditions = parent::jqGridDataConditions($params, $model);
 
-    if ($params['action'] === 'ledger' && isset($ledger_id)) {
+    if ($params['action'] === 'ledger') {
       $conditions[] = $model->ledgerContextConditions($ledger_id, $account_type);
     }
-
     if (isset($params['custom']['reconcile_id'])) {
       $ftype = $params['custom']['account_ftype'];
       //$ftype = $this->LedgerEntry->DebitLedger->Account->fundamentalOpposite($ftype);
-      //$link['ReconcilingTransaction']['conditions'][] = array('Reconciliation.type' => $ftype);
-      $conditions[] = array('Reconciliation.ledger_entry_id' => $params['custom']['reconcile_id']);
-	
+      $conditions[] = array('Reconciliation.'.$ftype.'_ledger_entry_id' => $params['custom']['reconcile_id']);
     }
 
     if (isset($params['custom']['account_id'])) {
       $conditions[] =
-	array('OR' =>
+	array('OR' => 
 	      array(array('CreditAccount.id' => $params['custom']['account_id']),
 		    array('DebitAccount.id' => $params['custom']['account_id'])));
-/*       $conditions[] = */
-/* 	array('Account.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('OR' => array
-	      (array('Lease.id' => $params['custom']['lease_id']),
-	       array('ReconciledLedgerEntry.lease_id' => $params['custom']['lease_id']),
-	       ));
+	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'])) {
@@ -357,8 +334,8 @@ class LedgerEntriesController extends AppController {
       $stats['credit_amount_remaining'] = $entry['LedgerEntry']['amount'] - $stats['credit_amount_reconciled'];
     //pr($stats);
 
-    $reconciled = $this->LedgerEntry->findReconcilingTransactions($id);
-    //pr(compact('reconciled'));
+    $reconciled = $this->LedgerEntry->findReconciledLedgerEntries($id);
+    //pr($reconciled);
 
     // Prepare to render.
     $title = "Ledger Entry #{$entry['LedgerEntry']['id']}";

controllers/transactions_controller.php

@@ -41,43 +41,6 @@ class TransactionsController extends AppController {
    *    to jqGrid.
    */
 
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
-  }
-
-  function jqGridDataTables(&$params, &$model) {
-    $link = array();
-
-    if (isset($params['custom']['reconcile_ledger_entry_id'])) {
-      $ftype = $params['custom']['reconcile_type'];
-      //$ftype = $this->Transaction->LedgerEntry->DebitLedger->Account->fundamentalOpposite($ftype);
-      $link['ReconciledLedgerEntry'] =
-	array('fields' => array('Reconciliation.amount'),
-	      'conditions' => array('Reconciliation.type' => $ftype)
-	      );
-    }
-
-    return array('link' => $link);
-  }
-
-  function jqGridDataFields(&$params, &$model) {
-    return parent::jqGridDataFields($params, $model);
-  }
-
-  function jqGridDataConditions(&$params, &$model) {
-    $conditions = parent::jqGridDataConditions($params, $model);
-
-    if (isset($params['custom']['reconcile_ledger_entry_id'])) {
-/*       $ftype = $params['custom']['reconcile_type']; */
-/*       $ftype = $this->LedgerEntry->DebitLedger->Account->fundamentalOpposite($ftype); */
-/*       $conditions[] = array('Reconciliation.type' => $ftype); */
-      $conditions[] = array('Reconciliation.ledger_entry_id'
-			    => $params['custom']['reconcile_ledger_entry_id']);
-    }
-
-    return $conditions;
-  }
-
   function jqGridRecordLinks(&$params, &$model, &$records, $links) {
     $links['Transaction'] = array('id');
     return parent::jqGridRecordLinks($params, $model, $records, $links);

models/account.php

@@ -226,20 +226,20 @@ class Account extends AppModel {
 	      ? array($fundamental_type)
 	      : array('debit', 'credit')) AS $fund) {
       $ucfund = ucfirst($fund);
-      $unreconciled[$fund]['LedgerEntry'] = $this->find
+      $unreconciled[$fund]['entry'] = $this->find
 	('all', array
 	 ('link' => array
 	  ('Ledger' => array
 	   ('fields' => array(),
-	    'LedgerEntry' => array
+	    "LedgerEntry" => array
 	    ('class' => "{$ucfund}LedgerEntry",
 	     'fields' => array('id', 'amount'),
-	     'ReconcilingTransaction' => array
-	     ('fields' => array
+	     "ReconciliationLedgerEntry" => array
+	     ('class' => "{$ucfund}ReconciliationLedgerEntry",
+	      'fields' => array
 	      ("COALESCE(SUM(Reconciliation.amount),0) AS 'reconciled'",
 	       "LedgerEntry.amount - COALESCE(SUM(Reconciliation.amount),0) AS 'balance'",
 	       ),
-	      'conditions' => array('Reconciliation.type' => $fund),
 	      ),
 	     ),
 	    ),
@@ -251,7 +251,7 @@ class Account extends AppModel {
 	  'fields' => array(),
 	  ));
       $balance = 0;
-      foreach ($unreconciled[$fund]['LedgerEntry'] AS &$entry) {
+      foreach ($unreconciled[$fund]['entry'] AS &$entry) {
 	$entry = array_merge(array_diff_key($entry["LedgerEntry"], array(0=>true)),
 			     $entry[0]);
 	$balance += $entry['balance'];
@@ -279,7 +279,7 @@ class Account extends AppModel {
 
   function reconcileNewLedgerEntry($id, $fundamental_type, $amount, $cond = null) {
     $ofund = $this->fundamentalOpposite($fundamental_type);
-    $unreconciled = array($ofund => array('LedgerEntry'=>array(), 'balance'=>0));
+    $unreconciled = array($ofund => array('entry'=>array(), 'balance'=>0));
     $applied = 0;
 
     // if there is no money in the entry, it can reconcile nothing
@@ -287,14 +287,14 @@ class Account extends AppModel {
     if ($amount > 0) {
       $unreconciled = $this->findUnreconciledLedgerEntries($id, $ofund, $cond);
 
-      foreach ($unreconciled[$ofund]['LedgerEntry'] AS $i => &$entry) {
+      foreach ($unreconciled[$ofund]['entry'] AS $i => &$entry) {
 	// Determine if amount is sufficient to cover the entry
 	if ($amount > $entry['balance'])
 	  $apply = $entry['balance'];
 	elseif ($amount > 0)
 	  $apply = $amount;
 	else {
-	  unset($unreconciled[$ofund]['LedgerEntry'][$i]);
+	  unset($unreconciled[$ofund]['entry'][$i]);
 	  continue;
 	}
 

models/behaviors/linkable.php

@@ -85,28 +85,6 @@ class LinkableBehavior extends ModelBehavior {
 
 	protected $_defaults = array('type' => 'LEFT');
 	
-	function pr($lev, $mixed) {
-		if ($lev >= 5)
-			return;
-
-		pr($mixed);
-		return;
-
-		$trace = debug_backtrace(false);
-		//array_shift($trace);
-		$calls = array();
-		foreach ($trace AS $call) {
-			$call = array_intersect_key($call,
-						    array('file'=>1,
-							  'line'=>1,
-							  //'class'=>1,
-							  'function'=>1,
-							  ));
-			$calls[] = implode("; ", $call);
-		}
-		pr(array('debug' => $mixed, 'stack' => $calls));
-	}
-
 	/*
 	 * This is a function for made recursive str_replaces in an array
 	 * NOTE: The palacement of this function is terrible, but I don't
@@ -130,10 +108,7 @@ class LinkableBehavior extends ModelBehavior {
 	}
 
 	public function beforeFind(&$Model, $query) {
-		$this->pr(10,
-			  array('function' => 'Linkable::beforeFind',
-				'args' => array('Model->alias' => '$Model->alias') + compact('query'),
-				));
+/* 	  pr("Linkable::beforeFind() begin"); pr($query); */
 		if (isset($query[$this->_key])) {
 			$optionsDefaults = $this->_defaults + array('reference' =>
 			                                            array('class' => $Model->alias,
@@ -157,10 +132,7 @@ class LinkableBehavior extends ModelBehavior {
 					unset($iterator['defaults']);
 				}
 				$iterations = Set::normalize($iterator);
-				$this->pr(25,
-					  array('checkpoint' => 'Iterations',
-						compact('iterations'),
-						));
+/* 				pr(array('checkpoint' => 'Iterations', compact('iterations'))); */
 				foreach ($iterations as $alias => $options) {
 					if (is_null($options)) {
 						$options = array();
@@ -173,15 +145,7 @@ class LinkableBehavior extends ModelBehavior {
 					if (empty($options['class']))
 						$options['class'] = $alias;
 
-					if (!isset($options['conditions']))
-						$options['conditions'] = array();
-					elseif (!is_array($options['conditions']))
-						$options['conditions'] = array($options['conditions']);
-
-					$this->pr(20,
-						  array('checkpoint' => 'Begin Model Work',
-							compact('alias', 'options'),
-							));
+/* 					pr(array('checkpoint' => 'Begin Model Work', compact('alias', 'options'))); */
 
 					$modelClass     = $options['class'];
 					$modelAlias     = $options['alias'];
@@ -190,13 +154,11 @@ class LinkableBehavior extends ModelBehavior {
 
 					$_Model =& ClassRegistry::init($modelClass);         // the incoming model to be linked in query
 					$Reference =& ClassRegistry::init($referenceClass);  // the already in query model that links to $_Model
-					$this->pr(12,
-						  array('checkpoint' => 'Aliases Established',
-							'Model' => ($modelAlias .' : '. $modelClass .
-								    ' ('. $_Model->alias .' : '. $_Model->name .')'),
-							'Reference' => ($referenceAlias .' : '. $referenceClass .
-									' ('. $Reference->alias .' : '. $Reference->name .')'),
-							));
+/* 					pr(array('checkpoint' => 'Aliases Established', */
+/* 						 'Model' => ($modelAlias .' : '. $modelClass . */
+/* 							     ' ('. $_Model->alias .' : '. $_Model->name .')'), */
+/* 						 'Reference' => ($referenceAlias .' : '. $referenceClass . */
+/* 								 ' ('. $Reference->alias .' : '. $Reference->name .')'))); */
 
 					$db =& $_Model->getDataSource();
 
@@ -207,20 +169,20 @@ class LinkableBehavior extends ModelBehavior {
 					// a relationship if one doesn't otherwise already exists.
 				        if (($associations = $Reference->getAssociated()) &&
 					    isset($associations[$_Model->alias])) {
-						$this->pr(12, array('checkpoint' => "Reference defines association to _Model"));
+/* 						pr("Reference defines association to _Model"); */
 						$associatedThroughReference = 1;
 						$type = $associations[$_Model->alias];
 						$association = $Reference->{$type}[$_Model->alias];
 					}
 					elseif (($associations = $_Model->getAssociated()) &&
 					    isset($associations[$Reference->alias])) {
-						$this->pr(12, array('checkpoint' => "_Model defines association to Reference"));
+/* 						pr("_Model defines association to Reference"); */
 						$type = $associations[$Reference->alias];
 						$association = $_Model->{$type}[$Reference->alias];
 					}
 					else {
 						// No relationship... make our best effort to create one.
-						$this->pr(12, array('checkpoint' => "No assocation between _Model and Reference"));
+/* 						pr("No assocation between _Model and Reference"); */
 						$type = 'belongsTo';
 						$_Model->bind($Reference->alias);
 						// Grab the association now, since we'll unbind in a moment.
@@ -250,119 +212,93 @@ class LinkableBehavior extends ModelBehavior {
 								       $associationAlias,
 								       $association['conditions']);
 
-					$this->pr(15,
-						  array('checkpoint' => 'Models Established - Check Associations',
-							'primaryModel' => $primaryAlias .' : '. $primaryModel->name,
-							'foreignModel' => $foreignAlias .' : '. $foreignModel->name,
-							compact('type', 'association'),
-							));
+/* 					pr(array('checkpoint' => 'Models Established - Check Associations', */
+/* 						 'primaryModel' => $primaryAlias .' : '. $primaryModel->name, */
+/* 						 'foreignModel' => $foreignAlias .' : '. $foreignModel->name, */
+/* 						 compact('type', 'association'))); */
 
-					if ($type === 'hasAndBelongsToMany') {
-						if (isset($association['with']))
-							$linkClass = $association['with'];
-						else
-							$linkClass = Inflector::classify($association['joinTable']);
+					if (empty($options['conditions'])) {
+						if ($type === 'hasAndBelongsToMany') {
+							if (isset($association['with']))
+								$linkClass = $association['with'];
+							else
+								$linkClass = Inflector::classify($association['joinTable']);
 
-						$Link =& $_Model->{$linkClass};
+							$Link =& $_Model->{$linkClass};
 
-						if (isset($options['linkalias']))
-							$linkAlias = $options['linkalias'];
-						else
-							$linkAlias = $Link->alias;
+							if (isset($options['linkalias']))
+								$linkAlias = $options['linkalias'];
+							else
+								$linkAlias = $Link->alias;
 
-						$this->pr(17,
-							  array('checkpoint' => 'Linking HABTM',
-								compact('linkClass', 'linkAlias'),
-								));
+							// Get the foreign key fields (for the link table) directly from
+							// the defined model associations, if they exists.  This is the
+							// users direct specification, and therefore definitive if present.
+							$modelLink = $Link->escapeField($association['foreignKey'], $linkAlias);
+							$referenceLink = $Link->escapeField($association['associationForeignKey'], $linkAlias);
 
-						// Get the foreign key fields (for the link table) directly from
-						// the defined model associations, if they exists.  This is the
-						// users direct specification, and therefore definitive if present.
-						$modelLink = $Link->escapeField($association['foreignKey'], $linkAlias);
-						$referenceLink = $Link->escapeField($association['associationForeignKey'], $linkAlias);
+							// If we haven't figured out the foreign keys, see if there is a
+							// model for the link table, and if it has the appropriate
+							// associations with the two tables we're trying to join.
+							if (empty($modelLink) && isset($Link->belongsTo[$_Model->alias]))
+								$modelLink = $Link->escapeField($Link->belongsTo[$_Model->alias]['foreignKey'], $linkAlias);
+							if (empty($referenceLink) && isset($Link->belongsTo[$Reference->alias]))
+								$referenceLink = $Link->escapeField($Link->belongsTo[$Reference->alias]['foreignKey'], $linkAlias);
 
-						// If we haven't figured out the foreign keys, see if there is a
-						// model for the link table, and if it has the appropriate
-						// associations with the two tables we're trying to join.
-						if (empty($modelLink) && isset($Link->belongsTo[$_Model->alias]))
-							$modelLink = $Link->escapeField($Link->belongsTo[$_Model->alias]['foreignKey'], $linkAlias);
-						if (empty($referenceLink) && isset($Link->belongsTo[$Reference->alias]))
-							$referenceLink = $Link->escapeField($Link->belongsTo[$Reference->alias]['foreignKey'], $linkAlias);
+							// We're running quite thin here.  None of the models spell
+							// out the appropriate linkages.  We'll have to SWAG it.
+							if (empty($modelLink))
+								$modelLink = $Link->escapeField(Inflector::underscore($_Model->alias) . '_id', $linkAlias);
+							if (empty($referenceLink))
+								$referenceLink = $Link->escapeField(Inflector::underscore($Reference->alias) . '_id', $linkAlias);
 
-						// We're running quite thin here.  None of the models spell
-						// out the appropriate linkages.  We'll have to SWAG it.
-						if (empty($modelLink))
-							$modelLink = $Link->escapeField(Inflector::underscore($_Model->alias) . '_id', $linkAlias);
-						if (empty($referenceLink))
-							$referenceLink = $Link->escapeField(Inflector::underscore($Reference->alias) . '_id', $linkAlias);
-
-						// Get the primary key from the tables we're joining.
-						$referenceKey = $Reference->escapeField(null, $referenceAlias);
-						$modelKey = $_Model->escapeField(null, $modelAlias);
+							// Get the primary key from the tables we're joining.
+							$referenceKey = $Reference->escapeField(null, $referenceAlias);
+							$modelKey = $_Model->escapeField(null, $modelAlias);
 								
-						// Join the linkage table to our model.  We'll use an inner join,
-						// as the whole purpose of the linkage table is to make this
-						// connection.  As we are embedding this join, the INNER will not
-						// cause any problem with the overall query, should the user not
-						// be concerned with whether or not the join has any results.
-						// They control that with the 'type' parameter which will be at
-						// the top level join.
-						$options['joins'][] = array('type'  => 'INNER',
-									    'alias' => $modelAlias,
-									    'conditions' => "{$modelKey} = {$modelLink}",
-									    'table' => $db->fullTableName($_Model, true));
+							// Join the linkage table to our model.  We'll use an inner join,
+							// as the whole purpose of the linkage table is to make this
+							// connection.  As we are embedding this join, the INNER will not
+							// cause any problem with the overall query, should the user not
+							// be concerned with whether or not the join has any results.
+							// They control that with the 'type' parameter which will be at
+							// the top level join.
+							$options['joins'][] = array('type'  => 'INNER',
+							                            'alias' => $modelAlias,
+							                            'conditions' => "{$modelKey} = {$modelLink}",
+							                            'table' => $db->fullTableName($_Model, true));
+
+							// Now for the top level join.  This will be added into the list
+							// of joins down below, outside of the HABTM specific code.
+							$options['class'] = $linkClass;
+							$options['alias'] = $linkAlias;
+							$options['table'] = $Link->getDataSource()->fullTableName($Link);
+							$options['conditions'][] = "{$referenceLink} = {$referenceKey}";
+						}
+						elseif (isset($association['foreignKey']) && $association['foreignKey']) {
+							$foreignKey = $primaryModel->escapeField($association['foreignKey'], $primaryAlias);
+							$primaryKey = $foreignModel->escapeField($foreignModel->primaryKey, $foreignAlias);
+
+							// Only differentiating to help show the logical flow.
+							// Either way works and this test can be tossed out
+							if (($type === 'hasMany' || $type === 'hasOne') ^ $associatedThroughReference)
+								$options['conditions'][] = "{$primaryKey} = {$foreignKey}";
+							else
+								$options['conditions'][] = "{$foreignKey} = {$primaryKey}";
+						}
+						else {
+							// No Foreign Key... nothing we can do.
+							$options['conditions'] = array();
+						}
+
+						// The user may have specified conditions directly in the model
+						// for this join.  Make sure to adhere to those conditions.
+						if (isset($association['conditions']) && is_array($association['conditions']))
+							$options['conditions'] = array_merge($options['conditions'], $association['conditions']);
+						elseif (!empty($association['conditions']))
+							$options['conditions'][] = $association['conditions'];
 
-						// Now for the top level join.  This will be added into the list
-						// of joins down below, outside of the HABTM specific code.
-						$options['class'] = $linkClass;
-						$options['alias'] = $linkAlias;
-						$options['table'] = $Link->getDataSource()->fullTableName($Link);
-						$options['conditions'][] = "{$referenceLink} = {$referenceKey}";
 					}
-					elseif (isset($association['foreignKey']) && $association['foreignKey']) {
-						$foreignKey = $primaryModel->escapeField($association['foreignKey'], $primaryAlias);
-						$primaryKey = $foreignModel->escapeField($foreignModel->primaryKey, $foreignAlias);
-
-						$this->pr(17,
-							  array('checkpoint' => 'Linking due to foreignKey',
-								compact('foreignKey', 'primaryKey'),
-								));
-
-						// Only differentiating to help show the logical flow.
-						// Either way works and this test can be tossed out
-						if (($type === 'hasMany' || $type === 'hasOne') ^ $associatedThroughReference)
-							$options['conditions'][] = "{$primaryKey} = {$foreignKey}";
-						else
-							$options['conditions'][] = "{$foreignKey} = {$primaryKey}";
-					}
-					else {
-						$this->pr(17,
-							  array('checkpoint' => 'Linking with no logic (expecting user defined)',
-								));
-
-						// No Foreign Key... nothing we can do.
-					}
-
-					$this->pr(19,
-						  array('checkpoint' => 'Conditions',
-							array('options[conditions]' => $options['conditions'],
-							      'association[conditions]' => $association['conditions'],
-							      ),
-							));
-
-					// The user may have specified conditions directly in the model
-					// for this join.  Make sure to adhere to those conditions.
-					if (isset($association['conditions']) && is_array($association['conditions']))
-						$options['conditions'] = array_merge($options['conditions'], $association['conditions']);
-					elseif (!empty($association['conditions']))
-						$options['conditions'][] = $association['conditions'];
-
-					$this->pr(19,
-						  array('checkpoint' => 'Conditions2',
-							array('options[conditions]' => $options['conditions'],
-							      ),
-							));
-
 					if (empty($options['table'])) {
 						$options['table'] = $db->fullTableName($_Model, true);
 					}
@@ -376,31 +312,26 @@ class LinkableBehavior extends ModelBehavior {
 								       (empty($association['fields']) 
 									? array() : $db->fields($_Model, $modelAlias, $association['fields'])));
 									       
+/* 					pr(array('checkpoint' => 'Model Work Complete', compact('options', 'modelClass', 'modelAlias'))); */
+
 					$options[$this->_key] = am($options[$this->_key], array_diff_key($options, $optionsKeys));
 					$options = array_intersect_key($options, $optionsKeys);
 					if (!empty($options[$this->_key])) {
 						$iterators[] = $options[$this->_key] +
 							array('defaults' =>
-							      array_merge($defaults,
+										array_merge($defaults,
 							                  array('reference' =>
 							                        array('class' => $modelClass,
 							                              'alias' => $modelAlias))));
 					}
 					$query['joins'][] = array_intersect_key($options, array('type' => true, 'alias' => true, 'table' => true, 'joins' => true, 'conditions' => true));
-
-					$this->pr(19,
-						  array('checkpoint' => 'Model Join Complete',
-							compact('options', 'modelClass', 'modelAlias', 'query'),
-							));
 				}
 				++$cont;
 				$notDone = isset($iterators[$cont]);
 			} while ($notDone);
 		}
-		$this->pr(20,
-			  array('function' => 'Linkable::beforeFind',
-				'return' => compact('query'),
-				));
+/* 		pr(array('checkpoint' => 'Linkable::beforeFind() end', */
+/* 		         compact('query'))); */
 		return $query;
 	}
 }

models/lease.php

@@ -147,11 +147,7 @@ class Lease extends AppModel {
       return null;
 
     $stats = $this->Account->stats($this->Account->accountReceivableAccountID(), true,
-				   array('OR' => array
-					 (array('LedgerEntry.lease_id' => $id),
-					  array('ReconciledLedgerEntry.lease_id' => $id),
-					  ),
-					 ));
+				   array('LedgerEntry.lease_id' => $id));
 
     // Pull to the top level and return
     $stats = $stats['Ledger'];

models/ledger_entry.php

@@ -25,11 +25,17 @@ class LedgerEntry extends AppModel {
 	);
 
 	var $hasAndBelongsToMany = array(
-		'ReconcilingTransaction' => array(
-			'className' => 'Transaction',
+		'DebitReconciliationLedgerEntry' => array(
+			'className' => 'LedgerEntry',
 			'joinTable' => 'reconciliations',
-			'foreignKey' => 'transaction_id',
-			'associationForeignKey' => 'ledger_entry_id',
+			'foreignKey' => 'credit_ledger_entry_id',
+			'associationForeignKey' => 'debit_ledger_entry_id',
+		),
+		'CreditReconciliationLedgerEntry' => array(
+			'className' => 'LedgerEntry',
+			'joinTable' => 'reconciliations',
+			'foreignKey' => 'debit_ledger_entry_id',
+			'associationForeignKey' => 'credit_ledger_entry_id',
 		),
 	);
 
@@ -161,36 +167,36 @@ class LedgerEntry extends AppModel {
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: findReconcilingTransactions
-   *  - Returns transactions that reconcile the given entry
-   *    (such as receipts that reconcile a charge).
+   * function: findReconciledLedgerEntries
+   *  - Returns ledger entries that are reconciled to the given entry.
+   *    (such as payments towards a charge).
    */
 
-  function findReconcilingTransactions($id = null, $fundamental_type = null) {
+  function findReconciledLedgerEntries($id = null, $fundamental_type = null) {
     foreach (($fundamental_type
 	      ? array($fundamental_type)
 	      : array('debit', 'credit')) AS $fund) {
-      $reconciled[$fund]['LedgerEntry'] = $this->find
+      $ucfund = ucfirst($fund);
+      $reconciled[$fund]['entry'] = $this->find
 	('all', array
 	 ('link' => array
-	  ('ReconcilingTransaction' => array
-	   ('fields' => array
+	  ("ReconciliationLedgerEntry" => array
+	   ('class' => "{$ucfund}ReconciliationLedgerEntry",
+	    'fields' => array
 	    ('id',
 	     "COALESCE(SUM(Reconciliation.amount),0) AS 'reconciled'",
-	     //"ReconcilingTransaction.amount - COALESCE(SUM(Reconciliation.amount),0) AS 'balance'",
-	     "COALESCE(7) AS 'balance'",
+	     "LedgerEntry.amount - COALESCE(SUM(Reconciliation.amount),0) AS 'balance'",
 	     ),
-	    'conditions' => array('Reconciliation.type' => $fund),
 	    ),
 	   ),
-	  'group' => ('ReconcilingTransaction.id'),
+	  'group' => ("ReconciliationLedgerEntry.id"),
 	  'conditions' => array('LedgerEntry.id' => $id),
 	  'fields' => array(),
 	  ));
       //pr($reconciled);
       $balance = 0;
-      foreach ($reconciled[$fund]['LedgerEntry'] AS &$entry) {
-	$entry = array_merge($entry["ReconcilingTransaction"], $entry[0]);
+      foreach ($reconciled[$fund]['entry'] AS &$entry) {
+	$entry = array_merge($entry["ReconciliationLedgerEntry"], $entry[0]);
 	$balance += $entry['balance'];
       }
       $reconciled[$fund]['balance'] = $balance;
@@ -206,31 +212,27 @@ class LedgerEntry extends AppModel {
    * function: stats
    *  - Returns summary data from the requested ledger entry
    */
-  function stats($id, $cond = null) {
-
-    if (!isset($cond))
-      $cond = array();
-
-    $cond[] = array('LedgerEntry.id' => $id);
+  function stats($id) {
 
     $query = array
       (
-       'link' => array('ReconcilingTransaction'),
        'fields' => array("SUM(Reconciliation.amount) AS 'reconciled'"),
+
+       'conditions' => array(isset($cond) ? $cond : array(),
+			     array('LedgerEntry.id' => $id)),
+
        'group' => 'LedgerEntry.id',
        );
 
     // Get the applied amounts on the debit side
-    $qcond = $cond;
-    $qcond[] = array('Reconciliation.type' => 'DEBIT');
-    $query['conditions'] = $qcond;
+    $query['link'] =
+      array('DebitReconciliationLedgerEntry' => array('alias' => 'DRLE', 'DRLETransaction' => array('class' => 'Transaction')));
     $tmpstats = $this->find('first', $query);
     $stats['debit_amount_reconciled'] = $tmpstats[0]['reconciled'];
 
     // Get the applied amounts on the credit side
-    $qcond = $cond;
-    $qcond[] = array('Reconciliation.type' => 'CREDIT');
-    $query['conditions'] = $qcond;
+    $query['link'] =
+      array('CreditReconciliationLedgerEntry' => array('alias' => 'CRLE', 'CRLETransaction' => array('class' => 'Transaction')));
     $tmpstats = $this->find('first', $query);
     $stats['credit_amount_reconciled'] = $tmpstats[0]['reconciled'];
 

models/transaction.php

@@ -0,0 +1,28 @@
+<?php
+class Transaction extends AppModel {
+
+	var $name = 'Transaction';
+/* 	var $validate = array( */
+/* 		'stamp' => array('date') */
+/* 	); */
+
+	var $belongsTo = array(
+		'Customer',
+	);
+
+	var $hasMany = array(
+		'LedgerEntry',
+	);
+
+
+	function beforeSave() {
+    
+		if(!empty($this->data['Transaction']['stamp'])) {
+			$this->data['Transaction']['stamp'] =
+				$this->dateFormatBeforeSave($this->data['Transaction']['stamp']);
+		}
+		return true;
+	}
+
+}
+?>

site/models/transaction.php

@@ -1,71 +0,0 @@
-<?php
-class Transaction extends AppModel {
-
-	var $name = 'Transaction';
-/* 	var $validate = array( */
-/* 		'stamp' => array('date') */
-/* 	); */
-
-	var $belongsTo = array(
-		'Customer',
-	);
-
-	var $hasMany = array(
-		'LedgerEntry',
-	);
-
-	var $hasAndBelongsToMany = array(
-		'ReconciledLedgerEntry' => array(
-			'className' => 'LedgerEntry',
-			'joinTable' => 'reconciliations',
-			'foreignKey' => 'ledger_entry_id',
-			'associationForeignKey' => 'transaction_id',
-		),
-	);
-
-	function beforeSave() {
-    
-		if(!empty($this->data['Transaction']['stamp'])) {
-			$this->data['Transaction']['stamp'] =
-				$this->dateFormatBeforeSave($this->data['Transaction']['stamp']);
-		}
-		return true;
-	}
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findReconciledLedgerEntries
-   *  - Returns ledger entries that are reconciled by the given
-   *    transaction (such as charges reconciled by a receipt)
-   */
-
-  function findReconciledLedgerEntries($id = null) {
-    $reconciled['LedgerEntry'] = $this->find
-      ('all', array
-       ('link' => array
-	('ReconciledLedgerEntry' => array
-	 ('fields' => array
-	  ('id',
-	   "COALESCE(SUM(Reconciliation.amount),0) AS 'reconciled'",
-	   "ReconciledLedgerEntry.amount - COALESCE(SUM(Reconciliation.amount),0) AS 'balance'",
-	   ),
-	  ),
-	 ),
-	'group' => ('ReconciledLedgerEntry.id'),
-	'conditions' => array('Transaction.id' => $id),
-	'fields' => array(),
-	));
-    //pr($reconciled);
-    $balance = 0;
-    foreach ($reconciled['LedgerEntry'] AS &$entry) {
-      $entry = array_merge($entry["ReconciledLedgerEntry"], $entry[0]);
-      $balance += $entry['balance'];
-    }
-    $reconciled['balance'] = $balance;
-
-  return $reconciled;
-  }
-
-}
-?>