Major change to invoice/receipt algorithms. The end result shouldn't be visible, but there were significant problems understanding how to reconcile entries and this cleaned things up significantly. There may be some bugs left, but quick tests show it to be working

git-svn-id: file:///svn-source/pmgr/branches/charge_credit_20090629@190 97e9348a-65ac-dc4b-aefc-98561f571b83
Moving back to the Invoice/Receipt mechanism. Seems to work fairly well, even if it's non-standard.
2009-06-30 17:52:43 +00:00 · 2009-06-30 04:47:18 +00:00 · 2009-06-30 01:06:33 +00:00 · 2009-06-24 00:33:39 +00:00 · 2009-06-23 19:04:41 +00:00 · 2009-06-22 23:46:03 +00:00
19 changed files with 987 additions and 604 deletions
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -633,15 +633,6 @@ CREATE TABLE `pmgr_customers` (
  -- If NULL, rely on the contact info exclusively
  `name`                 VARCHAR(80) DEFAULT NULL,

-  -- A customer gets their own account, although any
-  -- lease specific charge (rent, late fees, etc) will
-  -- be debited against the lease account.  This one
-  -- will be used for non-lease related charges, as
-  -- well as charges that intentionally span more than
-  -- one lease (such as one security deposit to cover
-  -- two or more units).
-  `account_id`           INT(10) UNSIGNED NOT NULL,
-
  -- Primary Contact... every customer must have one
  -- (and presumably, most customers will _be_ one).
  -- REVISIT <AP> 20090612:
@@ -708,7 +699,6 @@ CREATE TABLE `pmgr_leases` (
  `lease_type_id`        INT(10) UNSIGNED NOT NULL,
  `unit_id`              INT(10) UNSIGNED NOT NULL,
  `customer_id`          INT(10) UNSIGNED NOT NULL,
-  `account_id`           INT(10) UNSIGNED NOT NULL,
  `late_schedule_id`     INT(10) UNSIGNED DEFAULT NULL,

  `lease_date`           DATE NOT NULL,
@@ -848,7 +838,7 @@ CREATE TABLE `pmgr_accounts` (
  -- For LIABILITY, EQUITY, and INCOME, the opposite
  -- is true, with reconciliations posted, under
  -- normal circumstances, when a debit occurs.
-  `trackable`            INT UNSIGNED DEFAULT 0,
+  `trackable`            INT UNSIGNED DEFAULT 1,
 			   			   
  -- Security Level
  `level`                INT UNSIGNED DEFAULT 1,
@@ -866,15 +856,20 @@ LOCK TABLES `pmgr_accounts` WRITE;
 INSERT INTO `pmgr_accounts` (`type`, `name`, `trackable`)
  VALUES
  ('ASSET', 'A/R', 1),
+  ('ASSET', 'Invoice', 1),
+  ('ASSET', 'Receipt', 1),
  ('LIABILITY', 'A/P', 1),
-  ('LIABILITY', 'Tax', 0),
+  ('LIABILITY', 'Tax', 1),
  ('LIABILITY', 'Customer Credit', 1),
-  ('ASSET', 'Bank', 0),
-  ('ASSET', 'Payment', 0),
+  ('ASSET', 'Bank', 1),
+  ('ASSET', 'Cash', 1),
+  ('ASSET', 'Check', 1),
+  ('ASSET', 'Money Order', 1),
  ('LIABILITY', 'Security Deposit', 1),
-  ('INCOME', 'Rent', 0),
-  ('INCOME', 'Late Charge', 0),
-  ('EXPENSE', 'Concession', 0);
+  ('INCOME', 'Rent', 1),
+  ('INCOME', 'Late Charge', 1),
+  ('EXPENSE', 'Concession', 1),
+  ('EXPENSE', 'Bad Debt', 1);
 UNLOCK TABLES;


@@ -939,6 +934,10 @@ DROP TABLE IF EXISTS `pmgr_transactions`;
 CREATE TABLE `pmgr_transactions` (
  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,

+--   `type`                 ENUM('INVOICE',
+--                               'RECEIPT')
+--                            NOT NULL,
+
  `stamp`                TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
  `through_date`         DATE DEFAULT NULL,
  `due_date`             DATE DEFAULT NULL,
@@ -965,6 +964,8 @@ CREATE TABLE `pmgr_ledger_entries` (
  `name`                 VARCHAR(80) DEFAULT NULL,
  `monetary_source_id`   INT(10) UNSIGNED DEFAULT NULL, -- NULL if internal transfer
  `transaction_id`       INT(10) UNSIGNED NOT NULL,
+  `customer_id`          INT(10) UNSIGNED DEFAULT NULL,
+  `lease_id`             INT(10) UNSIGNED DEFAULT NULL,
  `amount`               FLOAT(12,2) NOT NULL,

  `debit_ledger_id`      INT(10) UNSIGNED NOT NULL,
@@ -986,7 +987,6 @@ CREATE TABLE `pmgr_reconciliations` (

  `debit_ledger_entry_id`    INT(10) UNSIGNED NOT NULL,
  `credit_ledger_entry_id`   INT(10) UNSIGNED NOT NULL,
-  `terminal_ledger_entry_id` INT(10) UNSIGNED DEFAULT NULL,
  `amount`                   FLOAT(12,2) NOT NULL,

  PRIMARY KEY (`id`)
--- a/scripts/sitelink2pmgr.pl
+++ b/scripts/sitelink2pmgr.pl
@@ -4,6 +4,8 @@ use DBI;
 use Data::Dumper;
 use File::Copy;

+my $use_ir = 1;
+
 # Internally adjust all numbers coming from the database to
 # be in inches.  Not necessary to go to this detail, but the
 # actual units used is irrelevant, provided everything is to
@@ -92,6 +94,32 @@ sub addRow {
 }


+######################################################################
+######################################################################
+## updateRow
+
+sub updateRow {
+   my ($table, $id, $cols) = @_;
+   die unless $table;
+   die unless $id;
+   die unless ref($cols) eq 'HASH';
+
+   die "Table `$table` is unknown!"
+      unless defined $newdb{'tables'}{$table};
+
+   die "Table `$table` : ID `$id` does not exist!"
+		unless $newdb{'tables'}{$table}{'rows'}[$id];
+
+   # For debug purposes
+   my $line = (caller())[2];
+   $cols->{'--UPDATE-LINE--'} = [] unless $cols->{'--UPDATE-LINE--'};
+   push(@{$cols->{'--UPDATE-LINE--'}}, "updateRow called from line: $line");
+
+   #$newdb{'tables'}{$table}{'rows'}[$id] = $cols;
+   return $id;
+}
+
+
 ######################################################################
 ######################################################################
 ## query
@@ -145,7 +173,13 @@ sub executeSchema {

 sub buildTables {
   foreach my $table (values %{$newdb{'tables'}}) {
-		printf(STDERR "%-30s : %d rows\n", $table->{'name'}, int(@{$table->{'rows'}}));
+		my $count = 0;
+      foreach (@{$table->{'rows'}}) {
+			next unless defined $_;
+			++$count;
+		}
+		
+		printf(STDERR "%-30s : %d rows\n", $table->{'name'}, $count);

      foreach (@{$table->{'rows'}}) {
 			next unless defined $_;
@@ -437,9 +471,9 @@ foreach $row (@$result) {
 	    'comment' => undef });

   $newdb{'lookup'}{'account'}{$row->{'name'}}
-   = {'account' => $row->{'id'},
+   = {'account_id' => $row->{'id'},
 		'tillable' => $row->{'tillable'},
-      'ledger' => $newdb{'tables'}{'ledgers'}{'autoid'} };
+      'ledger_id' => $newdb{'tables'}{'ledgers'}{'autoid'} };

   if ((!defined $newdb{'tables'}{'accounts'}{'autoid'}) ||
       $row->{'id'} > $newdb{'tables'}{'accounts'}{'autoid'}) {
@@ -448,8 +482,10 @@ foreach $row (@$result) {
 }

 # For compatibility, while deciding on account names
-$newdb{'lookup'}{'account'}{'Cash'}
-= $newdb{'lookup'}{'account'}{'Payment'};
+if (!defined $newdb{'lookup'}{'account'}{'Cash'}) {
+	$newdb{'lookup'}{'account'}{'Cash'}
+	= $newdb{'lookup'}{'account'}{'Till'};
+}

 $newdb{'lookup'}{'charge_type'} = {};
 $newdb{'lookup'}{'charge_type'}{'Rent'} =
@@ -474,15 +510,15 @@ foreach $row (@$result) {

 $newdb{'lookup'}{'payment_type'} = {};
 $newdb{'lookup'}{'payment_type'}{1}
-= { 'name' => 'Cash', 'account' => 'Cash', 'monetary_type' => $newdb{'lookup'}{'monetary_type'}{'Cash'} };
+= { 'name' => 'Cash', 'account_name' => 'Cash', 'monetary_type' => $newdb{'lookup'}{'monetary_type'}{'Cash'} };
 $newdb{'lookup'}{'payment_type'}{2}
-= { 'name' => 'Check', 'account' => 'Cash', 'monetary_type' => $newdb{'lookup'}{'monetary_type'}{'Check'} };
+= { 'name' => 'Check', 'account_name' => 'Check', 'monetary_type' => $newdb{'lookup'}{'monetary_type'}{'Check'} };
 $newdb{'lookup'}{'payment_type'}{3}
-= { 'name' => 'Money Order', 'account' => 'Cash', 'monetary_type' => $newdb{'lookup'}{'monetary_type'}{'Money Order'} };
+= { 'name' => 'Money Order', 'account_name' => 'Money Order', 'monetary_type' => $newdb{'lookup'}{'monetary_type'}{'Money Order'} };
 $newdb{'lookup'}{'payment_type'}{4}
-= { 'name' => 'ACH', 'account' => 'Bank', 'monetary_type' => $newdb{'lookup'}{'monetary_type'}{'ACH'} };
+= { 'name' => 'ACH', 'account_name' => 'Bank', 'monetary_type' => $newdb{'lookup'}{'monetary_type'}{'ACH'} };
 $newdb{'lookup'}{'payment_type'}{12}
-= { 'name' => 'Concession', 'account' => 'Concession', 'monetary_type' => $newdb{'lookup'}{'monetary_type'}{'Other Non-Tillable'} };
+= { 'name' => 'Concession', 'account_name' => 'Concession', 'monetary_type' => $newdb{'lookup'}{'monetary_type'}{'Other Non-Tillable'} };


 $newdb{'ids'}{'monetary_source'} = {};
@@ -490,14 +526,14 @@ $newdb{'ids'}{'monetary_source'}{'internal'} = undef;

 addRow('monetary_sources',
       { 'monetary_type_id' => $newdb{'lookup'}{'monetary_type'}{'Cash'}{'id'},
-	 'name' => 'Cash Source',
+	 'name' => 'Cash',
 	 'comment' => 'Monetary source used for any cash transaction' });
 $newdb{'ids'}{'monetary_source'}{'Cash'} =
   $newdb{'tables'}{'monetary_sources'}{'autoid'};

 addRow('monetary_sources',
       { 'monetary_type_id' => $newdb{'lookup'}{'monetary_type'}{'Other Non-Tillable'}{'id'},
-	 'name' => 'Closing Monies Credited',
+	 'name' => 'Closing',
 	 'comment' => 'Credited at the closing table' });
 $newdb{'ids'}{'monetary_source'}{'Closing'} =
   $newdb{'tables'}{'monetary_sources'}{'autoid'};
@@ -661,34 +697,16 @@ foreach $row (@{query($sdbh, $query)}) {
   $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'id'} =
      $newdb{'tables'}{'contacts'}{'autoid'};

-   # Every customer gets their own account
-   addRow('accounts',
-	  { 'type' => 'ASSET',
-		 'trackable' => 1,
-	    'name' => ('Customer #' . ($newdb{'tables'}{'customers'}{'autoid'}+1) .
-						' ('.$newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'name'} . ')'),
-			 'comment' => undef });
-			 #'comment' => 'For direct customer transaction, NOT lease charges!' });
-   addRow('ledgers',
-	  { 'account_id' => $newdb{'tables'}{'accounts'}{'autoid'},
-		 'open_stamp' => '2009-01-01',
-		 'comment' => undef });
-
-   $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'account'} =
-      $newdb{'tables'}{'accounts'}{'autoid'};
-   $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'ledger'} =
-      $newdb{'tables'}{'ledgers'}{'autoid'};
-
   addRow('customers',
 	  { 'name' => "$row->{'LastName'}, $row->{'FirstName'}",
 	    'primary_contact_id' => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'id'},
-	    'account_id' => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'account'} });
+	  });

-   $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'cust'} =
+   $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'customer_id'} =
      $newdb{'tables'}{'customers'}{'autoid'};

   addRow('contacts_customers',
-	  { 'customer_id' => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'cust'},
+	  { 'customer_id' => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'customer_id'},
 	    'contact_id' => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'id'},
 	    'type' => 'TENANT' },
 	  1);
@@ -754,7 +772,7 @@ foreach $row (@{query($sdbh, $query)}) {
      $newdb{'tables'}{'contacts'}{'autoid'};

   addRow('contacts_customers',
-	  { 'customer_id' => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'cust'},
+	  { 'customer_id' => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'customer_id'},
 	    'contact_id' => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'alt'},
 	    'type' => 'ALTERNATE' },
 	  1);
@@ -796,56 +814,25 @@ foreach $row (@{query($sdbh, $query)}) {

 $newdb{'lookup'}{'ledger'} = {};

-$query = "SELECT L.*, A.TenantID FROM TenantLedger L LEFT JOIN `Access` A ON A.LedgerID = L.LedgerID WHERE L.UnitID <> 'POS\$' ORDER BY L.LedgerID";
+$query = "SELECT L.*, A.TenantID FROM TenantLedger L LEFT JOIN `Access` A ON A.LedgerID = L.LedgerID WHERE L.UnitID <> 'POS\$' ORDER BY L.DateIn";
 foreach $row (@{query($sdbh, $query)}) {

   $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}
-   = { 'cust'    => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'cust'} };
-
-	if (1) {
-   # Every lease gets its own account
-   addRow('accounts',
-	  { 'type' => 'ASSET',
-		 'trackable' => 1,
-	    'name' => ('Lease #' . $row->{'LedgerID'}
-						. ' ('.$newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'name'} . ')'),
-			 'comment' => undef });
-			 #'comment' => 'For lease related transaction, NOT personal charges!' });
-   addRow('ledgers',
-	  { 'account_id' => $newdb{'tables'}{'accounts'}{'autoid'},
-		 'open_stamp' => datefmt($row->{'DateIn'}),
-	    'comment' => undef });
-
-	$newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'account'}
-	= $newdb{'tables'}{'accounts'}{'autoid'};
-	$newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'ledger'}
-	= $newdb{'tables'}{'ledgers'}{'autoid'};
-	}
-	else {
-	$newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'account'}
-   = $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'account'};
-	$newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'ledger'}
-   = $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'ledger'};
-	}
-
-	$newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'cust_account'}
-   = $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'account'};
-	$newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'cust_ledger'}
-   = $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'ledger'};
+   = { 'customer_id'  => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'customer_id'} };

   addRow('leases',
-	  { 'number' => $row->{'LedgerID'},
+	  { #'number' => $newdb{'tables'}{'leases'}{'autoid'}+1,
+		 'number' => $row->{'LedgerID'},
 	    'lease_type_id' => $newdb{'tables'}{'lease_types'}{'autoid'},
 	    'unit_id' => $newdb{'lookup'}{'unit'}{$row->{'UnitID'}}{'id'},
-	    'customer_id' => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'cust'},
-	    'account_id' => $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'account'},
+	    'customer_id' => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'customer_id'},
 	    'lease_date' => datefmt($row->{'DateIn'}),
 	    'movein_date' => datefmt($row->{'DateIn'}),
 	    'moveout_date' => datefmt($row->{'DateOut'}),
 	    'close_date' => datefmt($row->{'DateClosed'}),
 	    'amount' => $row->{'Rent'} });

-   $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'lease'} =
+   $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'lease_id'} =
 		$newdb{'tables'}{'leases'}{'autoid'};
 }

@@ -862,11 +849,11 @@ foreach $row (@{query($sdbh, $query)}) {
 ##

 ######################################################################
-## Charges
+## Invoices

 $newdb{'lookup'}{'charge'} = {};

-$query = "SELECT * FROM Charges ORDER BY ChargeID";
+$query = "SELECT *, ChargeAmount+TaxAmount AS InvoiceAmount FROM Charges ORDER BY ChargeID";
 foreach $row (@{query($sdbh, $query)}) {

   addRow('transactions',
@@ -874,58 +861,114 @@ foreach $row (@{query($sdbh, $query)}) {
 	    'through_date' => datefmt($row->{'EndDate'}) });

   $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}
-   = { 'tx' => $newdb{'tables'}{'transactions'}{'autoid'},
-       'ledger' => $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'ledger'},
-       'amount' => $row->{'ChargeAmount'},
-       'tax_amount' => $row->{'TaxAmount'},
-     };
+   = { 'invoice' => 
+		 { 'tx' => $newdb{'tables'}{'transactions'}{'autoid'},
+			'lease_id' => $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'lease_id'},
+			'customer_id' => $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'customer_id'},
+			'amount' => $row->{'InvoiceAmount'},
+		 } };

+	# Invoice must debit the A/R ledger...
+	$newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'debit_ledger_id'}
+	= $newdb{'lookup'}{'account'}{'A/R'}{'ledger_id'};
+
+	# ...and credit the Invoice ledger.
+	$newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'credit_ledger_id'}
+	= $newdb{'lookup'}{'account'}{'Invoice'}{'ledger_id'};
+
+	# Create the invoice entry
+	#     debit: A/R         credit: Invoice               
+	addRow('ledger_entries',
+			 { 'monetary_source_id' => $newdb{'ids'}{'monetary_source'}{'internal'},
+				'transaction_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'tx'},
+				'debit_ledger_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'debit_ledger_id'},
+				'credit_ledger_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'credit_ledger_id'},
+				'customer_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'customer_id'},
+				'lease_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'lease_id'},
+				'amount' => $row->{'InvoiceAmount'},
+				'comment' => "Invoice: Charge: $row->{'ChargeID'}" });
+
+	$newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'ledger_entry_id'}
+	= $newdb{'tables'}{'ledger_entries'}{'autoid'};
+}
+
+
+######################################################################
+## Charges
+
+$query = "SELECT * FROM Charges ORDER BY ChargeID";
+foreach $row (@{query($sdbh, $query)}) {
+
+   $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'tx'}
+   = $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'tx'};
+   $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'customer_id'}
+	= $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'customer_id'};
+   $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'lease_id'}
+	= $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'lease_id'};
+
+	# Charge must credit the invoice ledger...
+	$newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'credit_ledger_id'}
+	= $newdb{'lookup'}{'charge_type'}{$row->{'ChargeDescription'}}{'ledger_id'};
+
+	# ...and debit the A/R ledger.
+	$newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'debit_ledger_id'}
+	= $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'credit_ledger_id'};
+
+	# Add the charge entry
+	#     debit: Invoice     credit: Rent/LateCharge/Etc
   addRow('ledger_entries',
 	  { 'monetary_source_id' => $newdb{'ids'}{'monetary_source'}{'internal'},
 	    'transaction_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'tx'},
-	    'debit_ledger_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'ledger'},
-	    'credit_ledger_id' => $newdb{'lookup'}{'charge_type'}{$row->{'ChargeDescription'}}{'ledger'},
+	    'debit_ledger_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'debit_ledger_id'},
+		 'credit_ledger_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'credit_ledger_id'},
+		 'customer_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'customer_id'},
+		 'lease_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'lease_id'},
 	    'amount' => $row->{'ChargeAmount'},
 	    'comment' => "Charge: $row->{'ChargeID'}; Ledger: $row->{'LedgerID'}" });

-   my $debit_entry_id = $newdb{'tables'}{'ledger_entries'}{'autoid'},
-
-   addRow('ledger_entries',
-	  { 'monetary_source_id' => $newdb{'ids'}{'monetary_source'}{'internal'},
-	    'transaction_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'tx'},
-	    'debit_ledger_id' => $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'cust_ledger'},
-	    'credit_ledger_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'ledger'},
-	    'amount' => $row->{'ChargeAmount'},
-	    'comment' => "Charge: $row->{'ChargeID'}; Ledger: $row->{'LedgerID'}" });
-
-	$newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'terminal'}
-	= $debit_entry_id;
-   $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'entry'}
-   = $newdb{'tables'}{'ledger_entries'}{'autoid'},
-	$newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'ledger'}
-	= $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'cust_ledger'};
+   $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'ledger_entry_id'}
+   = $newdb{'tables'}{'ledger_entries'}{'autoid'};

+	# Reconcile the Invoice account.  Our two entries look like:
+	#     debit: Invoice     credit: Rent/LateCharge/Etc
+	#     debit: A/R         credit: Invoice               
+	# Since this is from the perspective of the Invoice account,
+	# the credit entry is the Invoice<->A/R, and the debit
+	# entry is the actual charge ledger entry.
 	addRow('reconciliations',
-	  { 'debit_ledger_entry_id'  => $debit_entry_id,
-	    'credit_ledger_entry_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'entry'},
-		 'terminal_ledger_entry_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'terminal'},
+			 { 'debit_ledger_entry_id'  => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'ledger_entry_id'},
+				'credit_ledger_entry_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'ledger_entry_id'},
 				'amount' => $row->{'ChargeAmount'},
 			 });

-
   next unless $row->{'TaxAmount'};

+	# Add the tax charge entry
+	#     debit: Invoice     credit: Tax
   addRow('ledger_entries',
 	  { 'monetary_source_id' => $newdb{'ids'}{'monetary_source'}{'internal'},
 	    'transaction_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'tx'},
-	    'debit_ledger_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'ledger'},
-	    'credit_ledger_id' => $newdb{'lookup'}{'charge_type'}{'Tax'}{'ledger'},
+	    'debit_ledger_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'debit_ledger_id'},
+		 'credit_ledger_id' => $newdb{'lookup'}{'account'}{'Tax'}{'ledger_id'},
+		 'customer_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'customer_id'},
+		 'lease_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'lease_id'},
 	    'amount' => $row->{'TaxAmount'},
-	    'comment' => undef });
+	    'comment' => "Tax for ChargeID:$row->{'ChargeID'}" });

-   $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'tax_entry'}
-   = $newdb{'tables'}{'ledger_entries'}{'autoid'},
+   $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'tax_ledger_entry_id'}
+   = $newdb{'tables'}{'ledger_entries'}{'autoid'};

+	# Reconcile the Invoice account.  Our two entries look like:
+	#     debit: Invoice     credit: Tax
+	#     debit: A/R         credit: Invoice               
+	# Since this is from the perspective of the Invoice account,
+	# the credit entry is the Invoice<->A/R, and the debit
+	# entry is the actual tax ledger entry.
+	addRow('reconciliations',
+			 { 'debit_ledger_entry_id'  => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'tax_ledger_entry_id'},
+				'credit_ledger_entry_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'ledger_entry_id'},
+				'amount' => $row->{'TaxAmount'},
+			 });
 }


@@ -934,38 +977,168 @@ foreach $row (@{query($sdbh, $query)}) {

 $newdb{'lookup'}{'receipt'} = {};

+############################################################
+############################################################
+############################################################
+# REVISIT <AP> 20090630
+# Handling of receipts is all backwards.  The way things
+# _should_ look if someone provides Cash and Check to pay
+# rent & tax for two units (50 on UnitA and 40 UnitB):
+#
+#  RENT      TAX    INVOICE    A/R    RECEIPT   CASH     CHECK
+# -------  -------  -------  -------  -------  -------  -------
+#    |50      |      50|        |        |        |        |    
+#    |        | 5     5|        |        |        |        |    
+#    |        |        |55    55|        |        |        |    
+#    |40      |      40|        |        |        |        |    
+#    |        | 4     4|        |        |        |        |    
+#    |        |        |44    44|        |        |        |    
+#    |        |        |        |        |79      |      79|    
+#    |        |        |        |        |20    20|        |    
+#    |        |        |        |99    99|        |        |    
+#    |        |        |        |        |        |        |    
+#
+# HOWEVER,
+# Our current implementation MUST match LedgerEntry to
+# LedgerEntry for reconcile purposes.  Thus, although there
+# is a way to reconcile that $50 was received, there is no
+# way to flag the payment as being for UnitA, unless we
+# either rely on the charge to determine the fact (a
+# solution that has proven very messy), or we add it to
+# the reconciliations table.  The hope, for simplicity's
+# sake, was to ensure there was a single ledger entry in 
+# A/R for each payment that could correspond to a lease/unit,
+# so that no A/R ledger entry ever represented payment for
+# more than one lease.  However, to do so, our ledgers 
+# appear like this instead:
+#
+#  RENT      TAX    INVOICE    A/R    RECEIPT   CASH     CHECK
+# -------  -------  -------  -------  -------  -------  -------
+#    |50      |      50|        |        |        |        |    
+#    |        | 5     5|        |        |        |        |    
+#    |        |        |55    55|        |        |        |    
+#    |40      |      40|        |        |        |        |    
+#    |        | 4     4|        |        |        |        |    
+#    |        |        |44    44|        |        |        |    
+#    |        |        |        |        |79      |      79|    
+#    |        |        |        |        |20    20|        |    
+#    |        |        |        |50    50|        |        |    
+#    |        |        |        | 5     5|        |        |    
+#    |        |        |        |40    40|        |        |    
+#    |        |        |        | 4     4|        |        |    
+#    |        |        |        |        |        |        |    
+#
+# There is another possible solution, although it is
+# very probably ledger overkill (even invoice/receipt
+# already fall into the overkill category).
+#
+#  RENT      TAX    INVOICE    A/R     MERGE   RECEIPT   CASH     CHECK
+# -------  -------  -------  -------  -------  -------  -------  -------
+#    |50      |      50|        |        |        |        |        |    
+#    |        | 5     5|        |        |        |        |        |    
+#    |        |        |55    55|        |        |        |        |    
+#    |40      |      40|        |        |        |        |        |    
+#    |        | 4     4|        |        |        |        |        |    
+#    |        |        |44    44|        |        |        |        |    
+#    |        |        |        |        |        |79      |      79|    
+#    |        |        |        |        |        |20    20|        |    
+#    |        |        |        |        |50    50|        |        |    
+#    |        |        |        |        | 5     5|        |        |    
+#    |        |        |        |        |40    40|        |        |    
+#    |        |        |        |        | 4     4|        |        |    
+#    |        |        |        |99    99|        |        |        |    
+#    |        |        |        |        |        |        |        |    
+#
+# I might opt for this last option, but ultimately, none
+# of these are really correct.  We need a better solution.
+# Until then, I'll go with the easiest.
+
+############################################################
+############################################################
+############################################################
+
+# Sitelink splits one physical payment into multiple "payments" to match each charge.
+# The solution here is kludgy, but for our cases at least, it brings those pseudo-payments
+# back into a single one.  This presumes there is only one PaymentType per receipt.
 $query =
-   "SELECT R.ReceiptNum, C.LedgerID, R.ReceiptDate" .
-   " FROM Receipts R, Payments P, Charges C" .
+   "SELECT R.ReceiptNum, R.ReceiptDate, P.PaymentType, P.CheckNum, SUM(P.PaymentAmount) AS ReceiptAmount" .
+   " FROM Receipts R, Payments P" .
   " WHERE P.ReceiptNum = R.ReceiptNum" .
-   "   AND C.ChargeID = P.ChargeID" .
-   " GROUP BY R.ReceiptNum, C.LedgerID, R.ReceiptDate" .
-   " ORDER BY R.ReceiptNum";
+   " GROUP BY R.ReceiptNum, R.ReceiptDate, P.PaymentType, P.CheckNum" .
+   " ORDER BY R.ReceiptNum, P.PaymentType";
 foreach $row (@{query($sdbh, $query)}) {
 	
-   if ($newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}) {
-      die unless ($newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{'cust'}
-		  == $newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{'cust'});
-      push(@{$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{'ledgers'}},
-	   $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'ledger'});
-      #print Dumper $receipt_map{$row->{'ReceiptNum'}};
-      next;
-   }
+# 	if ($newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'ledger_entry_id'}) {
+# 		next;
+# 	}

+   if (!$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}) {
 		addRow('transactions',
 				 { 'stamp' => datefmt($row->{'ReceiptDate'}),
 					'through_date' => undef });
-
 		$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}
-   = {'tx' => $newdb{'tables'}{'transactions'}{'autoid'},
-      'cust' => $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'cust'},
-      'ledgers' => [ $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'ledger'} ] };
+		= {'tx' => $newdb{'tables'}{'transactions'}{'autoid'} };
+	}
+
+   if ($row->{'ReceiptDate'} =~ m%3/25/2009%) {
+		$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'monetary_source_id'}
+		= $newdb{'ids'}{'monetary_source'}{'Closing'};
+		$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'account_name'}
+		= 'Bank';
+   }
+   else {
+		$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'monetary_source_id'}
+		= $newdb{'ids'}{'monetary_source'}{
+			$newdb{'lookup'}{'payment_type'}{$row->{'PaymentType'}}{'name'}
+      };
+		$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'account_name'}
+		= $newdb{'lookup'}{'payment_type'}{$row->{'PaymentType'}}{'account_name'};
+   }
+
+	# Set up a monetary source for the receipt,
+	if (!$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'monetary_source_id'}) {
+		my $name = $newdb{'lookup'}{'payment_type'}{$row->{'PaymentType'}}{'name'};
+		if ($name eq 'Check') {
+			$name = 'Check #' . $row->{'CheckNum'};
+		}
+		addRow('monetary_sources',
+				 { 'monetary_type_id' => $newdb{'lookup'}{'payment_type'}{$row->{'PaymentType'}}{'monetary_type'}{'id'},
+					'name' => $name,
+					'comment' => "Receipt:$row->{'ReceiptNum'}; Payment:$row->{'PaymentType'}; Check:$row->{'CheckNum'}" });
+
+		$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'monetary_source_id'}
+		= $newdb{'tables'}{'monetary_sources'}{'autoid'};
+	}
+
+	# Receipt must debit the "money" asset (bank, cash, check, etc)...
+	$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'debit_ledger_id'}
+	= $newdb{'lookup'}{'account'}{
+		$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'account_name'}
+	}{'ledger_id'};
+
+	# ...and credit the Receipt ledger
+	$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'credit_ledger_id'}
+	= $newdb{'lookup'}{'account'}{'Receipt'}{'ledger_id'};
+
+	# NOTE THE ABOVE LARGE COMMENT BLOCK
+	# The choice of credit/debit ledgers does not mirror the
+	# choices for invoice.  This _should_ be A/R to Receipt,
+	# but it is Money to Receipt instead.
+	#     debit: Cash/Check/Etc    credit: Receipt
+	addRow('ledger_entries',
+			 { 'monetary_source_id' => $newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'monetary_source_id'},
+				'transaction_id' => $newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{'tx'},
+				'debit_ledger_id' => $newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'debit_ledger_id'},
+				'credit_ledger_id' => $newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'credit_ledger_id'},
+				'amount' => $row->{'ReceiptAmount'},
+				'comment' => "Receipt: $row->{'ReceiptNum'}; " });
+
+	$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'ledger_entry_id'}
+	= $newdb{'tables'}{'ledger_entries'}{'autoid'};
+
 }


-# sub idkeys { [ sort( {$a <=> $b} keys(%{$_[0]})) ] }
-# $Data::Dumper::Sortkeys = \&idkeys;
-      

 ######################################################################
 ## Payments
@@ -975,48 +1148,68 @@ $newdb{'lookup'}{'payment'} = {};
 $query = "SELECT * FROM Payments ORDER BY PaymentID";
 foreach $row (@{query($sdbh, $query)})
 {
-   my $monetary_source_id;
-   if ($row->{'PaymentDate'} =~ m%3/25/2009%) {
-      $monetary_source_id = $newdb{'ids'}{'monetary_source'}{'closing'};
-   }
-   else {
-      $monetary_source_id = $newdb{'ids'}{'monetary_source'}{
-	 $newdb{'lookup'}{'payment_type'}{$row->{'PaymentType'}}{'name'}
-      };
-   }
+	$newdb{'lookup'}{'payment'}{$row->{'PaymentID'}} = {};

-   if (!defined $monetary_source_id) {
-      addRow('monetary_sources',
-	     { 'monetary_type_id' => $newdb{'lookup'}{'payment_type'}{$row->{'PaymentType'}}{'monetary_type'}{'id'},
-	       'name' => $row->{'RecdFrom'},
-	       'comment' => "Payment: $row->{'PaymentID'}; Type: $row->{'PaymentType'}; Check: $row->{'CheckNum'}; $row->{'Memo'}" });
-      $monetary_source_id = $newdb{'tables'}{'monetary_sources'}{'autoid'};
-   }
+	# NOTE THE ABOVE LARGE COMMENT BLOCK
+	# The choice of credit/debit ledgers does not mirror the
+	# choices for charges.  This _should_ be Money to Receipt,
+	# but it is A/R to Receipt instead.

-	my $payment_acct = $newdb{'lookup'}{'payment_type'}{$row->{'PaymentType'}}{'account'};
+	# Ensure Receipt has the right customer
+	$newdb{'tables'}{'ledger_entries'}{'rows'}[
+		$newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'ledger_entry_id'}
+	]{'customer_id'} = $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'customer_id'};

+	# Payment must debit the associated receipt ledger (which should be Receipt)...
+	$newdb{'lookup'}{'payment'}{$row->{'PaymentID'}}{'debit_ledger_id'}
+	= $newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'credit_ledger_id'};
+
+	# ...and credit the A/R ledger.
+	$newdb{'lookup'}{'payment'}{$row->{'PaymentID'}}{'credit_ledger_id'}
+	= $newdb{'lookup'}{'account'}{'A/R'}{'ledger_id'};
+
+	# Add the payment entry
+	#     debit: Receipt           credit: A/R
   addRow('ledger_entries',
-	  { 'monetary_source_id' => $monetary_source_id,
+	  { 'monetary_source_id' => $newdb{'ids'}{'monetary_source'}{'internal'},
 		 'transaction_id' => $newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{'tx'},
-	    'debit_ledger_id' => $newdb{'lookup'}{'account'}{$payment_acct}{'ledger'},
-	    'credit_ledger_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'ledger'},
+	    'debit_ledger_id' => $newdb{'lookup'}{'payment'}{$row->{'PaymentID'}}{'debit_ledger_id'},
+		 'credit_ledger_id' => $newdb{'lookup'}{'payment'}{$row->{'PaymentID'}}{'credit_ledger_id'},
+		 'customer_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'customer_id'},
+		 'lease_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'lease_id'},
 	    'amount' => $row->{'PaymentAmount'},
-	    'comment' => "Receipt: $row->{'ReceiptNum'}; Payment: $row->{'PaymentID'}; Charge: $row->{'ChargeID'}" });
+		 'comment' => "Receipt: $row->{'ReceiptNum'}; Charge: $row->{'ChargeID'}; Payment: $row->{'PaymentID'}" });

-   $newdb{'lookup'}{'payment'}{$row->{'PaymentID'}}
-   = { 'entry' => $newdb{'tables'}{'ledger_entries'}{'autoid'} };
+   $newdb{'lookup'}{'payment'}{$row->{'PaymentID'}}{'ledger_entry_id'}
+   = $newdb{'tables'}{'ledger_entries'}{'autoid'};

-   # Reconcile Payment to the Charge.  Since tracking is due to
-   # the A/R account (Lease Account in this case), credit/debit
-   # is from the perspective of that account.  Namely, the charge
-   # was the debit to the A/R, and the payment was the credit.
-   my $reconcile_amount = $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'amount'};
+   # Reconcile the Receipt account.  Our two entries look like:
+	#     debit: Cash/Check/Etc    credit: Receipt
+	#     debit: Receipt           credit: A/R
+	# Since this is from the perspective of the Receipt account,
+	# the debit entry is the Receipt<->A/R, and the credit
+	# entry is the actual receipt ledger entry.
+	addRow('reconciliations',
+			 { 'debit_ledger_entry_id'  => $newdb{'lookup'}{'payment'}{$row->{'PaymentID'}}{'ledger_entry_id'},
+				'credit_ledger_entry_id' => $newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{$row->{'PaymentType'}}{'ledger_entry_id'},
+				'amount' => $row->{'PaymentAmount'},
+			 });
+
+
+	# Figure out how much of the charge can be reconciled
+   my $reconcile_amount = $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'amount'};
+	#print STDERR Dumper($newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}); exit;
   $reconcile_amount = $row->{'PaymentAmount'} if $row->{'PaymentAmount'} <= $reconcile_amount;

+	# Reconcile the A/R account.  Our two entries look like:
+	#     debit: Receipt      credit: A/R
+	#     debit: A/R          credit: Invoice          
+	# Since this is from the perspective of the A/R account,
+	# the debit entry is the Invoice<->A/R, and the credit
+	# entry is the Receipt<->A/R.
   addRow('reconciliations',
-	  { 'debit_ledger_entry_id'  => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'entry'},
-	    'credit_ledger_entry_id' => $newdb{'lookup'}{'payment'}{$row->{'PaymentID'}}{'entry'},
-		 'terminal_ledger_entry_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'terminal'},
+			 { 'debit_ledger_entry_id'  => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'invoice'}{'ledger_entry_id'},
+				'credit_ledger_entry_id' => $newdb{'lookup'}{'payment'}{$row->{'PaymentID'}}{'ledger_entry_id'},
 				'amount' => $reconcile_amount,
 			 });

@@ -1033,11 +1226,12 @@ foreach $row (@{query($sdbh, $query)})
 ## Fake Data for Testing

 my %fake =
-   ('custid' => 2,
+   ('customer_id' => 4,
+	 'ledger_id' => 4,
    'invoice' => [ { 'id'      => 1000,
 							'date'    => '2009-05-05',
 							'entry'   => [ { 'id'      => 2100,
-				      'account' => 'Security Deposit',
+												  'account_name' => 'Security Deposit',
 												  'amount'  => 10,
 												  'tax'     => 0 },
 								],
@@ -1046,7 +1240,7 @@ my %fake =
 							'date'    => '2009-05-01',
 							'thru'    => '2009-05-31',
 							'entry'   => [ { 'id'      => 2110,
-				      'account' => 'Rent',
+												  'account_name' => 'Rent',
 												  'amount'  => 100,
 												  'tax'     => 5 },
 								],
@@ -1054,7 +1248,7 @@ my %fake =
 						 { 'id'      => 1002,
 							'date'    => '2009-05-11',
 							'entry'   => [ { 'id'      => 2120,
-				      'account' => 'Late Charge',
+												  'account_name' => 'Late Charge',
 												  'amount'  => 25,
 												  'tax'     => 0 },
 								],
@@ -1115,45 +1309,45 @@ my %fake =

   );		  

+sub fakeTesting {
+	$newdb{'ids'}{'ledger'}{'Cash-Old'} =
+		$newdb{'lookup'}{'account'}{'Cash'}{'ledger_id'};

-$newdb{'ids'}{'ledger'}{'Cash-Old'} =
-   $newdb{'lookup'}{'account'}{'Cash'}{'ledger'};
-
-addRow('ledgers',
-       { 'account_id' => $newdb{'lookup'}{'account'}{'Cash'}{'account'},
+	addRow('ledgers',
+			 { 'account_id' => $newdb{'lookup'}{'account'}{'Cash'}{'account_id'},
 				'open_stamp' => 'NOW()',
 				'sequence' => 2,
 				'comment' => 'Opened new ledger for testing' });

-$newdb{'lookup'}{'account'}{'Cash'}{'ledger'} =
+	$newdb{'lookup'}{'account'}{'Cash'}{'ledger_id'} =
 		$newdb{'tables'}{'ledgers'}{'autoid'};

-my $balance = 0;
-foreach $row (@{$newdb{'tables'}{'ledger_entries'}{'rows'}}) {
+	my $balance = 0;
+	foreach $row (@{$newdb{'tables'}{'ledger_entries'}{'rows'}}) {
 		next unless defined $row;
 		$balance += $row->{'amount'}
 		if $row->{'debit_ledger_id'} == $newdb{'ids'}{'ledger'}{'Cash-Old'};
 		$balance -= $row->{'amount'}
 		if $row->{'credit_ledger_id'} == $newdb{'ids'}{'ledger'}{'Cash-Old'};
-}
+	}

-addRow('transactions',
-       { 'stamp' => '2009-05-10' });
+	addRow('transactions',
+			 { 'stamp' => '2009-04-30' });

-addRow('ledger_entries',
+	addRow('ledger_entries',
 			 { 'monetary_source_id' => $newdb{'ids'}{'monetary_source'}{'internal'},
 				'transaction_id' => $newdb{'tables'}{'transactions'}{'autoid'},
-	 'debit_ledger_id' => $newdb{'lookup'}{'account'}{'Cash'}{'ledger'},
+				'debit_ledger_id' => $newdb{'lookup'}{'account'}{'Cash'}{'ledger_id'},
 				'credit_ledger_id' => $newdb{'ids'}{'ledger'}{'Cash-Old'},
 				'amount' => $balance,
 				'name' => "Close Out ($newdb{'ids'}{'ledger'}{'Cash-Old'} -> $newdb{'tables'}{'transactions'}{'autoid'})",
 				'comment' => "Carrying forward old ledger balance onto new ledger" });
 # NOTE: no tracking for the Cash account

-$newdb{'tables'}{'ledgers'}{'rows'}[$newdb{'ids'}{'ledger'}{'Cash-Old'}]{'closed'} = 1;
-$newdb{'tables'}{'ledgers'}{'rows'}[$newdb{'ids'}{'ledger'}{'Cash-Old'}]{'close_stamp'} = 'NOW()';
+	$newdb{'tables'}{'ledgers'}{'rows'}[$newdb{'ids'}{'ledger'}{'Cash-Old'}]{'closed'} = 1;
+	$newdb{'tables'}{'ledgers'}{'rows'}[$newdb{'ids'}{'ledger'}{'Cash-Old'}]{'close_stamp'} = 'NOW()';

-foreach my $ir ('invoice', 'receipt') {
+	foreach my $ir ('invoice', 'receipt') {
 		foreach my $tx (@{$fake{$ir}}) {
 			#print Dumper ${%$tx{'date'}};
 			#exit;
@@ -1165,8 +1359,10 @@ foreach my $ir ('invoice', 'receipt') {
 					 1);

 			foreach my $e (@{$tx->{'entry'}}) {
+				my $ircrdr = ($ir eq 'invoice') ? 'Invoice' : 'Receipt';
 				my $dr = ($ir eq 'invoice') ? 'A/R' : 'Cash';
-	 my $cr = ($ir eq 'invoice') ? $e->{'account'} : 'A/R';
+				my $cr = ($ir eq 'invoice') ? $e->{'account_name'} : 'A/R';
+				my $crdr;
 				my $monetary_source_id;

 				if (defined $e->{'type'}) {
@@ -1180,40 +1376,94 @@ foreach my $ir ('invoice', 'receipt') {
 					$monetary_source_id = $newdb{'ids'}{'monetary_source'}{'internal'};
 				}

+				$crdr = $dr;
+				if ($use_ir) {
+					$crdr = $ircrdr;
 					addRow('ledger_entries',
-		{ 'id' => $e->{'id'},
-		  'monetary_source_id' => $monetary_source_id,
+							 { 'id' => $e->{'id'}+10000,
+								'monetary_source_id' => ($ir eq 'invoice' ? undef : $monetary_source_id),
 								'transaction_id' => $tx->{'id'},
-		  'debit_ledger_id' => $newdb{'lookup'}{'account'}{$dr}{'ledger'},
-		  'credit_ledger_id' => $newdb{'lookup'}{'account'}{$cr}{'ledger'},
+								'debit_ledger_id' => $newdb{'lookup'}{'account'}{$dr}{'ledger_id'},
+								'credit_ledger_id' => $newdb{'lookup'}{'account'}{$crdr}{'ledger_id'},
+								'customer_id' => $fake{'customer_id'},
+								#'lease_id' => $fake{'lease_id'},
 								'amount' => $e->{'amount'},
 								'comment' => "Fake $ir entry" },
 							 1);
+				}
+
+				addRow('ledger_entries',
+						 { 'id' => $e->{'id'},
+							'monetary_source_id' => ($ir eq 'invoice' ? $monetary_source_id : undef),
+							'transaction_id' => $tx->{'id'},
+							'debit_ledger_id' => $newdb{'lookup'}{'account'}{$crdr}{'ledger_id'},
+							'credit_ledger_id' => $newdb{'lookup'}{'account'}{$cr}{'ledger_id'},
+							'customer_id' => $fake{'customer_id'},
+							'lease_id' => $fake{'lease_id'},
+							'amount' => $e->{'amount'},
+							'comment' => "Fake Entry" },
+						 1);
+
+				if ($use_ir) {
+					addRow('reconciliations',
+							 { 'debit_ledger_entry_id'  => $e->{'id'} + ($ir eq 'invoice' ? 10000 : 0),
+								'credit_ledger_entry_id' => $e->{'id'} + ($ir eq 'invoice' ? 0 : 10000),
+								'amount' => $e->{'amount'},
+							 });
+				}

 				foreach my $t (@{$e->{'track'}}) {
 					addRow('reconciliations',
 							 { 'debit_ledger_entry_id'  => $t->{'debit'},
 								'credit_ledger_entry_id' => $e->{'id'},
-			  'terminal_ledger_entry_id' => $t->{'debit'},
 								'amount' => $t->{'amount'}
 							 });
 				}

 				next unless $e->{'tax'};

+				$crdr = $dr;
+				if ($use_ir) {
+					$crdr = $ircrdr;
+					addRow('ledger_entries',
+							 { 'id' => $e->{'id'}+10001,
+								'monetary_source_id' => ($ir eq 'invoice' ? undef : $monetary_source_id),
+								'transaction_id' => $tx->{'id'},
+								'debit_ledger_id' => $newdb{'lookup'}{'account'}{$dr}{'ledger_id'},
+								'credit_ledger_id' => $newdb{'lookup'}{'account'}{$crdr}{'ledger_id'},
+								'customer_id' => $fake{'customer_id'},
+								#'lease_id' => $fake{'lease_id'},
+								'amount' => $e->{'tax'},
+								'comment' => "Fake Tax Invoice Entry" },
+							 1);
+				}
+
 				addRow('ledger_entries',
 						 { 'id' => $e->{'id'}+1,
-		  'monetary_source_id' => $monetary_source_id,
+							'monetary_source_id' => ($ir eq 'invoice' ? $monetary_source_id : undef),
 							'transaction_id' => $tx->{'id'},
-		  'debit_ledger_id' => $newdb{'lookup'}{'account'}{$dr}{'ledger'},
-		  'credit_ledger_id' => $newdb{'lookup'}{'account'}{'Tax'}{'ledger'},
+							'debit_ledger_id' => $newdb{'lookup'}{'account'}{$crdr}{'ledger_id'},
+							'credit_ledger_id' => $newdb{'lookup'}{'account'}{'Tax'}{'ledger_id'},
+							'customer_id' => $fake{'customer_id'},
+							'lease_id' => $fake{'lease_id'},
 							'amount' => $e->{'tax'},
-		  'comment' => "Fake Tax" },
+							'comment' => "Fake Tax Entry" },
 						 1);
+
+				if ($use_ir) {
+					addRow('reconciliations',
+							 { 'debit_ledger_entry_id'  => $e->{'id'} + ($ir eq 'invoice' ? 10001 : 1),
+								'credit_ledger_entry_id' => $e->{'id'} + ($ir eq 'invoice' ? 1 : 10001),
+								'amount' => $e->{'tax'},
+							 });
+				}
+			}
 		}
 	}
 }

+#fakeTesting();
+
 $Data::Dumper::Sortkeys = 1;
 print Dumper \%newdb;
 # exit;
--- a/site/app_controller.php
+++ b/site/app_controller.php
@@ -305,7 +305,13 @@ 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] =
@@ -338,29 +344,39 @@ class AppController extends Controller {
  }

  function jqGridDataOutputRecords(&$params, &$model, &$records) {
-    $model_alias = $model->alias;
-    $id          = 'jqGrid_id';
-
+    $id_field    = 'jqGrid_id';
    foreach ($records AS $record) {
-      echo " <row id='{$record[$id]}'>\n";
-      foreach ($params['fields'] AS $field) {
+      $this->jqGridDataOutputRecord($params, $model, $record,
+				    $record[$id_field], $params['fields']);
+    }
+  }
+
+  function jqGridDataOutputRecord(&$params, &$model, &$record, $id, $fields) {
+    echo " <row id='$id'>\n";
+    foreach ($fields AS $field) {
+      $this->jqGridDataOutputRecordField($params, $model, $record, $field);
+    }
+    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];
+      $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"; 
  }
-      echo " </row>\n";
-    }
-  }

  function jqGridDataFinalize(&$params) {
    if ($params['debug']) {
--- a/site/controllers/leases_controller.php
+++ b/site/controllers/leases_controller.php
@@ -71,6 +71,7 @@ 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);
  }

@@ -107,7 +108,6 @@ class LeasesController extends AppController {
 	     array(// Models
 		   'LeaseType',
 		   'Unit',
-		   'Account' => array('CurrentLedger'),
 		   'Customer',
 		   ),
 	     'conditions' => array(array('Lease.id' => $id)),
@@ -115,23 +115,15 @@ 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']['Account']['Ledger']['balance'];
+    $outstanding_balance = $lease['Lease']['stats']['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',
--- a/site/controllers/ledger_entries_controller.php
+++ b/site/controllers/ledger_entries_controller.php
@@ -25,6 +25,14 @@ 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
@@ -36,6 +44,16 @@ 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'])) {
@@ -77,6 +95,19 @@ 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);
@@ -92,11 +123,14 @@ 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_type);
+    return $model->ledgerContextFields2($ledger_id, $account_id, $account_type);
  }

  function jqGridDataConditions(&$params, &$model) {
@@ -118,20 +152,71 @@ 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');
-    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);
  }

@@ -145,8 +230,39 @@ class LedgerEntriesController extends AppController {
  function jqGridDataOrder(&$params, &$model, $index, $direction) {
 /*     if ($index === 'balance') */
 /*       return ($index .' '. $direction); */
+    $order = parent::jqGridDataOrder($params, $model, $index, $direction);

-    return 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);
  }


@@ -167,6 +283,7 @@ class LedgerEntriesController extends AppController {
    $entry = $this->LedgerEntry->find
      ('first',
       array('contain' => array('MonetarySource.id',
+				'MonetarySource.name',
 				'MonetarySource.MonetaryType.id',
 				'Transaction.id',
 				'Transaction.stamp',
@@ -176,6 +293,9 @@ class LedgerEntriesController extends AppController {
 				'CreditLedger.id',
 				'CreditLedger.sequence',
 				'CreditLedger.account_id',
+				'Customer.id',
+				'Customer.name',
+				'Lease.id',
 				),

 	     'fields' => array('LedgerEntry.id',
@@ -184,6 +304,7 @@ 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
--- a/site/controllers/units_controller.php
+++ b/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['Account']['Ledger']['balance'];
+      $lease['balance'] = $stats['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']['Account']['Ledger']['balance'];
+	$stats['CurrentLease']['balance'];

      // Figure out the total security deposit for the current lease.
      $deposits = $this->Unit->Lease->findSecurityDeposits($unit['CurrentLease']['id']);
--- a/site/models/account.php
+++ b/site/models/account.php
@@ -82,37 +82,26 @@ class Account extends AppModel {
  /**************************************************************************
   **************************************************************************
   **************************************************************************
-   * function: securityDepositAccountID
-   *  - Returns the ID of the Security Deposit Account
+   * function: accountNameToID
+   *  - Returns the ID of the named account
   */
-  function securityDepositAccountID() {
+  function accountNameToID($name) {
    $this->cacheQueries = true;
    $account = $this->find('first', array
 			   ('recursive' => -1,
-			    'conditions' => array
-			    (array('name' => 'Security Deposit')),
+			    'conditions' => compact('name'),
 			    ));
    $this->cacheQueries = false;
    return $account['Account']['id'];
  }

-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * 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'];
-  }
+  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'); }


  /**************************************************************************
@@ -122,22 +111,19 @@ 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();
@@ -148,14 +134,11 @@ 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' => $this->cache[$id]['ledgers'][$cachekey])); */
+/* 	     'return' => $ledger_ids)); */

-    return $this->cache[$id]['ledgers'][$cachekey];
+    return $ledger_ids;
  }


@@ -234,7 +217,11 @@ class Account extends AppModel {
   *    (such as charges not paid).
   */

-  function findUnreconciledLedgerEntries($id = null, $fundamental_type = null) {
+  function findUnreconciledLedgerEntries($id = null, $fundamental_type = null, $cond = null) {
+    if (!isset($cond))
+      $cond = array();
+    $cond[] = array('Account.id' => $id);
+
    foreach (($fundamental_type
 	      ? array($fundamental_type)
 	      : array('debit', 'credit')) AS $fund) {
@@ -260,7 +247,7 @@ class Account extends AppModel {
 	  'group' => ("LedgerEntry.id" .
 		      " HAVING LedgerEntry.amount" .
 		      " <> COALESCE(SUM(Reconciliation.amount),0)"),
-	  'conditions' => array('Account.id' => $id),
+	  'conditions' => $cond,
 	  'fields' => array(),
 	  ));
      $balance = 0;
@@ -290,7 +277,7 @@ class Account extends AppModel {
   *    whatever algorithm is simplest.
   */

-  function reconcileNewLedgerEntry($id, $fundamental_type, $amount) {
+  function reconcileNewLedgerEntry($id, $fundamental_type, $amount, $cond = null) {
    $ofund = $this->fundamentalOpposite($fundamental_type);
    $unreconciled = array($ofund => array('entry'=>array(), 'balance'=>0));
    $applied = 0;
@@ -298,7 +285,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);
+      $unreconciled = $this->findUnreconciledLedgerEntries($id, $ofund, $cond);

      foreach ($unreconciled[$ofund]['entry'] AS $i => &$entry) {
 	// Determine if amount is sufficient to cover the entry
--- a/site/models/customer.php
+++ b/site/models/customer.php
@@ -8,7 +8,6 @@ class Customer extends AppModel {
 	);

 	var $belongsTo = array(
-		'Account',
 		'PrimaryContact' => array(
 			'className' => 'Contact',
 		),
@@ -20,11 +19,19 @@ class Customer extends AppModel {
 			'conditions' => 'CurrentLease.close_date IS NULL',
 		),
 		'Lease',
-		'Transaction',
+		'LedgerEntry',
+
+		// Cheat to get Account set as part of this class
+		'Account',
 	);

 	var $hasAndBelongsToMany = array(
 		'Contact',
+		'Transaction' => array(
+			'joinTable' => 'ledger_entries',
+			'foreignKey' => 'customer_id',
+			'associationForeignKey' => 'transaction_id',
+		),
 	);


@@ -80,16 +87,9 @@ class Customer extends AppModel {
 /* 	     )); */

    $entries = $this->Account->findLedgerEntriesRelatedToAccount
-      ($this->accountId($id),
+      ($this->Account->invoiceAccountID(),
       $this->Account->securityDepositAccountID(),
-       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']);
-    }
+       true, array('LedgerEntry.customer_id' => $id), $link);

 /*     pr(array('function' => 'Customer::findSecurityDeposits', */
 /* 	     'args' => compact('id', 'link'), */
@@ -110,22 +110,10 @@ class Customer extends AppModel {
   */

  function findUnreconciledLedgerEntries($id = null, $fundamental_type = null) {
-
    $unreconciled = $this->Account->findUnreconciledLedgerEntries
-      ($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'];
-      }
-    }
+      ($this->Account->accountReceivableAccountID(),
+       $fundamental_type,
+       array('LedgerEntry.customer_id' => $id));

    return $unreconciled;
  }
@@ -146,25 +134,11 @@ class Customer extends AppModel {
   */

  function reconcileNewLedgerEntry($id, $fundamental_type, $amount) {
-
    $reconciled = $this->Account->reconcileNewLedgerEntry
-      ($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,
+      ($this->Account->accountReceivableAccountID(),
       $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'];
-      }
-    }
+       $amount,
+       array('LedgerEntry.customer_id' => $id));

    return $reconciled;
  }
@@ -189,7 +163,6 @@ class Customer extends AppModel {
 	       'ContactEmail',
 	       'ContactAddress',
 	       ),
-	 'Account',
 	 'Lease' =>
 	 array('Unit' =>
 	       array('order'  => array('sort_order'),
@@ -201,22 +174,12 @@ class Customer extends AppModel {
 	'conditions' => array('Customer.id' => $id),
 	));

-    // 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.
+    // Figure out the outstanding balance for this customer
    $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;
  }

@@ -232,29 +195,11 @@ class Customer extends AppModel {
    if (!$id)
      return null;

-    // 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']);
+    $stats = $this->Account->stats($this->Account->accountReceivableAccountID(), true,
+				   array('LedgerEntry.customer_id' => $id));

+    // Pull to the top level and return
+    $stats = $stats['Ledger'];
    return $stats;
  }

--- a/site/models/lease.php
+++ b/site/models/lease.php
@@ -25,11 +25,18 @@ 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',
+	);
+
+
  /**************************************************************************
   **************************************************************************
   **************************************************************************
@@ -37,15 +44,7 @@ class Lease extends AppModel {
   *  - Returns the accountId of the given lease
   */
  function accountId($id) {
-    $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'];
+    return $this->Account->invoiceAccountID();
  }


@@ -61,6 +60,10 @@ 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);

@@ -87,7 +90,7 @@ class Lease extends AppModel {
    $entries = $this->Account->findLedgerEntriesRelatedToAccount
      ($this->accountId($id),
       $this->Account->securityDepositAccountID(),
-       true, null, $link);
+       true, array('LedgerEntry.lease_id' => $id), $link);

 /*     pr(array('function' => 'Lease::findSecurityDeposits', */
 /* 	     'args' => compact('id', 'link'), */
@@ -108,7 +111,7 @@ class Lease extends AppModel {

  function findUnreconciledLedgerEntries($id = null, $fundamental_type = null) {
    return $this->Account->findUnreconciledLedgerEntries
-      ($this->accountId($id), $fundamental_type);
+      ($this->accountId($id), $fundamental_type, array('LedgerEntry.lease_id' => $id));
  }


@@ -128,7 +131,7 @@ class Lease extends AppModel {

  function reconcileNewLedgerEntry($id, $fundamental_type, $amount) {
    return $this->Account->reconcileNewLedgerEntry
-      ($this->accountId($id), $fundamental_type, $amount);
+      ($this->accountId($id), $fundamental_type, $amount, array('LedgerEntry.lease_id' => $id));
  }


@@ -143,18 +146,11 @@ class Lease extends AppModel {
    if (!$id)
      return null;

-    // 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']);
+    $stats = $this->Account->stats($this->Account->accountReceivableAccountID(), true,
+				   array('LedgerEntry.lease_id' => $id));

+    // Pull to the top level and return
+    $stats = $stats['Ledger'];
    return $stats;
  }

--- a/site/models/ledger.php
+++ b/site/models/ledger.php
@@ -115,6 +115,9 @@ 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
@@ -138,8 +141,7 @@ class Ledger extends AppModel {
                      ) * IF(LedgerEntry.amount, LedgerEntry.amount, 0)
                   ) AS balance",
 	      "COUNT(LedgerEntry.id) AS entries"),
-	'conditions' => array(isset($cond) ? $cond : array(),
-			      array('Ledger.id' => $id)),
+	'conditions' => $cond,
 	'group' => 'Ledger.id',
 	));

--- a/site/models/ledger_entry.php
+++ b/site/models/ledger_entry.php
@@ -11,6 +11,8 @@ class LedgerEntry extends AppModel {
 	var $belongsTo = array(
 		'MonetarySource',
 		'Transaction',
+		'Customer',
+		'Lease',

 		'DebitLedger' => array(
 			'className' => 'Ledger',
@@ -84,7 +86,7 @@ class LedgerEntry extends AppModel {
    return $fields;
  }

-  function ledgerContextFields2($ledger_id = null, $account_type = null) {
+  function ledgerContextFields2($ledger_id = null, $account_id = null, $account_type = null) {
    $fields = array('id', 'name', 'comment', 'amount');

    if (isset($ledger_id)) {
@@ -93,20 +95,29 @@ class LedgerEntry extends AppModel {
      $fields[] = ("IF(LedgerEntry.credit_ledger_id = $ledger_id," .
 		   "   SUM(LedgerEntry.amount), NULL) AS credit");

-      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," .
+      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," .
 		     "    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
--- a/site/views/customers/view.ctp
+++ b/site/views/customers/view.ctp
@@ -63,12 +63,14 @@ echo $this->element('leases',


 /**********************************************************************
- * Account
+ * Customer Account History
 */

-echo $this->element('accounts',
+echo $this->element('ledger_entries',
 		    array('caption' => 'Account',
-			  'accounts' => array($customer['Account'])));
+			  'customer_id' => $customer['Customer']['id'],
+			  'ar_account' => true,
+			  ));


 /* End "detail supporting" div */
--- a/site/views/elements/jqGrid.ctp
+++ b/site/views/elements/jqGrid.ctp
@@ -143,8 +143,12 @@ foreach ($jqGridColumns AS &$col) {
 }

 // Set the default sort column
-reset($jqGridColumns);
-$sortname = current($jqGridColumns);
+if (isset($sort_column)) {
+  $sortname = $jqGridColumns[$sort_column];
+} else {
+  reset($jqGridColumns);
+  $sortname = current($jqGridColumns);
+}
 $sortname = $sortname['index'];

 // Configure the grid setup, giving priority to user defined parameters
@@ -185,10 +189,14 @@ $jqGrid_setup = array_merge

 jQuery(document).ready(function(){ 
  currencyFormatter = function(el, cellval, opts) {
+    if (!cellval)
+      return;
    $(el).html(fmtCurrency(cellval));
  }

  idFormatter = function(el, cellval, opts) {
+    if (!cellval)
+      return;
    $(el).html('#'+cellval);
  }

--- a/site/views/elements/ledger_entries.ctp
+++ b/site/views/elements/ledger_entries.ctp
@@ -1,5 +1,30 @@
 <?php /* -*- mode:PHP -*- */

+if (isset($account_ftype) || isset($ledger_id) || isset($account_id) || isset($ar_account)) {
+  $single_account = true;
+} else {
+  $single_account = false;
+}
+
+if (isset($ledger_id) || isset($account_id) || isset($ar_account)) {
+  $single_amount = false;
+} else {
+  $single_amount = true;
+}
+
+if (isset($reconcile_id)) {
+  $applied_amount = true;
+} else {
+  $applied_amount = false;
+}
+
+if (isset($account_ftype)) {
+  $subtotal_amount = false;
+} else {
+  $subtotal_amount = true;
+}
+
+
 // Define the table columns
 $cols = array();
 if (0) {
@@ -8,33 +33,45 @@ if (isset($notxgroup))
 else
  $cols['Transaction']    = array('index' => 'Transaction.id',      'formatter' => 'id');
 } else {
-  $notxgroup = true;
+  $notxgroup = false;
  $cols['Transaction']    = array('index' => 'Transaction.id',      'formatter' => 'id');
  $cols['Entry']          = array('index' => 'LedgerEntry.id',      'formatter' => 'id');
 }

 $cols['Date']           = array('index' => 'Transaction.stamp',   'formatter' => 'date');
-if (isset($account_ftype) || isset($ledger_id)) {
-  $cols['Account']      = array('index' => 'Account.name',        'formatter' => 'longname');
+
+if ($single_account) {
+  $cols['Account']      = array('index' => 'Account.name',        'formatter' => 'name');
 }
 else {
-  $cols['Debit Account']  = array('index' => 'DebitAccount.name',   'formatter' => 'longname');
-  $cols['Credit Account'] = array('index' => 'CreditAccount.name',  'formatter' => 'longname');
+  $cols['Debit Account']  = array('index' => 'DebitAccount.name',   'formatter' => 'name');
+  $cols['Credit Account'] = array('index' => 'CreditAccount.name',  'formatter' => 'name');
 }
+$cols['Customer']       = array('index' => 'Customer.name',       'formatter' => 'longname');
+$cols['Lease']          = array('index' => 'Lease.number',        'formatter' => 'id');
+$cols['Unit']           = array('index' => 'Unit.name',           'formatter' => 'name');
 $cols['Source']         = array('index' => 'MonetarySource.name', 'formatter' => 'name');
 $cols['Comment']        = array('index' => 'LedgerEntry.comment', 'formatter' => 'comment', 'width'=>150);
-if (isset($ledger_id)) {
+
+if ($single_amount) {
+  $cols['Amount']       = array('index' => 'LedgerEntry.amount',  'formatter' => 'currency');
+}
+else {
  $cols['Debit']        = array('index' => 'debit',               'formatter' => 'currency');
  $cols['Credit']       = array('index' => 'credit',              'formatter' => 'currency');
 }
-else {
-  $cols['Amount']       = array('index' => 'LedgerEntry.amount',  'formatter' => 'currency');
-}
-if (isset($reconcile_id)) {
+
+if ($applied_amount) {
  $cols['Applied']      = array('index' => "Reconciliation.amount", 'formatter' => 'currency');
 }

-$custom_post_data = compact('ledger_id', 'account_type', 'account_ftype', 'notxgroup');
+if ($subtotal_amount) {
+  $cols['Sub-Total']    = array('index' => 'subtotal',  'formatter' => 'currency', 'sortable' => false);
+}
+
+$custom_post_data = compact('ledger_id', 'account_id', 'ar_account',
+			    'account_type', 'account_ftype',
+			    'customer_id', 'lease_id', 'transaction_id', 'notxgroup');

 $jqGrid_options = array('jqGridColumns' => $cols,
 			'controller' => 'ledger_entries',
@@ -42,11 +79,6 @@ $jqGrid_options = array('jqGridColumns' => $cols,

 $jqGrid_options += compact('grid_div_id', 'grid_id', 'caption', 'grid_setup', 'limit');

-if (isset($ledger_id)) {
-  $jqGrid_options += array('action' => 'ledger',
-			   'limit' => 50);
-}
-
 if (isset($ledger_entries)) {
  $jqGrid_options += array('custom_ids' =>
 			   array_map(create_function('$data',
@@ -54,6 +86,10 @@ if (isset($ledger_entries)) {
 				     $ledger_entries),
 			   'limit' => 10);
 }
+else {
+  $jqGrid_options += array('action' => 'ledger',
+			   'limit' => 50);
+}

 if (isset($reconcile_id)) {
  $custom_post_data += compact('reconcile_id');
@@ -61,5 +97,6 @@ if (isset($reconcile_id)) {
 }

 $jqGrid_options += compact('custom_post_data');
+$jqGrid_options['sort_column'] = 'Date';
 echo $this->element('jqGrid', $jqGrid_options);

--- a/site/views/leases/view.ctp
+++ b/site/views/leases/view.ctp
@@ -11,7 +11,6 @@ echo '<div class="lease view">' . "\n";

 $lease_type  = $lease['LeaseType'];
 $customer    = $lease['Customer'];
-$account     = $lease['Account'];
 $unit        = $lease['Unit'];

 if (isset($lease['Lease']))
@@ -20,7 +19,7 @@ if (isset($lease['Lease']))
 $rows = array(array('ID',               $lease['id']),
 	      array('Number',           $lease['number']),
 	      array('Lease Type',       $lease_type['name']),
-	      array('Unit',             $html->link($unit['id'],
+	      array('Unit',             $html->link($unit['name'],
 						    array('controller' => 'units',
 							  'action'     => 'view',
 							  $unit['id']))),
@@ -36,10 +35,6 @@ $rows = array(array('ID',               $lease['id']),
 	      array('Notice Given',     FormatHelper::date($lease['notice_given_date'], true)),
 	      array('Notice Received',  FormatHelper::date($lease['notice_received_date'], true)),
 	      array('Closed',           FormatHelper::date($lease['close_date'], true)),
-	      array('Account',          $html->link($account['name'],
-						    array('controller' => 'accounts',
-							  'action'     => 'view',
-							  $account['id']))),
 	      array('Deposit',          FormatHelper::currency($lease['deposit'])),
 	      array('Rent',             FormatHelper::currency($lease['amount'])),
 	      array('Comment',          $lease['comment']));
@@ -53,7 +48,7 @@ echo $this->element('table',


 /**********************************************************************
- * Account Info Box
+ * Lease Info Box
 */

 echo '<div class="infobox">' . "\n";
@@ -80,15 +75,16 @@ echo '<div CLASS="detail supporting">' . "\n";


 /**********************************************************************
- * Current Ledger
+ * Lease Account History
 */

 echo $this->element('ledger_entries',
-		    array('caption' => "Current Ledger: (#{$account['id']}-{$account['CurrentLedger']['sequence']})",
-			  'ledger_id' => $account['CurrentLedger']['id'],
-			  'account_type' => $account['type'],
+		    array('caption' => 'Account',
+			  'lease_id' => $lease['id'],
+			  'ar_account' => true,
 			  ));

+
 /* End "detail supporting" div */
 echo '</div>' . "\n";

--- a/site/views/ledger_entries/view.ctp
+++ b/site/views/ledger_entries/view.ctp
@@ -13,6 +13,8 @@ $transaction    = $entry['Transaction'];
 $debit_ledger   = $entry['DebitLedger'];
 $credit_ledger  = $entry['CreditLedger'];
 $source         = $entry['MonetarySource'];
+$customer       = $entry['Customer'];
+$lease          = $entry['Lease'];
 $entry          = $entry['LedgerEntry'];

 $rows = array(array('ID',               $entry['id']),
@@ -21,8 +23,20 @@ $rows = array(array('ID',               $entry['id']),
 							  'action'     => 'view',
 							  $transaction['id']))),
 	      array('Timestamp',        FormatHelper::datetime($transaction['stamp'])),
-	      array('Monetary Source',  (isset($source['id'])
-					 ? $html->link('#'.$source['id'],
+	      array('Customer',         (isset($customer['name'])
+					 ? $html->link($customer['name'],
+						       array('controller' => 'customers',
+							     'action'     => 'view',
+							     $customer['id']))
+					 : null)),
+	      array('Lease',            (isset($lease['id'])
+					 ? $html->link('#'.$lease['id'],
+						       array('controller' => 'leases',
+							     'action'     => 'view',
+							     $lease['id']))
+					 : null)),
+	      array('Monetary Source',  (isset($source['name'])
+					 ? $html->link($source['name'],
 						       array('controller' => 'monetary_sources',
 							     'action'     => 'view',
 							     $source['id']))
@@ -67,12 +81,16 @@ echo $this->element('table',
 echo '<div class="infobox">' . "\n";
 $rows = array();
 if ($debit_ledger['Account']['trackable']) {
-  $rows[] = array('Debit Amount Reconciled:',  FormatHelper::currency($stats['debit_amount_reconciled']));
-  $rows[] = array('Debit Amount Remaining:',   FormatHelper::currency($stats['debit_amount_remaining']));
+  $rows[] = array("Applied from {$debit_ledger['Account']['name']}:",
+		  FormatHelper::currency($stats['debit_amount_reconciled']));
+  $rows[] = array("{$debit_ledger['Account']['name']} Amount Remaining:",
+		  FormatHelper::currency($stats['debit_amount_remaining']));
 }
 if ($credit_ledger['Account']['trackable']) {
-  $rows[] = array('Credit Amount Reconciled:',  FormatHelper::currency($stats['credit_amount_reconciled']));
-  $rows[] = array('Credit Amount Remaining:',   FormatHelper::currency($stats['credit_amount_remaining']));
+  $rows[] = array("Applied to {$credit_ledger['Account']['name']}:",
+		  FormatHelper::currency($stats['credit_amount_reconciled']));
+  $rows[] = array("{$credit_ledger['Account']['name']} Amount Remaining:",
+		  FormatHelper::currency($stats['credit_amount_remaining']));
 }
 echo $this->element('table',
 		    array('class'   => 'summary',
@@ -97,26 +115,25 @@ echo '<div CLASS="detail supporting">' . "\n";
 * Reconciliation Ledger Entries
 */

-echo $this->element('ledger_entries',
-		    array('caption'   => "Debit Applications",
+if ($debit_ledger['Account']['trackable']) {
+  echo $this->element('ledger_entries',
+		      array('caption'   => "Applied to " . $debit_ledger['Account']['name'],
 			    'grid_div_id'   => 'debit_reconciliation_ledger_entries',
-			  //'ledger_id'     => $debit_ledger['id'],
-			  //'account_type'  => $debit_ledger['Account']['type'],
 			    'account_ftype' => 'debit',
 			    'reconcile_id' => $entry['id'],
-			  'ledger_entries' => $reconciled['debit']['entry'],
+			    //'ledger_entries' => $reconciled['debit']['entry'],
 			    ));
+}

-echo $this->element('ledger_entries',
-		    array('caption'   => "Credit Applications",
+if ($credit_ledger['Account']['trackable']) {
+  echo $this->element('ledger_entries',
+		      array('caption'   => "Applied to " . $credit_ledger['Account']['name'],
 			    'grid_div_id'  => 'credit_reconciliation_ledger_entries',
-			  //'ledger_id'    => $credit_ledger['id'],
-			  //'account_type' => $credit_ledger['Account']['type'],
-			  //'account_ftype'  => 'debit', // Looking for debits to match this credit
 			    'account_ftype'  => 'credit',
 			    'reconcile_id' => $entry['id'],
-			  'ledger_entries' => $reconciled['credit']['entry'],
+			    //'ledger_entries' => $reconciled['credit']['entry'],
 			    ));
+}


 /* End "detail supporting" div */
--- a/site/views/transactions/view.ctp
+++ b/site/views/transactions/view.ctp
@@ -54,7 +54,8 @@ echo '<div CLASS="detail supporting">' . "\n";

 echo $this->element('ledger_entries',
 		    array('caption' => 'Entries in Transaction',
-			  'ledger_entries' => $transaction['LedgerEntry'],
+			  //'ledger_entries' => $transaction['LedgerEntry'],
+			  'transaction_id' => $transaction['Transaction']['id'],
 			  'notxgroup' => true,
 			  ));

--- a/site/views/units/view.ctp
+++ b/site/views/units/view.ctp
@@ -57,16 +57,16 @@ echo $this->element('leases',


 /**********************************************************************
- * Ledger History
+ * Current Tenant Lease Account History
 */
-/* foreach($unit['Lease'] AS $lease) { */
-/*   pr($lease); */
-/*   $caption = 'Lease #'.$lease['number'].' (Tenant: '.$lease['Customer']['name'].')'; */
-/*   echo $this->element('lease', */
-/* 		      array('caption' => $caption, */
-/* 			    'entries' => $lease['Customer']['Transaction'], */
-/* 			    'ledger'  => array('mix'=>1))); */
-/* } */
+
+echo $this->element('ledger_entries',
+		    array('caption' => ('Current Lease Account (' .
+					$unit['CurrentLease']['Customer']['name']
+					. ')'),
+			  'ar_account' => true,
+			  'lease_id' => $unit['CurrentLease']['id'],
+			  ));


 /* End "detail supporting" div */
--- a/site/webroot/css/layout.css
+++ b/site/webroot/css/layout.css
@@ -65,8 +65,10 @@ tr.evnrow      { background: #f4f4f4; }
 */

 table.detail           { width :  60%;
-			 float: left; }
-table.detail td.field  { width: 10em; }
+			 float : left; }
+table.detail td.field  { width : 10em; }
+
+table.item.detail td.value { white-space : normal; }

 div.detail.supporting  { clear : both;
 			 padding-top: 1.5em; }
Author	SHA1	Message	Date
abijah	0b69e065ae	Major change to invoice/receipt algorithms. The end result shouldn't be visible, but there were significant problems understanding how to reconcile entries and this cleaned things up significantly. There may be some bugs left, but quick tests show it to be working git-svn-id: file:///svn-source/pmgr/branches/charge_credit_20090629@190 97e9348a-65ac-dc4b-aefc-98561f571b83	2009-06-30 17:52:43 +00:00
abijah	1c8cc70a28	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@189 97e9348a-65ac-dc4b-aefc-98561f571b83	2009-06-30 04:47:18 +00:00
abijah	c6f68861b3	Branch to revert way way back and get down to simple items, even if it's not extensible. git-svn-id: file:///svn-source/pmgr/branches/charge_credit_20090629@188 97e9348a-65ac-dc4b-aefc-98561f571b83	2009-06-30 01:06:33 +00:00
abijah	ce4fa4131a	More changes. I just can't seem to come up with a solution that works that I like. The problem now, without invoice/receipt, is that one check cannot cleanly pay for two units. git-svn-id: file:///svn-source/pmgr/branches/single_AR_20090622@182 97e9348a-65ac-dc4b-aefc-98561f571b83	2009-06-24 00:33:39 +00:00
abijah	80f8bd36d5	Nowhere near done yet, but checking in a snapshot of semi-working code. There is some simultaneous support for both with and without use of the Invoice/Receipt account. I want to do away with them completely, but will need to change how sitelink payments are mapped (right now, they split a payment into multiple parts to match the charge). git-svn-id: file:///svn-source/pmgr/branches/single_AR_20090622@181 97e9348a-65ac-dc4b-aefc-98561f571b83	2009-06-23 19:04:41 +00:00
abijah	7aa1100cac	Moving to the standard accounting method of a single Account Receiveable. git-svn-id: file:///svn-source/pmgr/branches/single_AR_20090622@180 97e9348a-65ac-dc4b-aefc-98561f571b83	2009-06-22 23:46:03 +00:00