Added the gridview parameter, since we're not doing anything too complicated with grids. Updated the jqGrid css, some of which is just not longer needed, and some of which is broken by the move to jqGrid 3.5

git-svn-id: file:///svn-source/pmgr/branches/jqgrid_3.5@528 97e9348a-65ac-dc4b-aefc-98561f571b83
Preliminary move to jqGrid 3.5.1. It has proven troublesome to change over, although really, I've only found one compatibility break so far. The real problem has been the elimination of the jqGrid loader code. We now have to build the jqGrid package through a selection form on the jqGrid download page, and the errors made it difficult to determine that the package configuration was the problem (such as destroying the entire page content). It's working alright at the moment.
2009-08-11 07:08:54 +00:00 · 2009-08-11 04:43:33 +00:00 · 2009-08-11 04:11:45 +00:00
417 changed files with 1073 additions and 27096 deletions
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -471,6 +471,7 @@ CREATE TABLE `pmgr_units` (
                              'DIRTY',
                              'VACANT',
                              'OCCUPIED',
+                              'LATE', -- NOT SURE
                              'LOCKED',
                              'LIENED')
                           NOT NULL DEFAULT 'VACANT',
@@ -724,9 +725,6 @@ CREATE TABLE `pmgr_leases` (
  `notice_received_date` DATE DEFAULT NULL,
  `close_date`           DATE DEFAULT NULL,

-  `charge_through_date`  DATE DEFAULT NULL,
-  `paid_through_date`    DATE DEFAULT NULL,
-
  `deposit`              FLOAT(12,2) DEFAULT NULL,
  `rent`                 FLOAT(12,2) DEFAULT NULL,

@@ -874,46 +872,47 @@ CREATE TABLE `pmgr_accounts` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;

 LOCK TABLES `pmgr_accounts` WRITE;
+INSERT INTO `pmgr_accounts` (`type`, `name`, `level`)
+  VALUES
+  ('EQUITY',     'Equity',            1),
+  ('LIABILITY',  'Loan',              1);
 INSERT INTO `pmgr_accounts` (`type`, `name`)
  VALUES
  ('ASSET',      'A/R'                ),
-  ('LIABILITY',  'A/P'                ),
-  ('LIABILITY',  'Customer Credit'    );
-INSERT INTO `pmgr_accounts` (`type`, `name`, `receipts`)
-  VALUES
-  ('ASSET',      'Cash',              1),
-  ('ASSET',      'Check',             1),
-  ('ASSET',      'Money Order',       1),
-  ('ASSET',      'ACH',               1),
-  ('EXPENSE',    'Concession',        1);
-INSERT INTO `pmgr_accounts` (`type`, `name`)
-  VALUES
+-- REVISIT <AP>: 20090710 : We don't really need NSF, as it
+-- will always run a zero balance.  However, it will help
+-- us identify how serious the NSF situation is.
  ('ASSET',      'NSF'                ),
-  ('EXPENSE',    'Waiver'             ),
-  ('EXPENSE',    'Bad Debt'           );
+  ('LIABILITY',  'A/P'                );
+INSERT INTO `pmgr_accounts` (`type`, `name`, `receipts`, `refunds`)
+  VALUES
+  ('ASSET',      'Cash',              1, 0),
+  ('ASSET',      'Check',             1, 0),
+  ('ASSET',      'Money Order',       1, 0),
+  ('ASSET',      'ACH',               1, 0),
+  ('ASSET',      'Closing',           0, 0), -- REVISIT <AP>: Temporary
+  ('EXPENSE',    'Concession',        1, 0),
+  ('EXPENSE',    'Waiver',            0, 0);
+INSERT INTO `pmgr_accounts` (`type`, `name`, `refunds`, `deposits`)
+  VALUES
+-- REVISIT <AP>: 20090710 : We probably don't really want petty cash depositable.
+--                          This is just for testing our deposit code
+  ('ASSET',      'Petty Cash',        1, 1);
 INSERT INTO `pmgr_accounts` (`type`, `name`, `invoices`)
  VALUES
-  ('LIABILITY',  'Tax',               0),
+  ('LIABILITY',  'Tax',               1),
  ('LIABILITY',  'Security Deposit',  1),
  ('INCOME',     'Rent',              1),
  ('INCOME',     'Late Charge',       1),
  ('INCOME',     'NSF Charge',        1),
-  ('INCOME',     'Cleaning',          1),
  ('INCOME',     'Damage',            1);
+INSERT INTO `pmgr_accounts` (`type`, `name`, `deposits`, `refunds`)
+  VALUES
+  ('ASSET',      'Bank',              1, 1);
 INSERT INTO `pmgr_accounts` (`type`, `name`)
  VALUES
+  ('EXPENSE',    'Bad Debt'           ),
  ('EXPENSE',    'Maintenance'        );
-INSERT INTO `pmgr_accounts` (`type`, `name`, `refunds`)
-  VALUES
-  ('ASSET',      'Petty Cash',        1);
-INSERT INTO `pmgr_accounts` (`type`, `name`, `level`, `deposits`, `refunds`)
-  VALUES
-  ('ASSET',      'Bank',              6, 1, 1);
-INSERT INTO `pmgr_accounts` (`type`, `name`, `level`)
-  VALUES
-  ('ASSET',      'Closing',           6),
-  ('LIABILITY',  'Loan',              1),
-  ('EQUITY',     'Equity',            1);
 UNLOCK TABLES;


@@ -971,7 +970,6 @@ CREATE TABLE `pmgr_transactions` (
 			      'CREDIT_NOTE', -- Inverse of Sales Invoice
 			      'PAYMENT', -- Actual payment
                              'DEPOSIT',
-                              'WITHDRAWAL',
                              'CLOSE',   -- Essentially an internal (not accounting) transaction
 --                               'CREDIT',
 --                               'REFUND',
@@ -1121,9 +1119,6 @@ CREATE TABLE `pmgr_statement_entries` (
  -- Allow the disbursement to reconcile against the charge
  `charge_entry_id`      INT(10) UNSIGNED DEFAULT NULL,

-  -- The transaction that reversed this charge, if any
-  `reverse_transaction_id` INT(10) UNSIGNED DEFAULT NULL,
-
  `comment`              VARCHAR(255) DEFAULT NULL,

  PRIMARY KEY (`id`)
--- a/db/scratch.sql
+++ b/db/scratch.sql
@@ -1,85 +0,0 @@
-- Delete bad transaction(s)
-DELETE M
- FROM 
- pmgr_ledger_entries LE,
- pmgr_tenders M
- WHERE 
- M.ledger_entry_id = LE.id AND
- LE.transaction_id
- IN (467);
-DELETE LE
- FROM 
- pmgr_ledger_entries LE
- WHERE 
- LE.transaction_id
- IN (467);
-DELETE SE
- FROM 
- pmgr_statement_entries SE
- WHERE 
- SE.transaction_id
- IN (467);
-DELETE T
- FROM 
- pmgr_transactions T
- WHERE 
- T.id
- IN (467);
-
-- Delete bad transaction, one variable setting
-SET @tid = 467;
-DELETE M FROM  pmgr_ledger_entries LE, pmgr_tenders M
- WHERE M.ledger_entry_id = LE.id AND LE.transaction_id = @tid;
-DELETE LE FROM pmgr_ledger_entries LE
- WHERE LE.transaction_id = @tid;
-DELETE SE FROM pmgr_statement_entries SE
- WHERE SE.transaction_id = @tid;
-DELETE T FROM pmgr_transactions T
- WHERE T.id = @tid;
-
-
-- Determine economic conditions
-SELECT `status`, COUNT(id), SUM(rent) FROM pmgr_units
-GROUP BY `status` WITH ROLLUP;
-
-
-- Check that transaction totals add up correctly
-SELECT T.id, T.type, T.amount,
-- T.type, A.type, E.crdr,
- SUM(IF(E.account_id = T.account_id,
-        IF(A.type IN ('ASSET','EXPENSE') XOR E.crdr='DEBIT',-1,1),0)
-     *E.amount) AS Tamt,  
- SUM(IF(E.account_id = T.account_id,
-        0,IF(A.type IN ('ASSET','EXPENSE') XOR E.crdr='DEBIT',-1,1))
-     *E.amount) AS Oamt,  
- COUNT(E.id) AS Ecnt
-FROM pmgr_transactions T
-- LEFT JOIN pmgr_statement_entries E ON E.transaction_id = T.id  
- LEFT JOIN pmgr_ledger_entries E ON E.transaction_id = T.id 
- LEFT JOIN pmgr_accounts A ON A.id = T.account_id -- E.account_id
-- WHERE 
- -- E.account_id != T.account_id
- GROUP BY T.id 
-   HAVING
-    (T.type = 'INVOICE' AND Tamt <> T.amount) 
-      OR      
-    (T.type <> 'INVOICE' AND Oamt <> T.amount)    
-      OR      
-    (Tamt * -1 <> Oamt)
-
-
-- Verify that statement entries all have the correct type
-SELECT SE.id, SE.type, T.id, T.type
- FROM pmgr_statement_entries SE
- LEFT JOIN pmgr_transactions T ON T.id = SE.transaction_id 
-WHERE
- ((T.type = 'RECEIPT' OR T.type = 'CREDIT_NOTE') AND
-  SE.type NOT IN ('DISBURSEMENT', 'WAIVER', 'REVERSAL', 'WRITEOFF', 'SURPLUS')
- ) 
- OR
- ((T.type = 'INVOICE' OR T.type = 'PAYMENT') AND
-  SE.type NOT IN ('CHARGE', 'PAYMENT', 'REFUND')
- )  
- -- catch other types not considered in this query
- OR T.type NOT IN ('RECEIPT', 'CREDIT_NOTE', 'INVOICE', 'PAYMENT')
-
--- a/scripts/sitelink2pmgr.pl
+++ b/scripts/sitelink2pmgr.pl
@@ -555,7 +555,9 @@ foreach my $tender_name ('Cash', 'Check', 'Money Order', 'ACH',
   ($name1, $name_field) = ('Money Order Number', 'data1')
      if ($tender_name eq 'Money Order');

-   ($name1, $name2, $name3, $name_field) = ('Routing Number', 'Account Number', 'Batch Number', 'data3')
+   # REVISIT <AP>: 20090810
+   #  Make data3 be the confirmation number?
+   ($name1, $name2) = ('Routing Number', 'Account Number')
      if ($tender_name eq 'ACH');

   ($name1, $name2) = ('Debit Card Number', 'Expiration Date')
--- a/site/app_controller.php
+++ b/site/app_controller.php
@@ -38,95 +38,29 @@ class AppController extends Controller {
  var $helpers = array('Html', 'Form', 'Javascript', 'Format', 'Time', 'Grid');
  var $components = array('DebugKit.Toolbar');

-  function __construct() {
-    $this->params['dev']   = false;
-    $this->params['admin'] = false;
-    parent::__construct();
-  }
-
  function sideMenuLinks() {
-    // Stupid Cake... our constructor sets admin/dev,
-    // but cake stomps it somewhere along the way
-    // after constructing the CakeError controller.
-    if ($this->name === 'CakeError') {
-      $this->params['dev']   = false;
-      $this->params['admin'] = false;
-    }
-
-    $menu = array();
-    $menu[] = array('name' => 'Common',      'header' => true);
-    $menu[] = array('name' => 'Site Map',    'url' => array('controller' => 'maps',       'action' => 'view', 1));
-    $menu[] = array('name' => 'Units',       'url' => array('controller' => 'units',      'action' => 'index'));
-    $menu[] = array('name' => 'Leases',      'url' => array('controller' => 'leases',     'action' => 'index'));
-    $menu[] = array('name' => 'Customers',   'url' => array('controller' => 'customers',  'action' => 'index'));
-    $menu[] = array('name' => 'Deposits',    'url' => array('controller' => 'transactions', 'action' => 'deposit'));
-
-    if ($this->params['admin']) {
-      $menu[] = array('name' => 'Admin',      'header' => true);
-      $menu[] = array('name' => 'Accounts',    'url' => array('controller' => 'accounts',   'action' => 'index'));
-      $menu[] = array('name' => 'Contacts',    'url' => array('controller' => 'contacts',   'action' => 'index'));
-      $menu[] = array('name' => 'Ledgers',     'url' => array('controller' => 'ledgers',    'action' => 'index'));
-      $menu[] = array('name' => 'Tenders',     'url' => array('controller' => 'tenders', 'action' => 'index'));
-      $menu[] = array('name' => 'Transactions', 'url' => array('controller' => 'transactions', 'action' => 'index'));
-      $menu[] = array('name' => 'Ldgr Entries', 'url' => array('controller' => 'ledger_entries', 'action' => 'index'));
-      $menu[] = array('name' => 'Stmt Entries', 'url' => array('controller' => 'statement_entries', 'action' => 'index'));
-      $menu[] = array('name' => 'New Ledgers', 'url' => array('controller' => 'accounts',   'action' => 'newledger'));
-      $menu[] = array('name' => 'Assess Charges', 'url' => array('controller' => 'leases', 'action' => 'assess_all'));
-    }
-
-    if ($this->params['dev']) {
-      $menu[] = array('name' => 'Development', 'header' => true);
-      $menu[] = array('name' => 'Un-Nuke',    'url' => '#', 'htmlAttributes' =>
-		      array('onclick' => '$(".pr-section").show(); return false;'));
-      $menu[] = array('name' => 'New Ledgers', 'url' => array('controller' => 'accounts',    'action' => 'newledger'));
-      //array('name' => 'RESET DATA',  'url' => array('controller' => 'accounts',   'action' => 'reset_data'));
-    }
-
-    return $menu;
-  }
-
-  function beforeFilter() {
-    $this->params['dev'] =
-      (!empty($this->params['dev_route']));
-    $this->params['admin'] =
-      (!empty($this->params['admin_route']) || !empty($this->params['dev_route']));
-
-    if (!$this->params['dev'])
-      Configure::write('debug', '0');
+    return array(
+		 array('name' => 'Common',      'header' => true),
+		 array('name' => 'Site Map',    'url' => array('controller' => 'maps',       'action' => 'view', 1)),
+		 array('name' => 'Units',       'url' => array('controller' => 'units',      'action' => 'index')),
+		 array('name' => 'Leases',      'url' => array('controller' => 'leases',     'action' => 'index')),
+		 array('name' => 'Customers',   'url' => array('controller' => 'customers',  'action' => 'index')),
+		 array('name' => 'Accounts',    'url' => array('controller' => 'accounts',   'action' => 'index')),
+		 array('name' => 'Deposits',    'url' => array('controller' => 'transactions', 'action' => 'deposit')),
+		 array('name' => 'Debug',      'header' => true),
+		 array('name' => 'Un-Nuke',    'url' => '#', 'htmlAttributes' =>
+		       array('onclick' => '$(".pr-section").show(); return false;')),
+		 array('name' => 'Contacts',    'url' => array('controller' => 'contacts',   'action' => 'index')),
+		 array('name' => 'Ledgers',     'url' => array('controller' => 'ledgers',    'action' => 'index')),
+		 //array('name' => 'New Ledgers', 'url' => array('controller' => 'accounts',    'action' => 'newledger')),
+		 //array('name' => 'RESET DATA',  'url' => array('controller' => 'accounts',   'action' => 'reset_data')),
+		 );
  }

  function beforeRender() {
    $this->set('sidemenu', $this->sideMenuLinks());
  }

-  function redirect($url, $status = null, $exit = true) {
-    // OK, since the controller will not be able to
-    // utilize our overriden url function in AppHelper,
-    // we'll have to do it manually here.
-    App::import('Helper', 'Html');
-    $url = HtmlHelper::url($url, true);
-
-    if (headers_sent()) {
-      // If we've already sent the headers, it's because
-      // we're debugging, and our debug output has gotten
-      // out before the redirect.  That's probably a good
-      // thing, as we don't typically want pages to be
-      // jerked out from under us while trying to read
-      // the debug output.  So, since we can't redirect
-      // anyway, we may as well go with the flow and just
-      // render this page instead, using an empty template
-      $this->set('message',
-		 ("Intended redirect:<P><BR>" .
-		  '<A HREF="'.$url.'">'.$url.'</A>'));
-
-      echo $this->render('/empty');
-      if ($exit)
-	$this->_stop();
-    }
-
-    return parent::redirect($url, $status, $exit);
-  }
-
  function reset_data() {
    $this->layout = null;
    $this->autoLayout = false;
@@ -228,10 +162,16 @@ class AppController extends Controller {
  }

  function gridDataSetup(&$params) {
-    // Debug only if requested
-    $params['debug'] = !empty($this->passedArgs['debug']);
+    // Assume we're debugging.
+    // The actual grid request will set this to false
+    $debug = true;

-    if ($params['debug']) {
+    if (isset($this->passedArgs['debug']))
+      $debug = $this->passedArgs['debug'];
+
+    $params['debug'] = $debug;
+
+    if ($debug) {
      ob_start();
    }
    else {
@@ -713,7 +653,7 @@ class AppController extends Controller {
    foreach ($records AS &$record) {
      // Add the calculated fields (if any), to the model fields
      if (isset($record[0])) {
-	$record[$model_alias] = $record[0] + $record[$model_alias];
+	$record[$model_alias] += $record[0];
 	unset($record[0]);
      }
    }
@@ -755,12 +695,9 @@ class AppController extends Controller {
    if (isset($params['post']['nolinks']))
      return;

-    App::import('Helper', 'Html');
-
    foreach ($links AS $table => $fields) {
-      $special = array('controller', 'action', 'id');
+      $special = array('controller', 'id');
      $controller = Inflector::pluralize(Inflector::underscore($table));
-      $action = 'view';
      $id = 'id';
      extract(array_intersect_key($fields, array_flip($special)));
      foreach ($records AS &$record) {
@@ -775,9 +712,9 @@ class AppController extends Controller {
 	  //$params['linkrecord'][] = compact('table', 'field', 'id', 'controller', 'record');
 	  $record[$table][$field] =
 	    '<A HREF="' .
-	    HtmlHelper::url(array('controller' => $controller,
-				  'action' => $action,
-				  $record[$table][$id])) .
+	    Router::url(array('controller' => $controller,
+			      'action' => 'view',
+			      $record[$table][$id])) .
 	    '">' .
 	    $record[$table][$field] .
 	    '</A>';
@@ -867,15 +804,5 @@ class AppController extends Controller {
      echo "  <cell><![CDATA[$data]]></cell>\n"; 
  }

-  function INTERNAL_ERROR($msg, $depth = 0) {
-    INTERNAL_ERROR($msg, false, $depth+1);
-    $this->render_empty();
-    $this->_stop();
-  }
-
-  function render_empty() {
-    $this->render('/empty');
-  }
-
 }
 ?>
--- a/site/app_helper.php
+++ b/site/app_helper.php
@@ -37,14 +37,5 @@ App::import('Core', 'Helper');
 * @subpackage    cake.cake
 */
 class AppHelper extends Helper {
-
-  function url($url = null, $full = false) {
-    foreach(array('admin_route', 'dev_route') AS $mod) {
-      if (isset($this->params[$mod]) && is_array($url) && !isset($url[$mod]))
-            $url[$mod] = $this->params[$mod];
-    }
-    return parent::url($url, $full);
-  }
-
 }
 ?>
--- a/site/app_model.php
+++ b/site/app_model.php
@@ -402,10 +402,6 @@ class AppModel extends Model {
  }


-  function filter_null($array) {
-    return array_diff_key($array, array_filter($array, 'is_null'));
-  }
-
  function recursive_array_replace($find, $replace, &$data) {
    if (!isset($data))
      return;
@@ -480,12 +476,4 @@ class AppModel extends Model {
      return date('Y-m-d', strtotime($dateString));
  }

-  function INTERNAL_ERROR($msg, $depth = 0) {
-    INTERNAL_ERROR($msg, false, $depth+1);
-    echo $this->requestAction(array('controller' => 'accounts',
-				    'action' => 'render_empty'),
-			      array('return', 'bare' => false)
-			      );
-    $this->_stop();
-  }
 }
--- a/site/config/bootstrap.php
+++ b/site/config/bootstrap.php
@@ -32,17 +32,16 @@
 *
 */

-function INTERNAL_ERROR($message, $exit = true, $drop = 0) {
-  echo '<DIV class="internal-error" style="color:#000; background:#c22; padding:0.5em 1.5em 0.5em 1.5em;">' . "\n";
-  echo '<H1 style="color:#000; margin-bottom:0.2em; font-size:2em;">INTERNAL ERROR:</H1>' . "\n";
-  echo '<H2 style="color:#000; margin-top:0; margin-left:1.5em; font-size:1.5em">' . $message . '</H2>' . "\n";
-  echo '<H4 style="color:#000;">This error was not caused by anything that you did wrong.' . "\n";
-  echo '<BR>It is a problem within the application itself and should be reported to the administrator.</H4>' . "\n";
+function INTERNAL_ERROR($message) {
+  echo '<DIV class="internal-error" style="color:#000; background:#c22; padding:0.5em 1.5em 0.5em 1.5em;">';
+  echo '<H1 style="margin-bottom:0.2em">INTERNAL ERROR:</H1>';
+  echo '<H2 style="margin-top:0; margin-left:1.5em">' . $message . '</H2>';
+  echo '<H4>This error was not caused by anything that you did wrong.';
+  echo '<BR>It is a problem within the application itself and should be reported to the administrator.</H4>';

  // Print out the entire stack trace
-  echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nStack Trace:\n";
-  echo '<OL style="margin-left:1.5em";>' . "\n";
-  $trace = array_slice(debug_backtrace(false), $drop);
+  echo "<HR>Stack Trace:<OL>";
+  $trace = debug_backtrace(false);
  for ($i = 0; $i < count($trace); ++$i) {
    $bline = $trace[$i]['line'];
    $bfile = $trace[$i]['file'];
@@ -59,16 +58,10 @@ function INTERNAL_ERROR($message, $exit = true, $drop = 0) {

    echo("<LI>$bfile:$bline (" . ($bclas ? "$bclas::$bfunc" : "entry point") . ")</LI>\n");
  }
-  echo "</OL>\n";
-
-  echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nHTTP Request:\n";
-  echo '<P><PRE style="color:#000; background:#c22;">' . "\n";
-  print_r($_REQUEST);
-  echo "\n</PRE>\n";
+  echo '</OL>';

  echo '</DIV>';
-  if ($exit)
-    die();
+  die();
 }

 /**
--- a/site/config/routes.php
+++ b/site/config/routes.php
@@ -32,20 +32,6 @@
 * It's hardcoded to map #1, but at some point we'll implement
 * a login mechanism and the default path will be to log on instead.
 */
-Router::connect('/', array('controller' => 'maps', 'action' => 'view', '1'));
-
-/*
- * Route for admin functionality
- */
-Router::connect('/admin/:controller/:action/*',
-		array('action' => null, 'admin_route' => true)
-		);
-
-/*
- * Route for development functionality
- */
-Router::connect('/dev/:controller/:action/*',
-		array('action' => null, 'dev_route' => true)
-		);
+	Router::connect('/', array('controller' => 'maps', 'action' => 'view', '1'));

 ?>
--- a/site/controllers/accounts_controller.php
+++ b/site/controllers/accounts_controller.php
@@ -90,10 +90,6 @@ class AccountsController extends AppController {
      $conditions[] = array('Account.type' => strtoupper($params['action']));
    }

-    // REVISIT <AP>: 20090811
-    //  No security issues have been worked out yet
-    $conditions[] = array('Account.level >=' => 10);
-
    return $conditions;
  }

@@ -143,9 +139,12 @@ class AccountsController extends AppController {
    $account = $this->Account->read(null, $id);
    $account = $account['Account'];

-    $accounts = $this->Account->collectableAccounts();
-    $payment_accounts = $accounts['all'];
-    $default_accounts = $accounts['default'];
+    $payment_accounts = $this->Account->collectableAccounts();
+    //$payment_accounts[$this->Account->nameToID('Closing')] = 'Closing';
+    //$payment_accounts[$this->Account->nameToID('Equity')] = 'Equity';
+    //$payment_accounts[$id] = 'Reversals';
+    $default_accounts = array_diff_key($this->Account->receiptAccounts(),
+				       array($this->Account->concessionAccountID() => 1));
    $this->set(compact('payment_accounts', 'default_accounts'));

    $title = ($account['name'] . ': Collected Report');
@@ -161,6 +160,12 @@ class AccountsController extends AppController {
   */

  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    // Get details about the account and its ledgers (no ledger entries yet)
    $account = $this->Account->find
      ('first',
       array('contain' =>
@@ -172,18 +177,14 @@ class AccountsController extends AppController {
 		   array('CloseTransaction' => array
 			 ('order' => array('CloseTransaction.stamp' => 'DESC'))),
 		   ),
-	     'conditions' => array(array('Account.id' => $id),
-				   // REVISIT <AP>: 20090811
-				   //  No security issues have been worked out yet
-				   array('Account.level >=' => 10),
-				   ),
+	     'conditions' => array(array('Account.id' => $id)),
 	     )
       );

-    if (empty($account)) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
+    // Get all ledger entries of the CURRENT ledger
+    $entries = $this->Account->ledgerEntries($id);
+    //pr(compact('entries'));
+    $account['CurrentLedger']['LedgerEntry'] = $entries;

    // Obtain stats across ALL ledgers for the summary infobox
    $stats = $this->Account->stats($id, true);
@@ -201,4 +202,8 @@ class AccountsController extends AppController {
    $this->set(compact('account', 'title', 'stats'));
  }

+  function tst($id) {
+    //$entries = $this->Account->($id);
+    pr($entries);
+  }
 }
--- a/site/controllers/contacts_controller.php
+++ b/site/controllers/contacts_controller.php
@@ -126,6 +126,8 @@ class ContactsController extends AppController {

      // Now that the work is done, let the user view the updated contact
      $this->redirect(array('action'=>'view', $this->data['Contact']['id']));
+      //$this->render('/empty');
+      return;
    }

    if ($id) {
--- a/site/controllers/customers_controller.php
+++ b/site/controllers/customers_controller.php
@@ -287,20 +287,23 @@ class CustomersController extends AppController {
      if (isset($this->params['form']['cancel'])) {
 	if (isset($this->data['Customer']['id']))
 	  $this->redirect(array('action'=>'view', $this->data['Customer']['id']));
-
-	$this->redirect(array('action'=>'index'));
+	else
+	  $this->redirect(array('action'=>'index'));
+	return;
      }

      // Make sure we have at least one contact
      if (!isset($this->data['Contact']) || count($this->data['Contact']) == 0) {
 	$this->Session->setFlash("MUST SPECIFY AT LEAST ONE CONTACT", true);
 	$this->redirect(array('action'=>'view', $this->data['Customer']['id']));
+	return;
      }

      // Make sure there is a primary contact
      if (!isset($this->data['Customer']['primary_contact_entry'])) {
 	$this->Session->setFlash("MUST SPECIFY A PRIMARY CONTACT", true);
 	$this->redirect(array('action'=>'view', $this->data['Customer']['id']));
+	return;
      }

      // Go through each customer and strip the bogus ID if new
@@ -317,12 +320,17 @@ class CustomersController extends AppController {
 	pr("CUSTOMER SAVE FAILED");
      }

-      // If existing customer, then view it.
+      // If existing customer, then view it.  Otherwise, since
+      // this is a new customer, go to the move in screen.
      if ($this->data['Customer']['id'])
 	$this->redirect(array('action'=>'view', $this->Customer->id));
+      else
+	$this->redirect(array('action'=>'move_in', $this->Customer->id));

-      // Since this is a new customer, go to the move in screen.
-      $this->redirect(array('action'=>'move_in', $this->Customer->id));
+      // For debugging, only if the redirects above have been
+      // commented out, otherwise this section isn't reached.
+      $this->render('/empty');
+      return;
    }

    if ($id) {
@@ -371,9 +379,20 @@ class CustomersController extends AppController {
      $this->Customer->recursive = -1;
      $customer = $this->Customer->read(null, $id);
      $customer = $customer['Customer'];
+      $unreconciled = $this->Customer->unreconciledCharges($id);
+      //pr($unreconciled);
+      $charges = $unreconciled['entries'];
+      $stats = $unreconciled['summary']['Charge'];
+      // Kludge until we update receipt to have the unpaid
+      // charges grid generated from a dynamic query instead
+      // of simply pre-providing the list of charge IDs
+      foreach ($charges AS &$charge)
+	$charge['id'] = $charge['StatementEntry']['id'];
    }
    else {
      $customer = null;
+      $charges = array();
+      $stats = array('balance' => 0);
    }

    $TT = new TenderType();
@@ -382,7 +401,7 @@ class CustomersController extends AppController {
    $this->set(compact('payment_types', 'default_type'));

    $title = ($customer['name'] . ': Receipt Entry');
-    $this->set(compact('customer', 'title'));
+    $this->set(compact('customer', 'charges', 'stats', 'title'));
  }


@@ -453,4 +472,50 @@ class CustomersController extends AppController {
    $this->render('/transactions/bad_debt');
  }

+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: unreconciled
+   *  - returns the list of unreconciled entries
+   */
+
+  function unreconciled($id) {
+
+    //$this->layout = 'ajax';
+    $this->layout = null;
+    $this->autoLayout = false;
+    $this->autoRender = false;
+    Configure::write('debug', '0');
+    header("Content-type: text/xml;charset=utf-8");
+
+    App::import('Helper', 'Xml');
+    $xml = new XmlHelper();
+
+    // Find the unreconciled entries, then manipulate the structure
+    // slightly to accomodate the format necessary for XML Helper.
+    $unreconciled = $this->Customer->unreconciledCharges($id);
+
+    foreach ($unreconciled['entries'] AS &$entry)
+      $entry = array_intersect_key($entry['StatementEntry'],
+				   array('id'=>1));
+
+    $unreconciled = array('entries' =>
+			  array('entry'   => $unreconciled['entries'],
+				'balance' => $unreconciled['summary']['balance']));
+
+    // XML Helper will dump an empty tag if the array is empty
+    if (empty($unreconciled['entries']['entry']))
+      unset($unreconciled['entries']['entry']);
+
+/*     pr(compact('unreconciled')); */
+/*     echo htmlspecialchars($xml->serialize($unreconciled)); */
+/*     $this->render('/fake'); */
+
+    $opts = array();
+    //$opts['format'] = 'tags';
+    echo $xml->header();
+    echo $xml->serialize($unreconciled, $opts);
+  }
+
 }
--- a/site/controllers/double_entries_controller.php
+++ b/site/controllers/double_entries_controller.php
@@ -36,28 +36,6 @@ class DoubleEntriesController extends AppController {
 	     'conditions' => array('DoubleEntry.id' => $id),
 	     ));

-    $entry += $this->DoubleEntry->DebitEntry->Transaction->find
-      ('first',
-       array('contain' => false,
-	     'conditions' => array('id' => $entry['DebitEntry']['transaction_id']),
-	     ));
-
-    $entry += $this->DoubleEntry->DebitEntry->find
-      ('first',
-       array('contain' => array('Ledger' => array('Account')),
-	     'conditions' => array('DebitEntry.id' => $entry['DebitEntry']['id']),
-	     ));
-    $entry['DebitLedger'] = $entry['Ledger'];
-    unset($entry['Ledger']);
-
-    $entry += $this->DoubleEntry->CreditEntry->find
-      ('first',
-       array('contain' => array('Ledger' => array('Account')),
-	     'conditions' => array('CreditEntry.id' => $entry['CreditEntry']['id']),
-	     ));
-    $entry['CreditLedger'] = $entry['Ledger'];
-    unset($entry['Ledger']);
-
    // Prepare to render.
    $title = "Double Ledger Entry #{$entry['DoubleEntry']['id']}";
    $this->set(compact('entry', 'title'));
--- a/site/controllers/leases_controller.php
+++ b/site/controllers/leases_controller.php
@@ -3,11 +3,10 @@
 class LeasesController extends AppController {

  var $sidemenu_links =
-    array(array('name' => 'Leases',     'header' => true),
-	  array('name' => 'Active',     'url' => array('controller' => 'leases', 'action' => 'active')),
-	  array('name' => 'Closed',     'url' => array('controller' => 'leases', 'action' => 'closed')),
-	  array('name' => 'Delinquent', 'url' => array('controller' => 'leases', 'action' => 'delinquent')),
-	  array('name' => 'All',        'url' => array('controller' => 'leases', 'action' => 'all')),
+    array(array('name' => 'Leases',   'header' => true),
+	  array('name' => 'Active',   'url' => array('controller' => 'leases', 'action' => 'active')),
+	  array('name' => 'Closed',   'url' => array('controller' => 'leases', 'action' => 'closed')),
+	  array('name' => 'All',      'url' => array('controller' => 'leases', 'action' => 'all')),
 	  );


@@ -29,11 +28,10 @@ class LeasesController extends AppController {
   *  - Generate a listing of leases
   */

-  function index()      { $this->all(); }
-  function active()     { $this->gridView('Active Leases'); }
-  function delinquent() { $this->gridView('Delinquent Leases'); }
-  function closed()     { $this->gridView('Closed Leases'); }
-  function all()        { $this->gridView('All Leases', 'all'); }
+  function index()    { $this->all(); }
+  function active()   { $this->gridView('Active Leases'); }
+  function closed()   { $this->gridView('Closed Leases'); }
+  function all()      { $this->gridView('All Leases', 'all'); }


  /**************************************************************************
@@ -65,8 +63,6 @@ class LeasesController extends AppController {

  function gridDataFields(&$params, &$model) {
    $fields = parent::gridDataFields($params, $model);
-    $fields[] = ("IF(" . $this->Lease->conditionDelinquent() . "," .
-		 "   'DELINQUENT', 'CURRENT') AS 'status'");
    return array_merge($fields,
 		       $this->Lease->StatementEntry->chargeDisbursementFields(true));
  }
@@ -77,9 +73,6 @@ class LeasesController extends AppController {
    if ($params['action'] === 'active') {
      $conditions[] = 'Lease.close_date IS NULL';
    }
-    elseif ($params['action'] === 'delinquent') {
-      $conditions[] = $this->Lease->conditionDelinquent();
-    }
    elseif ($params['action'] === 'closed') {
      $conditions[] = 'Lease.close_date IS NOT NULL';
    }
@@ -158,6 +151,10 @@ class LeasesController extends AppController {
    // Since this is a new lease, go to the invoice
    // screen so we can start assessing charges.
    $this->redirect(array('action'=>'invoice', $lid, 'move-in'));
+
+    // For debugging, only if the redirect above have been
+    // commented out, otherwise this section isn't reached.
+    $this->render('/empty');
  }

  /**************************************************************************
@@ -174,7 +171,9 @@ class LeasesController extends AppController {

      $this->Lease->moveOut($this->data['Lease']['id'],
 			    'VACANT',
-			    $this->data['Lease']['moveout_date']
+			    $this->data['Lease']['moveout_date'],
+			    //true // Close this lease, if able
+			    false
 			    );

      $this->redirect($this->data['redirect']);
@@ -227,6 +226,8 @@ class LeasesController extends AppController {

 /*   function promote_surplus($id) { */
 /*     $this->Lease->promoteSurplus($id); */
+/*     pr("PREVENTING REDIRECT"); */
+/*     $this->render('fake'); */
 /*     $this->redirect(array('controller' => 'leases', */
 /* 			  'action' => 'view', */
 /* 			  $id)); */
@@ -336,7 +337,7 @@ class LeasesController extends AppController {
    // REVISIT <AP>: 20090708
    //  We should probably seek confirmation first...
    if (!$this->Lease->closeable($id)) {
-      $this->INTERNAL_ERROR("This lease is not ready to close");
+      INTERNAL_ERROR("This lease is not ready to close");
      $this->redirect(array('action'=>'view', $id));
    }

@@ -417,18 +418,12 @@ class LeasesController extends AppController {

  function assess_rent($date = null) {
    $this->Lease->assessMonthlyRentAll($date);
-    $this->redirect(array('action'=>'index'));
  }
  function assess_late($date = null) {
    $this->Lease->assessMonthlyLateAll($date);
-    $this->redirect(array('action'=>'index'));
-  }
-  function assess_all($date = null) {
-    $this->Lease->assessMonthlyRentAll($date);
-    $this->Lease->assessMonthlyLateAll($date);
-    $this->redirect(array('action'=>'index'));
  }

+
  /**************************************************************************
   **************************************************************************
   **************************************************************************
@@ -447,18 +442,21 @@ class LeasesController extends AppController {
      ('first',
       array('contain' =>
 	     array(// Models
-		   'LeaseType(id,name)',
-		   'Unit(id,name)',
-		   'Customer(id,name)',
+		   'LeaseType',
+		   'Unit',
+		   'Customer',
 		   ),
-	     'fields' => array('Lease.*', $this->Lease->delinquentField()),
 	     'conditions' => array(array('Lease.id' => $id)),
 	     )
       );
-    $lease['Lease'] += $lease[0];
-    unset($lease[0]);

-    // Figure out the outstanding balances for this lease
+    $lease['Lease']['paid_through'] = $this->Lease->rentPaidThrough($id);
+
+
+    $this->set('charge_gaps', $this->Lease->rentChargeGaps($id));
+    $this->set('charge_through', $this->Lease->rentChargeThrough($id));
+
+     // Figure out the outstanding balances for this lease
    $outstanding_balance = $this->Lease->balance($id);
    $outstanding_deposit = $this->Lease->securityDepositBalance($id);

@@ -497,7 +495,7 @@ class LeasesController extends AppController {
      //  when a charge is reimbursed; a bug that we'll either
      //  need to fix, or we'll have to revisit this assumption.
      if ($outstanding_balance < 0)
-	$this->INTERNAL_ERROR("Should not have a customer lease credit.");
+	INTERNAL_ERROR("Should not have a customer lease credit.");

 /*       if ($outstanding_balance < 0) */
 /* 	$this->sidemenu_links[] = */
--- a/site/controllers/ledger_entries_controller.php
+++ b/site/controllers/ledger_entries_controller.php
@@ -145,6 +145,12 @@ class LedgerEntriesController extends AppController {
   */

  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
+    }
+
+    // Get the Entry and related fields
    $entry = $this->LedgerEntry->find
      ('first',
       array('contain' => array
@@ -157,10 +163,6 @@ class LedgerEntriesController extends AppController {
 	      array('fields' => array('id', 'sequence', 'name'),
 		    'Account' => 
 		    array('fields' => array('id', 'name', 'type'),
-			  'conditions' =>
-			  // REVISIT <AP>: 20090811
-			  //  No security issues have been worked out yet
-			  array('Account.level >=' => 5),
 			),
 		  ),

@@ -168,9 +170,6 @@ class LedgerEntriesController extends AppController {
 	      array('fields' => array('id', 'name'),
 		    ),

-	      'DebitDoubleEntry' => array('id'),
-	      'CreditDoubleEntry' => array('id'),
-
 	      'DebitEntry'  => array('fields' => array('id', 'crdr')),
 	      'CreditEntry' => array('fields' => array('id', 'crdr')),
 	      ),
@@ -178,11 +177,6 @@ class LedgerEntriesController extends AppController {
 	     'conditions' => array('LedgerEntry.id' => $id),
 	     ));

-    if (empty($entry) || empty($entry['Ledger']['Account'])) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
-    }
-
    if (!empty($entry['DebitEntry']) && !empty($entry['CreditEntry']))
      die("LedgerEntry has both a matching DebitEntry and CreditEntry");
    if (empty($entry['DebitEntry']) && empty($entry['CreditEntry']))
@@ -197,11 +191,6 @@ class LedgerEntriesController extends AppController {
    else
      $entry['MatchingEntry'] = $entry['DebitEntry'][0];

-    if (empty($entry['DebitDoubleEntry']['id']))
-      $entry['DoubleEntry'] = $entry['CreditDoubleEntry'];
-    else
-      $entry['DoubleEntry'] = $entry['DebitDoubleEntry'];
-
    // Prepare to render.
    $title = "Ledger Entry #{$entry['LedgerEntry']['id']}";
    $this->set(compact('entry', 'title'));
--- a/site/controllers/ledgers_controller.php
+++ b/site/controllers/ledgers_controller.php
@@ -50,21 +50,24 @@ class LedgersController extends AppController {
  }

  function gridDataCountTables(&$params, &$model) {
+    // Our count should NOT include anything extra,
+    // so we need the virtual function to prevent
+    // the base class from just calling our
+    // gridDataTables function.
+    return parent::gridDataTables($params, $model);
+  }
+
+  function gridDataTables(&$params, &$model) {
    return array
      ('link' =>
       array(// Models
 	     'Account',
+	     'LedgerEntry',
+	     'CloseTransaction',
 	     ),
       );
  }

-  function gridDataTables(&$params, &$model) {
-    $tables = $this->gridDataCountTables($params, $model);
-    $tables['link'][] = 'LedgerEntry';
-    $tables['link'][] = 'CloseTransaction';
-    return $tables;
-  }
-
  function gridDataFields(&$params, &$model) {
    $fields = parent::gridDataFields($params, $model);
    $fields[] = 'CONCAT(Account.id, "-", Ledger.sequence) AS id_sequence';
@@ -82,10 +85,6 @@ class LedgersController extends AppController {
      $conditions[] = array('Ledger.close_transaction_id !=' => null);
    }

-    // REVISIT <AP>: 20090811
-    //  No security issues have been worked out yet
-    $conditions[] = array('Account.level >=' => 10);
-
    return $conditions;
  }

@@ -120,25 +119,22 @@ class LedgersController extends AppController {
   */

  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    // Get details about the ledger itself (no entries yet)
    $ledger = $this->Ledger->find
      ('first',
       array('contain' =>
 	     array(// Models
 		   'Account',
 		   ),
-	     'conditions' => array(array('Ledger.id' => $id),
-				   // REVISIT <AP>: 20090811
-				   //  No security issues have been worked out yet
-				   array('Account.level >=' => 10),
-				   ),
+	     'conditions' => array(array('Ledger.id' => $id)),
 	     )
       );

-    if (empty($ledger)) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
    // Get ledger stats for our summary box
    $stats = $this->Ledger->stats($id);

--- a/site/controllers/maps_controller.php
+++ b/site/controllers/maps_controller.php
@@ -85,33 +85,11 @@ class MapsController extends AppController {
 		  'units' => array());

    // Find all of the map/unit information from this SiteArea
-    $map = $this->Map->find('first', array('contain' => false,
-					   'conditions' => array('id' => $id)));
-
-    $units = $this->Map->Unit->find
-      ('all',
-       array('link' =>
-	     array('Map' =>
-		   array('fields' => array()),
-
-		   'CurrentLease' =>
-		   array('fields' => array($this->Map->Unit->CurrentLease->
-					   delinquentField('CurrentLease'))),
-
-		   'UnitSize' =>
-		   array('fields' => array('id', 'depth', 'width',
-					   'MapsUnit.pt_top',
-					   'MapsUnit.pt_left',
-					   'MapsUnit.transpose')),
-		   ),
-	     'fields' => array('id', 'name', 'status'),
-	     'conditions' => array('Map.id' => $id),
-	     ));
-
-/*     pr(compact('map', 'units')); */
-/*     $this->render('/empty'); */
-/*     return; */
-
+    $this->Map->recursive = 2;
+    $this->Map->SiteArea->unbindModel(array('hasOne' => array('Map')));
+    $map = $this->Map->read(null, $id);
+    //pr($map);
+    
    /*****
     * The preference would be to leave all things "screen" related
     * to reside in the view.  However, two separate views need this
@@ -135,7 +113,7 @@ class MapsController extends AppController {
    $info['depth'] = $bottom * $screen_adjustment_factor;

    // Go through each unit in the map, calculating the map location
-    foreach ($units AS $unit) {
+    foreach ($map['Unit'] AS $unit) {
      $lft = $unit['MapsUnit']['pt_left'] + $boundary_adjustment;
      $top = $unit['MapsUnit']['pt_top']  + $boundary_adjustment;

@@ -154,9 +132,10 @@ class MapsController extends AppController {
      $width *= $screen_adjustment_factor;
      $depth *= $screen_adjustment_factor;

+      //$info['units'][$unit['id']] =
      $info['units'][] =
-	array( 'id'     => $unit['Unit']['id'],
-	       'name'   => $unit['Unit']['name'],
+	array( 'id'     => $unit['id'],
+	       'name'   => $unit['name'],
 	       'left'   => $lft,
 	       'right'  => $lft + $width,
 	       'top'    => $top,
@@ -164,14 +143,11 @@ class MapsController extends AppController {
 	       'width'  => $width,
 	       'depth'  => $depth,
 	       'n-s'    => $unit['MapsUnit']['transpose'] ? 0 : 1,
-	       'status' => (($unit['Unit']['status'] === 'OCCUPIED' &&
-			     !empty($unit[0]['delinquent']))
-			    ? 'LATE' : $unit['Unit']['status'])
+	       'status' => $unit['status']
 	       );
    }

-/*     pr($info); */
-/*     $this->render('/empty'); */
+    //pr($info);
    return $info;
  }

@@ -184,10 +160,8 @@ class MapsController extends AppController {
   */

  function legend($id = null, $requested_width = 400) {
-    $status = array_keys($this->Map->Unit->activeStatusEnums());
-    $occupied_key = array_search('OCCUPIED', $status);
-    array_splice($status, $occupied_key+1, 0, array('LATE'));
-
+    $status = $this->Map->Unit->activeStatusEnums();
+    //pr($status);
    $rows = 2;
    $cols = (int)((count($status) + $rows - 1) / $rows);

@@ -217,7 +191,7 @@ class MapsController extends AppController {
    $item_width *= $screen_adjustment_factor;
    $item_depth *= $screen_adjustment_factor;

-    foreach ($status AS $code) {
+    foreach ($status AS $code => $value) {
      $info['units'][] = array('name'   => $code,
 			       'status' => $code,
 			       'width'  => $item_width,
@@ -267,9 +241,9 @@ class MapsController extends AppController {
    $info['palate']['unit']['DIRTY']['bg']        = array('red' => 128, 'green' => 192, 'blue' => 192);
    $info['palate']['unit']['VACANT']['bg']       = array('red' =>   0, 'green' => 255, 'blue' => 128);
    $info['palate']['unit']['OCCUPIED']['bg']     = array('red' =>   0, 'green' => 128, 'blue' => 255);
-    $info['palate']['unit']['LATE']['bg']         = array('red' => 255, 'green' => 192, 'blue' => 192);
-    $info['palate']['unit']['LOCKED']['bg']       = array('red' => 255, 'green' =>  64, 'blue' =>  64);
-    $info['palate']['unit']['LIENED']['bg']       = array('red' => 255, 'green' =>   0, 'blue' => 128);
+    $info['palate']['unit']['LATE']['bg']         = array('red' => 255, 'green' =>  64, 'blue' =>  64);
+    $info['palate']['unit']['LOCKED']['bg']       = array('red' => 255, 'green' => 128, 'blue' => 128);
+    $info['palate']['unit']['LIENED']['bg']       = array('red' => 255, 'green' => 192, 'blue' => 192);

    // Determine text color to go with each background
    foreach ($info['palate']['unit'] AS &$code) {
--- a/site/controllers/statement_entries_controller.php
+++ b/site/controllers/statement_entries_controller.php
@@ -35,7 +35,7 @@ class StatementEntriesController extends AppController {
   *    to jqGrid.
   */

-  function gridDataCountTables(&$params, &$model) {
+  function gridDataTables(&$params, &$model) {
    $link =
      array(// Models
 	    'Transaction' =>
@@ -58,26 +58,27 @@ class StatementEntriesController extends AppController {
 		  ),
 	    );

-    if (!empty($params['post']['custom']['statement_entry_id'])) {
-      $link['ChargeEntry']        = array();
-      $link['DisbursementEntry']  = array();
+    if (isset($params['post']['custom']['statement_entry_id'])) {
+      $link['DisbursementEntry'] = array();
+      $link['ChargeEntry']  = array();
    }

+/*     if ($params['action'] === 'collected') { */
+/*       $link['DisbursementEntry'] = array('Receipt' => array('class' => 'Transaction')); */
+/*       $link['ChargeEntry']  = array('Invoice' => array('class' => 'Transaction')); */
+/*     } */
+
+/*     if (count(array_intersect($params['fields'], array('applied'))) == 1) { */
+/*       $link['DisbursementEntry'] = array(); */
+/*       $link['ChargeEntry']  = array(); */
+/*     } */
+/*     elseif (isset($params['post']['custom']['customer_id']) || isset($params['post']['custom']['lease_id'])) { */
+/*       $link['DisbursementEntry'] = array(); */
+/*     } */
+
    return array('link' => $link);
  }

-  function gridDataTables(&$params, &$model) {
-    $tables = $this->gridDataCountTables($params, $model);
-
-    if (in_array('applied', $params['post']['fields'])) {
-      $tables['link'] +=
-	array('ChargeEntry'       => array(),
-	      'DisbursementEntry' => array());
-    }
-
-    return $tables;
-  }
-
  function gridDataFields(&$params, &$model) {
    $fields = parent::gridDataFields($params, $model);

@@ -86,13 +87,11 @@ class StatementEntriesController extends AppController {
 		   "   SUM(COALESCE(DisbursementEntry.amount,0))," .
 		   "   SUM(COALESCE(ChargeEntry.amount,0)))" .
 		   " AS 'applied'");
-    }
-    if (in_array('unapplied', $params['post']['fields'])) {
      $fields[] = ("StatementEntry.amount - (" .
 		   "IF(StatementEntry.type = 'CHARGE'," .
 		   "   SUM(COALESCE(DisbursementEntry.amount,0))," .
 		   "   SUM(COALESCE(ChargeEntry.amount,0)))" .
-		   ") AS 'unapplied'");
+		   ") AS 'balance'");
    }

    $fields = array_merge($fields,
@@ -118,27 +117,12 @@ class StatementEntriesController extends AppController {
    if (isset($account_id))
      $conditions[] = array('StatementEntry.account_id' => $account_id);

-    if (isset($customer_id))
-      $conditions[] = array('StatementEntry.customer_id' => $customer_id);
-
    if (isset($statement_entry_id)) {
      $conditions[] = array('OR' =>
 			    array(array('ChargeEntry.id' => $statement_entry_id),
 				  array('DisbursementEntry.id' => $statement_entry_id)));
    }

-    if ($params['action'] === 'unreconciled') {
-      $query = array('conditions' => $conditions);
-      $set = $this->StatementEntry->reconciledSet('CHARGE', $query, true);
-
-      $entries = array();
-      foreach ($set['entries'] AS $entry)
-	$entries[] = $entry['StatementEntry']['id'];
-
-      $conditions[] = array('StatementEntry.id' => $entries);
-      $params['userdata']['balance'] = $set['summary']['balance'];
-    }
-
    return $conditions;
  }

@@ -167,26 +151,26 @@ class StatementEntriesController extends AppController {
  }

  function gridDataRecordsExecute(&$params, &$model, $query) {
-/*     if ($params['action'] === '???') { */
-/*       $tquery = array_diff_key($query, array('fields'=>1,'group'=>1,'limit'=>1,'order'=>1)); */
-/*       $tquery['fields'] = array("IF(StatementEntry.type = 'CHARGE'," . */
-/* 				"   SUM(COALESCE(DisbursementEntry.amount,0))," . */
-/* 				"   SUM(COALESCE(ChargeEntry.amount,0)))" . */
-/* 				" AS 'applied'", */
+    if (in_array('applied', $params['post']['fields'])) {
+      $tquery = array_diff_key($query, array('fields'=>1,'group'=>1,'limit'=>1,'order'=>1));
+      $tquery['fields'] = array("IF(StatementEntry.type = 'CHARGE'," .
+				"   SUM(COALESCE(DisbursementEntry.amount,0))," .
+				"   SUM(COALESCE(ChargeEntry.amount,0)))" .
+				" AS 'applied'",

-/* 				"StatementEntry.amount - (" . */
-/* 				"IF(StatementEntry.type = 'CHARGE'," . */
-/* 				"   SUM(COALESCE(DisbursementEntry.amount,0))," . */
-/* 				"   SUM(COALESCE(ChargeEntry.amount,0)))" . */
-/* 				") AS 'balance'", */
-/* 				); */
+				"StatementEntry.amount - (" .
+				"IF(StatementEntry.type = 'CHARGE'," .
+				"   SUM(COALESCE(DisbursementEntry.amount,0))," .
+				"   SUM(COALESCE(ChargeEntry.amount,0)))" .
+				") AS 'balance'",
+				);

-/*       //pr(compact('tquery')); */
-/*       $total = $model->find('first', $tquery); */
-/*       $params['userdata']['total']   = $total[0]['applied']; */
-/*       $params['userdata']['balance'] = $total[0]['balance']; */
-/*     } */
-    if ($params['action'] === 'collected') {
+      //pr(compact('tquery'));
+      $total = $model->find('first', $tquery);
+      $params['userdata']['total']   = $total[0]['applied'];
+      $params['userdata']['balance'] = $total[0]['balance'];
+    }
+    else {
      $tquery = array_diff_key($query, array('fields'=>1,'group'=>1,'limit'=>1,'order'=>1));
      $tquery['fields'] = array("SUM(COALESCE(StatementEntry.amount,0)) AS 'total'");
      $total = $model->find('first', $tquery);
@@ -229,6 +213,12 @@ class StatementEntriesController extends AppController {
   */

  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
+    }
+
+    // Get the StatementEntry and related fields
    $entry = $this->StatementEntry->find
      ('first',
       array('contain' => array
@@ -238,17 +228,10 @@ class StatementEntriesController extends AppController {
 	      'Lease' => array('fields' => array('id')),
 	      ),

-	     'conditions' => array(array('StatementEntry.id' => $id),
-				   // REVISIT <AP>: 20090811
-				   //  No security issues have been worked out yet
-				   array('Account.level >=' => 5)
-				   ),
+	     'conditions' => array('StatementEntry.id' => $id),
 	     ));
-
-    if (empty($entry)) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
-    }
+    
+    $reconciled = $this->StatementEntry->reconciledEntries($id);

    $stats = $this->StatementEntry->stats($id);

@@ -260,14 +243,19 @@ class StatementEntriesController extends AppController {

    if (strtoupper($entry['StatementEntry']['type']) === 'CHARGE') {

-      $reversable = $this->StatementEntry->reversable($id);
+      $reversal = $this->StatementEntry->find
+	('first',
+	 array('link' => array('DisbursementEntry'),
+	       'conditions' => array(array('StatementEntry.id' => $id),
+				     array('DisbursementEntry.type' => 'REVERSAL')),
+	       ));

      // Set up dynamic menu items
-      if ($reversable || $stats['balance'] > 0)
+      if (empty($reversal) || $stats['balance'] > 0)
 	$this->sidemenu_links[] =
 	  array('name' => 'Operations', 'header' => true);

-      if ($reversable)
+      if (empty($reversal))
 	$this->sidemenu_links[] =
 	  array('name' => 'Reverse',
 		'url' => array('action' => 'reverse',
@@ -282,7 +270,7 @@ class StatementEntriesController extends AppController {

    // Prepare to render.
    $title = "Statement Entry #{$entry['StatementEntry']['id']}";
-    $this->set(compact('entry', 'title', 'stats'));
+    $this->set(compact('entry', 'title', 'reconciled', 'stats'));
  }

 }
--- a/site/controllers/tenders_controller.php
+++ b/site/controllers/tenders_controller.php
@@ -178,8 +178,7 @@ class TendersController extends AppController {
 	&& empty($tender['Tender']['nsf_transaction_id'])
 	// Hard to tell what types of items can come back as NSF.
 	// For now, assume iff it is a named item, it can be NSF.
-	// (or if we're in development mode)
-	&& (!empty($tender['TenderType']['data1_name']) || !empty($this->params['dev']))
+	&& !empty($tender['TenderType']['data1_name'])
 	) {
      $this->sidemenu_links[] =
 	array('name' => 'NSF',
@@ -234,6 +233,11 @@ class TendersController extends AppController {
      }

      $this->redirect(array('action'=>'view', $this->Tender->id));
+
+      // For debugging, only if the redirects above have been
+      // commented out, otherwise this section isn't reached.
+      $this->render('/fake');
+      return;
    }

    if ($id) {
--- a/site/controllers/transactions_controller.php
+++ b/site/controllers/transactions_controller.php
@@ -54,12 +54,7 @@ class TransactionsController extends AppController {
   */

  function gridDataCountTables(&$params, &$model) {
-    return array
-      ('link' =>
-       array(// Models
-	     'Account' => array('fields' => array()),
-	     ),
-       );
+    return parent::gridDataTables($params, $model);
  }

  function gridDataTables(&$params, &$model) {
@@ -84,16 +79,11 @@ class TransactionsController extends AppController {
    if (in_array($params['action'], array('invoice', 'receipt', 'deposit')))
      $conditions[] = array('Transaction.type' => strtoupper($params['action']));

-    // REVISIT <AP>: 20090811
-    //  No security issues have been worked out yet
-    $conditions[] = array('Account.level >=' => 5);
-
    return $conditions;
  }

  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
-    $links['Transaction'] = array('id', 'action' => ($params['action'] == 'deposit'
-						     ? 'deposit_slip' : 'view'));
+    $links['Transaction'] = array('id');
    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
  }

@@ -349,6 +339,8 @@ class TransactionsController extends AppController {
      die("<H1>REFUND FAILED</H1>");
    }

+    $this->render('/fake');
+
    // Return to viewing the lease/customer
    if (empty($data['Lease']['id']))
      $this->redirect(array('controller' => 'customers',
@@ -361,21 +353,6 @@ class TransactionsController extends AppController {
  }


-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: destroy
-   *  - Deletes a transaction and associated entries
-   *  - !!WARNING!!  This should be used with EXTREME caution, as it
-   *    irreversibly destroys the data.  It is not for normal use.
-   */
-
-  function destroy($id = null) {
-    $this->Transaction->destroy($id);
-    //$this->redirect(array('action' => 'index'));
-  }
-
-
  /**************************************************************************
   **************************************************************************
   **************************************************************************
@@ -384,45 +361,33 @@ class TransactionsController extends AppController {
   */

  function view($id = null) {
-    $transaction = $this->Transaction->find
-      ('first',
-       array('contain' =>
-	     array(// Models
-		   'Account(id,name)',
-		   'Ledger(id,name)',
-		   'NsfTender(id,name)',
-		   ),
-	     'conditions' => array(array('Transaction.id' => $id),
-				   // REVISIT <AP>: 20090811
-				   //  No security issues have been worked out yet
-				   array('OR' =>
-					 array(array('Account.level >=' => 5),
-					       array('Account.id' => null))),
-				   ),
-	     ));
-
-    // REVISIT <AP>: 20090815
-    //  for debug purposes only (pr output)
-    $this->Transaction->stats($id);
-
-    if (empty($transaction)) {
+    if (!$id) {
      $this->Session->setFlash(__('Invalid Item.', true));
      $this->redirect(array('action'=>'index'));
    }

-    if ($transaction['Transaction']['type'] === 'DEPOSIT' || $this->params['dev']) {
+    $transaction = $this->Transaction->find
+      ('first',
+       array('contain' =>
+	     array(// Models
+		   'Account' =>
+		   array('fields' => array('Account.id',
+					   'Account.name'),
+			 ),
+
+		   'Ledger' =>
+		   array('fields' => array('Ledger.id',
+					   'Ledger.name'),
+			 ),
+		   ),
+	     'conditions' => array('Transaction.id' => $id),
+	     ));
+
+    if ($transaction['Transaction']['type'] === 'DEPOSIT') {
      $this->sidemenu_links[] =
 	array('name' => 'Operations',    'header' => true);
-
-      if ($transaction['Transaction']['type'] === 'DEPOSIT')
-	$this->sidemenu_links[] =
-	  array('name' => 'View Slip',  'url' => array('action' => 'deposit_slip', $id));
-      if ($this->params['dev'])
-	$this->sidemenu_links[] =
-	  array('name' => 'Destroy',    'url' => array('action' => 'destroy', $id),
-		'confirmMessage' => ("This may leave the database in an unstable state." .
-				     " Do NOT do this unless you know what you're doing." .
-				     " Proceed anyway?"));
+      $this->sidemenu_links[] =
+	array('name' => 'View Slip',  'url' => array('action' => 'deposit_slip', $id));
    }

    // OK, prepare to render.
@@ -475,12 +440,15 @@ class TransactionsController extends AppController {
 	$type['TenderType'] + $type[0];
    }

-    $deposit_total = 0;
-    foreach ($deposit['types'] AS $type)
-      $deposit_total += $type['total'];
-
-    if ($deposit['Transaction']['amount'] != $deposit_total)
-      $this->INTERNAL_ERROR("Deposit items do not add up to deposit slip total");
+    // For each form of tender in the deposit, get the deposit items
+/*     foreach ($deposit['types'] AS $type_id => &$type) { */
+/*       $type['entries'] = $this->Transaction->DepositTender->find */
+/* 	('all', */
+/* 	 array('contain' => array('Customer', 'LedgerEntry'), */
+/* 	       'conditions' => array(array('DepositTender.deposit_transaction_id' => $id), */
+/* 				     array('DepositTender.tender_type_id' => $type_id)), */
+/* 	       )); */
+/*     } */

    $this->sidemenu_links[] =
      array('name' => 'Operations',    'header' => true);
--- a/site/controllers/units_controller.php
+++ b/site/controllers/units_controller.php
@@ -256,13 +256,13 @@ class UnitsController extends AppController {
    if (isset($unit['CurrentLease']['id']) &&
 	!isset($unit['CurrentLease']['close_date'])) {
      $this->sidemenu_links[] =
-	array('name' => 'New Invoice', 'url' => array('controller' => 'leases',
-						      'action' => 'invoice',
-						      $unit['CurrentLease']['id']));
+	array('name' => 'Charge', 'url' => array('controller' => 'leases',
+						 'action' => 'invoice',
+						 $unit['CurrentLease']['id']));
      $this->sidemenu_links[] =
-	array('name' => 'New Receipt', 'url' => array('controller' => 'customers',
-						      'action' => 'receipt',
-						      $unit['CurrentLease']['customer_id']));
+	array('name' => 'Payment', 'url' => array('controller' => 'customers',
+						  'action' => 'receipt',
+						  $unit['CurrentLease']['customer_id']));
    }

    // Prepare to render.
@@ -307,6 +307,11 @@ class UnitsController extends AppController {
      }

      $this->redirect(array('action'=>'view', $this->Unit->id));
+
+      // For debugging, only if the redirects above have been
+      // commented out, otherwise this section isn't reached.
+      $this->render('/fake');
+      return;
    }

    if ($id) {
--- a/site/models/account.php
+++ b/site/models/account.php
@@ -139,17 +139,7 @@ class Account extends AppModel {
  function invoiceAccountID()           { return $this->nameToID('Invoice'); }
  function receiptAccountID()           { return $this->nameToID('Receipt'); }
  function badDebtAccountID()           { return $this->nameToID('Bad Debt'); }
-  function customerCreditAccountID()    { return $this->nameToID(
-  // REVISIT <AP>: 20090816
-  //  Use of A/R works, and saves an excess of accounts.
-  //  However, a dedicated account is nice, since it can
-  //  quickly be spotted how much is _really_ due, vs
-  //  how much has been pre-paid.  Customer credits in
-  //  A/R is not as clear, although a report is an
-  //  obvious solution.
-								 //'A/R'
-								 'Credit'
-								 ); }
+

  /**************************************************************************
   **************************************************************************
@@ -233,28 +223,13 @@ class Account extends AppModel {
  function collectableAccounts() {
    $accounts = $this->receiptAccounts();

-    foreach(array($this->customerCreditAccountID(),
-		  $this->securityDepositAccountID(),
-		  $this->nsfAccountID(),
-		  $this->waiverAccountID(),
+    foreach(array($this->nsfAccountID(),
 		  $this->badDebtAccountID(),
-		  //$this->nameToID('Closing'),
-		  //$this->nameToID('Equity'),
-		  )
+		  $this->securityDepositAccountID())
 	    AS $account_id) {
      $accounts[$account_id] = $this->name($account_id);
    }

-    $accounts['all'] = $accounts['default'] = $accounts;
-
-    foreach(array($this->concessionAccountID(),
-		  $this->waiverAccountID(),
-		  $this->badDebtAccountID(),
-		  )
-	    AS $account_id) {
-      unset($accounts['default'][$account_id]);
-    }
-
    return $accounts;
  }

@@ -370,7 +345,6 @@ class Account extends AppModel {
    $this->queryInit($query);
    $query['link'] = array('Account' => $query['link']);

-    $stats = array();
    foreach ($this->ledgers($id, $all) AS $ledger)
      $this->statsMerge($stats['Ledger'],
 			$this->Ledger->stats($ledger, $query));
--- a/site/models/customer.php
+++ b/site/models/customer.php
@@ -142,8 +142,10 @@ class Customer extends AppModel {
 	continue;

      $I = new Contact();
-      if (!$I->saveContact(null, array('Contact' => $contact)))
+      $I->create();
+      if (!$I->save($contact, false)) {
 	return false;
+      }
      $contact['id'] = $I->id;
    }

@@ -201,29 +203,6 @@ class Customer extends AppModel {
  }


-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: update
-   *  - Update any cached or calculated fields
-   */
-  function update($id) {
-
-    // REVISIT <AP>: 20090812
-    //  updateLeaseCount is handled directly when needed.
-    //  Should we simplify by just doing it anyway?
-    //$this->updateLeaseCount($id);
-
-    $current_leases =
-      $this->find('all',
-		  array('link' => array('CurrentLease' => array('type' => 'INNER')),
-			'conditions' => array('Customer.id' => $id)));
-
-    foreach ($current_leases AS $lease)
-      $this->Lease->update($lease['CurrentLease']['id']);
-  }
-
-
  /**************************************************************************
   **************************************************************************
   **************************************************************************
--- a/site/models/double_entry.php
+++ b/site/models/double_entry.php
@@ -53,27 +53,12 @@ class DoubleEntry extends AppModel {
   */

  function addDoubleEntry($entry1, $entry2, $entry1_tender = null) {
-    $this->prFunctionLevel(16);
-    $this->prEnter(compact('entry1', 'entry2', 'entry1_tender'));
+/*     pr(array('DoubleEntry::addDoubleEntry' => */
+/* 	     compact('entry1', 'entry2', 'entry1_tender'))); */

    $ret = array();
    if (!$this->verifyDoubleEntry($entry1, $entry2, $entry1_tender))
-      return $this->prReturn(array('error' => true) + $ret);
-
-    // Handle the case where a double entry involves the same
-    // exact ledger.  This would not serve any useful purpose.
-    // It is not, however, an error.  It is semantically correct
-    // just not really logically correct.  To make this easier,
-    // just ensure ledger_id is set for each entry, even though
-    // it would be handled later by the LedgerEntry model.
-    //array($entry1, $entry2) AS &$entry) {
-    for ($i=1; $i <= 2; ++$i) {
-      if (empty(${'entry'.$i}['ledger_id']))
-	${'entry'.$i}['ledger_id'] =
-	  $this->DebitEntry->Account->currentLedgerID(${'entry'.$i}['account_id']);
-    }
-    if ($entry1['ledger_id'] == $entry2['ledger_id'])
-      return $this->prReturn(array('error' => false));
+      return array('error' => true) + $ret;

    // Since this model only relates to DebitEntry and CreditEntry...
    $LE = new LedgerEntry();
@@ -82,13 +67,13 @@ class DoubleEntry extends AppModel {
    $result = $LE->addLedgerEntry($entry1, $entry1_tender);
    $ret['Entry1'] = $result;
    if ($result['error'])
-      return $this->prReturn(array('error' => true) + $ret);
+      return array('error' => true) + $ret;
    
    // Add the second ledger entry to the database
    $result = $LE->addLedgerEntry($entry2);
    $ret['Entry2'] = $result;
    if ($result['error'])
-      return $this->prReturn(array('error' => true) + $ret);
+      return array('error' => true) + $ret;

    // Now link them as a double entry
    $double_entry = array();
@@ -97,13 +82,15 @@ class DoubleEntry extends AppModel {
    $double_entry['credit_entry_id'] = 
      ($entry1['crdr'] === 'CREDIT') ? $ret['Entry1']['ledger_entry_id'] : $ret['Entry2']['ledger_entry_id'];

-    $ret['data'] = $double_entry;
+/*     pr(array('DoubleEntry::addDoubleEntry' => */
+/* 	     array('checkpoint' => 'Pre-Save') */
+/* 	     + compact('double_entry'))); */

    $this->create();
    if (!$this->save($double_entry))
-      return $this->prReturn(array('error' => true) + $ret);
+      return array('error' => true) + $ret;

    $ret['double_entry_id'] = $this->id;
-    return $this->prReturn($ret + array('error' => false));
+    return $ret + array('error' => false);
  }
 }
--- a/site/models/lease.php
+++ b/site/models/lease.php
@@ -12,7 +12,7 @@ class Lease extends AppModel {
 		'StatementEntry',
 	);

-	//var $default_log_level = array('log' => 30, 'show' => 30);
+	//var $default_log_level = array('log' => 30, 'show' => 15);

  /**************************************************************************
   **************************************************************************
@@ -426,17 +426,6 @@ class Lease extends AppModel {
      $date = mktime(0, 0, 0, $date_parts['mon'], 11, $date_parts['year']);
    }

-    // Don't assess a late charge if the late charge date hasn't
-    // even come yet.  This is questionable whether we really
-    // should restrict, since the user could know what they're
-    // doing, and/or the server clock could be off (although that
-    // would certainly have much larger ramifications).  But, the
-    // fact is that this check likely handles the vast majority
-    // of the expected behavior, and presents an issue for very
-    // few users, if any at all.
-    if ($date > time())
-      return $this->prReturn(null);
-
    // Make sure we're not trying to assess late charges on a closed lease
    $close_date = $this->field('close_date');
    $this->pr(17, compact('close_date'));
@@ -460,10 +449,6 @@ class Lease extends AppModel {

    // Determine if the customer is actually late.  This is based on
    // when they've paid through, plus 10 days before they're late.
-    // REVISIT <AP>: 20090813
-    //   Of course, 10 days is a terrible hardcode.  This should be
-    //   driven from the late schedule, saved as part of the lease
-    //   (when finally implemented).
    $paid_through_date = strtotime($this->rentPaidThrough($id));
    $this->pr(17, compact('date', 'paid_through_date')
 	      + array('date_str' => date('Y-m-d', $date),
@@ -527,31 +512,6 @@ class Lease extends AppModel {
  }


-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * functions: delinquency
-   *  - SQL fragments to determine whether a lease is delinquent
-   */
-
-  function conditionDelinquent($table_name = 'Lease') {
-    if (empty($table_name)) $t = ''; else $t = $table_name . '.';
-    return ("({$t}close_date IS NULL AND" .
-	    " NOW() > DATE_ADD({$t}paid_through_date, INTERVAL 15 DAY))");
-  }
-
-  function delinquentDaysSQL($table_name = 'Lease') {
-    if (empty($table_name)) $t = ''; else $t = $table_name . '.';
-    return ("IF(" . $this->conditionDelinquent($table_name) . "," .
-	    "   DATEDIFF(NOW(), {$t}paid_through_date)-1," .
-	    "   NULL)");
-  }
-
-  function delinquentField($table_name = 'Lease') {
-    return ($this->delinquentDaysSQL($table_name) . " AS 'delinquent'");
-  }
-
-
  /**************************************************************************
   **************************************************************************
   **************************************************************************
@@ -650,7 +610,7 @@ class Lease extends AppModel {
   */

  function moveOut($id, $status = 'VACANT',
-		   $stamp = null, $close = true)
+		   $stamp = null, $close = false)
  {
    $this->prEnter(compact('id', 'status', 'stamp', 'close'));

@@ -785,23 +745,6 @@ class Lease extends AppModel {
  }


-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: update
-   *  - Update any cached or calculated fields
-   */
-  function update($id) {
-    $this->id = $id;
-    $this->saveField('charge_through_date', $this->rentChargeThrough($id));
-    $this->saveField('paid_through_date', $this->rentPaidThrough($id));
-
-    $moveout = $this->field('moveout_date');
-    if (empty($moveout))
-      $this->Unit->update($this->field('unit_id'));
-  }
-
-
  /**************************************************************************
   **************************************************************************
   **************************************************************************
--- a/site/models/ledger_entry.php
+++ b/site/models/ledger_entry.php
@@ -8,22 +8,8 @@ class LedgerEntry extends AppModel {
 	);

 	var $hasOne = array(
-		'Tender' => array(
-			'dependent' => true,
-		),
-		'DebitDoubleEntry' => array(
-			'className' => 'DoubleEntry',
-		        'foreignKey' => 'debit_entry_id',
-			'dependent' => true,
-		),
-		'CreditDoubleEntry' => array(
-			'className' => 'DoubleEntry',
-		        'foreignKey' => 'credit_entry_id',
-			'dependent' => true,
-		),
-		'DoubleEntry' => array(
-		        'foreignKey' => false,
-		),
+		'Tender',
+		'DoubleEntry',
 	);

 	var $hasMany = array(
@@ -127,20 +113,24 @@ class LedgerEntry extends AppModel {
   *  - Inserts new Ledger Entry into the database
   */
  function addLedgerEntry($entry, $tender = null) {
-    $this->prFunctionLevel(16);
-    $this->prEnter(compact('entry', 'tender'));
+/*     pr(array('LedgerEntry::addLedgerEntry' => */
+/* 	     compact('entry', 'tender'))); */

-    $ret = array('data' => $entry);
+    $ret = array();
    if (!$this->verifyLedgerEntry($entry, $tender))
-      return $this->prReturn(array('error' => true) + $ret);
+      return array('error' => true) + $ret;

    if (empty($entry['ledger_id']))
      $entry['ledger_id'] = 
 	$this->Account->currentLedgerID($entry['account_id']);

+/*     pr(array('LedgerEntry::addLedgerEntry' => */
+/* 	     array('checkpoint' => 'Pre-Save') */
+/* 	     + compact('entry'))); */
+
    $this->create();
    if (!$this->save($entry))
-      return $this->prReturn(array('error' => true) + $ret);
+      return array('error' => true) + $ret;

    $ret['ledger_entry_id'] = $this->id;

@@ -150,10 +140,10 @@ class LedgerEntry extends AppModel {
      $result = $this->Tender->addTender($tender);
      $ret['Tender'] = $result;
      if ($result['error'])
-	return $this->prReturn(array('error' => true) + $ret);
+	return array('error' => true) + $ret;
    }

-    return $this->prReturn($ret + array('error' => false));
+    return $ret + array('error' => false);
  }


--- a/site/models/maps_unit.php
+++ b/site/models/maps_unit.php
@@ -0,0 +1,15 @@
+<?php
+class MapsUnit extends AppModel {
+
+	var $name = 'MapsUnit';
+	var $validate = array(
+		'id' => array('numeric'),
+		'map_id' => array('numeric'),
+		'unit_id' => array('numeric'),
+		'pt_top' => array('numeric'),
+		'pt_left' => array('numeric'),
+		'transpose' => array('boolean')
+	);
+
+}
+?>
--- a/site/models/statement_entry.php
+++ b/site/models/statement_entry.php
@@ -18,13 +18,11 @@ class StatementEntry extends AppModel {
 		'DisbursementEntry' => array(
 			'className' => 'StatementEntry',
 			'foreignKey' => 'charge_entry_id',
-			'dependent' => true,
 		),

 	);

-	var $default_log_level = array('log' => 30, 'show' => 15);
-	var $max_log_level = 19;
+	//var $default_log_level = array('log' => 30, 'show' => 15);

  /**************************************************************************
   **************************************************************************
@@ -125,10 +123,13 @@ class StatementEntry extends AppModel {
  function addStatementEntry($entry) {
    $this->prEnter(compact('entry'));

-    $ret = array('data' => $entry);
+    $ret = array();
    if (!$this->verifyStatementEntry($entry))
      return $this->prReturn(array('error' => true, 'verify_data' => $entry) + $ret);

+    $this->pr(20, array('checkpoint' => 'Pre-Save')
+	      + compact('entry'));
+
    $this->create();
    if (!$this->save($entry))
      return $this->prReturn(array('error' => true, 'save_data' => $entry) + $ret);
@@ -154,7 +155,7 @@ class StatementEntry extends AppModel {
    $charge = $charge['StatementEntry'];

    if ($charge['type'] !== 'CHARGE')
-      $this->INTERNAL_ERROR("Waiver item is not CHARGE.");
+      INTERNAL_ERROR("Waiver item is not CHARGE.");

    // Query the stats to get the remaining balance
    $stats = $this->stats($id);
@@ -167,6 +168,7 @@ class StatementEntry extends AppModel {
    // Add the charge waiver
    $waiver['Entry'][] =
      array('amount'      => $stats['Charge']['balance'],
+	    'account_id'  => $this->Account->waiverAccountID(),
 	    'comment'     => null,
 	    );

@@ -176,61 +178,89 @@ class StatementEntry extends AppModel {
  }


-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: reversable
-   *  - Returns true if the charge can be reversed; false otherwise
-   */
-  function reversable($id) {
-    $this->prEnter(compact('id'));
-
-    // Verify the item is an actual charge
-    $this->id = $id;
-    $charge_type = $this->field('type');
-    if ($charge_type !== 'CHARGE')
-      return $this->prReturn(false);
-
-    // Determine anything reconciled against the charge
-    $reverse_transaction_id = $this->field('reverse_transaction_id');
-    if (!empty($reverse_transaction_id))
-      return $this->prReturn(false);
-
-    return $this->prReturn(true);
-  }
-
  /**************************************************************************
   **************************************************************************
   **************************************************************************
   * function: reverse
   *  - Reverses the charges
+   *
   */
-  function reverse($id, $stamp = null) {
-    $this->prEnter(compact('id', 'stamp'));
+  function reverse($id, $balance = false, $stamp = null) {
+    $this->prEnter(compact('id', 'balance', 'stamp'));

-    // Verify the item can be reversed
-    if (!$this->reversable($id))
-      $this->INTERNAL_ERROR("Item is not reversable.");
+    $ret = array();

-    // Get the basic information about this charge
-    $charge = $this->find('first', array('contain' => true));
-    //$charge = $charge['StatementEntry'];
+    // Get the basic information about the entry to be reversed.
+    $this->recursive = -1;
+    $charge = $this->read(null, $id);
+    $charge = $charge['StatementEntry'];
+
+    if ($charge['type'] !== 'CHARGE')
+      INTERNAL_ERROR("Reversal item is not CHARGE.");
+
+    $voided_entry_transactions = array();
+    $reconciled = $this->reconciledEntries($id);
+    $this->pr(21, compact('reconciled'));
+
+    if ($reconciled && !$balance) {
+      foreach ($reconciled['entries'] AS $entry) {
+	if ($entry['DisbursementEntry']['type'] === 'REVERSAL')
+	  INTERNAL_ERROR("Charge has already been reversed");
+
+	$voided_entry_transactions[$entry['DisbursementEntry']['transaction_id']]
+	  = array_intersect_key($entry['DisbursementEntry'],
+				array('customer_id'=>1, 'lease_id'=>1));
+
+	$this->del($entry['DisbursementEntry']['id']);
+	continue;
+
+	$DE = new StatementEntry();
+	$DE->id = $entry['DisbursementEntry']['id'];
+	$DE->saveField('type', 'VOID');
+	$DE->saveField('charge_entry_id', null);
+      }
+      $this->pr(17, compact('voided_entry_transactions'));
+    }

    // Query the stats to get the remaining balance
    $stats = $this->stats($id);
-    $charge['paid'] = $stats['Charge']['disbursement'];
+
+    // Build a transaction
+    $reversal = array('Transaction' => array(), 'Entry' => array());
+    $reversal['Transaction']['stamp']   = $stamp;
+    $reversal['Transaction']['comment'] = "Credit Note: Charge Reversal";
+
+    // Add the charge reversal
+    $reversal['Entry'][] =
+      array('amount'      => $stats['Charge']['balance'],
+	    'account_id'  => $charge['account_id'],
+	    'comment'     => 'Charge Reversal',
+	    );

    // Record the reversal transaction
    $result = $this->Transaction->addReversal
-      ($charge, $stamp, 'Charge Reversal');
+      ($reversal, $id, $charge['customer_id'], $charge['lease_id']);
+    $this->pr(21, compact('result'));
+    $ret['reversal'] = $result;
+    if ($result['error'])
+      $ret['error'] = true;

-    if (empty($result['error'])) {
-      // Mark the charge as reversed
-      $this->id = $id;
-      $this->saveField('reverse_transaction_id', $result['transaction_id']);
+    foreach ($voided_entry_transactions AS $transaction_id => $tx) {
+      $result = $this->assignCredits
+	(null,
+	 $transaction_id,
+	 null,
+	 null,
+	 $tx['customer_id'],
+	 $tx['lease_id']
+	 );
+      $this->pr(21, compact('result'));
+      $ret['assigned'][] = $result;
+      if ($result['error'])
+	$ret['error'] = true;
    }

-    return $this->prReturn($result);
+    return $this->prReturn($ret + array('error' => false));
  }


@@ -258,7 +288,7 @@ class StatementEntry extends AppModel {
  }

  function reconciledSet($set, $query = null, $unrec = false, $if_rec_include_partial = false) {
-    $this->prFunctionLevel(array('log' => 16, 'show' => 10));
+    //$this->prFunctionLevel(array('log' => 16, 'show' => 10));
    $this->prEnter(compact('set', 'query', 'unrec', 'if_rec_include_partial'));
    $lquery = $this->reconciledSetQuery($set, $query);
    $result = $this->find('all', $lquery);
@@ -366,11 +396,10 @@ class StatementEntry extends AppModel {

    // First, find all known credits, unless this call is to make
    // credit adjustments to a specific charge
-    if (empty($receipt_id)) {
-
-      if (!empty($charge_ids))
-	$this->INTERNAL_ERROR("Charge IDs, yet no corresponding receipt");
-
+    // REVISIT <AP>: 20090806
+    //  If the theory below is correct, we should only search for
+    //  explicit credits if we don't have a receipt_id
+    if (empty($charge_ids)) {
      $lquery = $query;
      $lquery['conditions'][] = array('StatementEntry.type' => 'SURPLUS');
      // REVISIT <AP>: 20090804
@@ -395,13 +424,20 @@ class StatementEntry extends AppModel {
 		"Credits Established");
    }
    else {
-      // Establish credit from the (newly added) receipt
+      if (empty($receipt_id))
+	INTERNAL_ERROR("Can't make adjustments to a charge without a receipt ID.");
+    }
+
+    // Next, establish credit from the newly added receipt
+    $receipt_credit = null;
+    if (!empty($receipt_id)) {
      $lquery =
 	array('link' =>
 	      array('StatementEntry',
 		    'LedgerEntry' =>
 		    array('conditions' =>
-			  array('LedgerEntry.account_id <> Transaction.account_id')
+			  array('LedgerEntry.account_id !=' =>
+				$this->Account->accountReceivableAccountID()),
 			  ),
 		    ),
 	      'conditions' => array('Transaction.id' => $receipt_id),
@@ -409,14 +445,15 @@ class StatementEntry extends AppModel {
 	      );
      $receipt_credit = $this->Transaction->find('first', $lquery);
      if (!$receipt_credit)
-	$this->INTERNAL_ERROR("Unable to locate receipt.");
+	INTERNAL_ERROR("Unable to locate receipt.");
+
+      //$reconciled = $this->reconciledEntries($id);

      $stats = $this->Transaction->stats($receipt_id);
-      $receipt_credit['balance'] = $stats['undisbursed'];
+      $receipt_credit['balance'] =
+	$receipt_credit['Transaction']['amount'] - $stats['Disbursement']['total'];

-      $receipt_credit['receipt'] = true;
-      $credits = array($receipt_credit);
-      $this->pr(18, compact('credits'),
+      $this->pr(18, compact('receipt_credit'),
 		"Receipt Credit Added");
    }

@@ -439,44 +476,61 @@ class StatementEntry extends AppModel {
      $this->pr(18, compact('dtype', 'entries'), "Outstanding Debit Entries");
    }

+    // Initialize our list of used credits
+    $used_credits = array();
+
+    // REVISIT <AP>: 20090806
+    //  Testing a theory.  We should never have
+    //  explicit credits, as well as a new receipt,
+    //  and yet have outstanding charges.
+    if (!empty($credits) && !empty($receipt_credit) && !empty($charges))
+      INTERNAL_ERROR("Explicit credits that haven't already been applied.");
+
    // Work through all unpaid charges, applying disbursements as we go
    foreach ($charges AS $charge) {
+
      $this->pr(20, compact('charge'),
 		'Process Charge');

+      // Check that we have available credits.
+      // Technically, this isn't necessary, since the loop
+      // will handle everything just fine.  However, this
+      // just saves extra processing if/when there is no
+      // means to resolve a charge anyway.
+      if (empty($credits) && empty($receipt_credit['balance'])) {
+	$this->pr(17, 'No more available credits');
+	break;
+      }
+
      $charge['balance'] = $charge['StatementEntry']['balance'];
-
-      // Use explicit credits before using the new receipt credit
-      foreach ($credits AS &$credit) {
-	if (empty($charge['balance']))
-	  break;
-	if ($charge['balance'] < 0)
-	  $this->INTERNAL_ERROR("Negative Charge Balance");
-
-	if (!isset($credit['balance']))
-	  $credit['balance'] = $credit['StatementEntry']['amount'];
-
-	if (empty($credit['balance']))
-	  continue;
-	if ($credit['balance'] < 0)
-	  $this->INTERNAL_ERROR("Negative Credit Balance");
+      while ($charge['balance'] > 0 &&
+	     (!empty($credits) || !empty($receipt_credit['balance']))) {

 	$this->pr(20, compact('charge'),
 		  'Attempt Charge Reconciliation');

-	if (empty($credit['receipt']))
+	// Use explicit credits before using implicit credits
+	// (Not sure it matters though).
+	if (!empty($credits)) {
+	  // Peel off the first credit available
+	  $credit =& $credits[0];
+	  $disbursement_date = $credit['StatementEntry']['effective_date'];
+	  $disbursement_transaction_id = $credit['StatementEntry']['transaction_id'];
 	  $disbursement_account_id = $credit['StatementEntry']['account_id'];
-	else
-	  $disbursement_account_id = $credit['LedgerEntry']['account_id'];

-	// REVISIT <AP>: 20090811
-	//  Need to come up with a better strategy for handling
-	//  concessions.  For now, just restricting concessions
-	//  to apply only towards rent will resolve the most
-	//  predominant (or only) needed usage case.
-	if ($disbursement_account_id == $this->Account->concessionAccountID() &&
-	    $charge['StatementEntry']['account_id'] != $this->Account->rentAccountID())
-	  continue;
+	  if (!isset($credit['balance']))
+	    $credit['balance'] = $credit['StatementEntry']['amount'];
+	}
+	elseif (!empty($receipt_credit['balance'])) {
+	  // Use our only receipt credit
+	  $credit =& $receipt_credit;
+	  $disbursement_date = $credit['Transaction']['stamp'];
+	  $disbursement_transaction_id = $credit['Transaction']['id'];
+	  $disbursement_account_id = $credit['LedgerEntry']['account_id'];
+	}
+	else {
+	  die("HOW DID WE GET HERE WITH NO SURPLUS?");
+	}

 	// Set the disbursement amount to the maximum amount
 	// possible without exceeding the charge or credit balance
@@ -489,67 +543,35 @@ class StatementEntry extends AppModel {

 	$this->pr(20, compact('credit'),
 		  ($credit['balance'] > 0 ? 'Utilized' : 'Exhausted') .
-		  (empty($credit['receipt']) ? ' Credit' : ' Receipt'));
+		  (!empty($credits) ? ' Credit' : ' Receipt'));

-	if (strtotime($charge['StatementEntry']['effective_date']) >
-	    strtotime($credit['StatementEntry']['effective_date']))
-	  $disbursement_edate = $charge['StatementEntry']['effective_date'];
-	else
-	  $disbursement_edate = $credit['StatementEntry']['effective_date'];
+	if ($credit['balance'] < 0)
+	  die("HOW DID WE END UP WITH NEGATIVE SURPLUS BALANCE?");

-	if (empty($credit['receipt'])) {
-	  // Explicit Credit
-	  $result = $this->Transaction->addTransactionEntries
-	    (array('include_ledger_entry'    => true,
-		   'include_statement_entry' => true),
-	     array('type'        => 'INVOICE',
-		   'id'          => $credit['StatementEntry']['transaction_id'],
-		   'account_id'  => $this->Account->accountReceivableAccountID(),
-		   'crdr'        => 'CREDIT',
-		   'customer_id' => $charge['StatementEntry']['customer_id'],
-		   'lease_id'    => $charge['StatementEntry']['lease_id'],
-		   ),
-	     array
-	     (array('type'            => $disbursement_type,
-		    'effective_date'  => $disbursement_edate,
-		    'account_id'      => $credit['StatementEntry']['account_id'],
-		    'amount'          => $disbursement_amount,
-		    'charge_entry_id' => $charge['StatementEntry']['id'],
-		    ),
-		 ));
+	// If we've exhausted the credit, get it out of the
+	// available credit pool (but keep track of it for later).
+	if ($credit['balance'] <= 0 && !empty($credits))
+	  $used_credits[] = array_shift($credits);

-	  $ret['Disbursement'][] = $result;
-	  if ($result['error'])
-	    $ret['error'] = true;
-	}
-	else {
-	  // Receipt Credit
+	// Add a disbursement that uses the available credit to pay the charge
+	$disbursement = array('type' => $disbursement_type,
+			 'account_id' => $disbursement_account_id,
+			 'amount'     => $disbursement_amount,
+			 'effective_date' => $disbursement_date,
+			 'transaction_id' => $disbursement_transaction_id,
+			 'customer_id' => $charge['StatementEntry']['customer_id'],
+			 'lease_id' => $charge['StatementEntry']['lease_id'],
+			 'charge_entry_id' => $charge['StatementEntry']['id'],
+			 'comment' => null,
+			 );

-	  if (strtotime($charge['StatementEntry']['effective_date']) >
-	      strtotime($credit['Transaction']['stamp']))
-	    $disbursement_edate = $charge['StatementEntry']['effective_date'];
-	  else
-	    $disbursement_edate = $credit['Transaction']['stamp'];
+	$this->pr(20, compact('disbursement'),
+		  'New Disbursement Entry');

-	  // Add a disbursement that uses the available credit to pay the charge
-	  $disbursement =
-	    array('type'            => $disbursement_type,
-		  'effective_date'  => $disbursement_edate,
-		  'amount'          => $disbursement_amount,
-		  'account_id'      => $credit['LedgerEntry']['account_id'],
-		  'transaction_id'  => $credit['Transaction']['id'],
-		  'customer_id'     => $charge['StatementEntry']['customer_id'],
-		  'lease_id'        => $charge['StatementEntry']['lease_id'],
-		  'charge_entry_id' => $charge['StatementEntry']['id'],
-		  'comment'         => null,
-		  );
-
-	  $this->pr(20, compact('disbursement'), 'New Disbursement Entry');
-	  $result = $this->addStatementEntry($disbursement);
-	  $ret['Disbursement'][] = $result;
-	  if ($result['error'])
-	    $ret['error'] = true;
-	}
+	$result = $this->addStatementEntry($disbursement);
+	$ret['Disbursement'][] = $result;
+	if ($result['error'])
+	  $ret['error'] = true;

 	// Adjust the charge balance to reflect the new disbursement
 	$charge['balance'] -= $disbursement_amount;
@@ -559,47 +581,37 @@ class StatementEntry extends AppModel {
 	if ($charge['balance'] <= 0)
 	  $this->pr(20, 'Fully Paid Charge');
      }
-      // Break the $credit reference to avoid future problems
-      unset($credit);
+
    }

-    $this->pr(18, compact('credits'),
-	      'Disbursements complete');
+    // Partially used credits must be added to the used list
+    if (isset($credits[0]['applied']))
+      $used_credits[] = array_shift($credits);
+      
+    $this->pr(18, compact('credits', 'used_credits', 'receipt_credit'),
+	      'Disbursements added');

    // Clean up any explicit credits that have been used
-    foreach ($credits AS $credit) {
-      if (!empty($credit['receipt']))
-	continue;
-
-      if (empty($credit['applied']))
-	continue;
-
+    foreach ($used_credits AS $credit) {
      if ($credit['balance'] > 0) {
 	$this->pr(20, compact('credit'),
 		  'Update Credit Entry');

-	$this->id = $credit['StatementEntry']['id'];
+ 	$this->id = $credit['StatementEntry']['id'];
 	$this->saveField('amount', $credit['balance']);
      }
      else {
 	$this->pr(20, compact('credit'),
 		  'Delete Exhausted Credit Entry');

-	$this->delete($credit['StatementEntry']['id'], false);
+	$this->del($credit['StatementEntry']['id'], false);
      }
    }

-    // Check for any implicit receipt credits, converting
-    // into explicit credits if there is a remaining balance.
-    foreach ($credits AS $credit) {
-      if (empty($credit['receipt']))
-	continue;
+    // Convert non-exhausted receipt credit to an explicit one
+    if (!empty($receipt_credit['balance'])) {
+      $credit =& $receipt_credit;

-      if (empty($credit['balance']))
-	continue;
-
-      // See if there is an existing explicit credit
-      // for this transaction.
      $explicit_credit = $this->find
 	('first', array('contain' => false,
 			'conditions' =>
@@ -607,31 +619,30 @@ class StatementEntry extends AppModel {
 			      array('type' => 'SURPLUS')),
 			));

-      if (!empty($explicit_credit)) {
-	// REVISIT <AP>: 20090815
-	//  Testing whether or not this case occurs
-	$this->INTERNAL_ERROR('Existing explicit credit unexpected');
+      if (empty($explicit_credit)) {
+	$this->pr(18, compact('credit'),
+		  'Create Explicit Credit');

-	// Since there IS an existing explicit credit, we must update
-	// its balance instead of creating a new one, since it has
-	// already been incorporated in the overall credit balance.
-	// If we were to create a new one, we would erroneously create
-	// an excess of credit available.
+	$result = $this->addStatementEntry
+	  (array('type'           => 'SURPLUS',
+		 'account_id'     => $credit['LedgerEntry']['account_id'],
+		 'amount'         => $credit['balance'],
+		 'effective_date' => $credit['Transaction']['stamp'],
+		 'transaction_id' => $credit['Transaction']['id'],
+		 'customer_id'    => $customer_id,
+		 'lease_id'       => $lease_id,
+		 ));
+	$ret['Credit'] = $result;
+	if ($result['error'])
+	  $ret['error'] = true;
+      }
+      else {
 	$this->pr(18, compact('explicit_credit', 'credit'),
-		  'Update existing explicit credit');
+		  'Update Explicit Credit');
 	$EC = new StatementEntry();
 	$EC->id = $explicit_credit['StatementEntry']['id'];
 	$EC->saveField('amount', $credit['balance']);
-	continue;
      }
-
-      if (!empty($ret['receipt_balance']))
-	$this->INTERNAL_ERROR('Only one receipt expected in assignCredits');
-
-      // Give caller the information necessary to create an explicit
-      // credit from the passed receipt, which we've not exhausted.
-      $this->pr(18, compact('credit'), 'Convert to explicit credit');
-      $ret['receipt_balance'] = $credit['balance'];
    }

    return $this->prReturn($ret + array('error' => false));
@@ -645,7 +656,7 @@ class StatementEntry extends AppModel {
   *  - Returns summary data from the requested statement entry
   */
  function stats($id = null, $query = null) {
-    $this->prFunctionLevel(array('log' => 16, 'show' => 10));
+    //$this->prFunctionLevel(array('log' => 19, 'show' => 10));
    $this->prEnter(compact('id', 'query'));

    $this->queryInit($query);
--- a/site/models/tender.php
+++ b/site/models/tender.php
@@ -10,7 +10,6 @@ class Tender extends AppModel {
 		),
 		'NsfTransaction' => array(
 			'className' => 'Transaction',
-			'dependent' => true,
 		),
 	);

@@ -18,11 +17,11 @@ class Tender extends AppModel {
  /**************************************************************************
   **************************************************************************
   **************************************************************************
-   * function: afterSave
-   *  - Performs any work needed after the save occurs
+   * function: beforeSave
+   *  - Performs any work needed before the save occurs
   */

-  function afterSave($created) {
+  function afterSave() {
    // Come up with a (not necessarily unique) name for the tender.
    // For checks & money orders, this will be based on the check
    // number.  For other types of tender, we'll just use the
@@ -46,32 +45,10 @@ class Tender extends AppModel {
    if ($newname !== $this->field('name'))
      $this->saveField('name', $newname);

-    return parent::afterSave($created);
+    return parent::afterSave();
  }


-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: beforeDelete
-   *  - Performs any work needed before the delete occurs
-   */
-
-  function beforeDelete($cascade = true) {
-    // REVISIT <AP>: 20090814
-    //  Experimental, and incomplete mechanism to protect
-    //  against trying to delete data that shouldn't be deleted.
-
-    $deposit_id = $this->field('deposit_transaction_id');
-    pr(compact('deposit_id'));
-    // If this tender has already been deposited, it would
-    // be a rats nest to figure out how to delete this tender.
-    if (!empty($deposit_id))
-      return false;
-
-    return parent::beforeDelete($cascade);
-  }
-
  /**************************************************************************
   **************************************************************************
   **************************************************************************
@@ -101,7 +78,7 @@ class Tender extends AppModel {
  function addTender($tender) {
    $this->prEnter(compact('tender'));

-    $ret = array('data' => $tender);
+    $ret = array();
    if (!$this->verifyTender($tender))
      return $this->prReturn(array('error' => true) + $ret);

--- a/site/models/transaction.php
+++ b/site/models/transaction.php
--- a/site/models/unit.php
+++ b/site/models/unit.php
@@ -181,16 +181,6 @@ class Unit extends AppModel {
  }


-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: update
-   *  - Update any cached or calculated fields
-   */
-  function update($id) {
-  }
-
-
  /**************************************************************************
   **************************************************************************
   **************************************************************************
--- a/site/views/accounts/collected.ctp
+++ b/site/views/accounts/collected.ctp
@@ -15,8 +15,8 @@ echo '<div class="account collected">' . "\n";

 // Reset the form
 function resetForm() {
-  // Kick off the grid
-  updateEntriesGrid();
+  <?php /* REVISIT <AP>: 20090810; Hate to do this, but first data is wrong... */ ?>
+  setTimeout(updateEntriesGrid, 1000);
 }

 function onGridLoadComplete() {
@@ -40,15 +40,12 @@ function updateEntriesGrid() {

  $('#collected-total').html('Calculating...');
  $('#collected-entries-jqGrid').clearGridData();
-  $('#collected-entries-jqGrid').setPostDataItem('dynamic_post_replace', serialize(dynamic_post));
+  $('#collected-entries-jqGrid').setPostDataItem('dynamic_post', serialize(dynamic_post));
  $('#collected-entries-jqGrid')
    .setGridParam({ page: 1 })
    .trigger("reloadGrid");

-  //$('#debug').html("<PRE>\n"+htmlEncode(dump($('#collected-entries-jqGrid').getGridParam()))+"\n</PRE>")
-  var gridstate   = $('#collected-entries-jqGrid').getGridParam('gridstate');
-  if (gridstate == 'hidden')
-    $('#collected-entries .HeaderButton').click();
+  //$('#collected-entries .HeaderButton').click();
 }


@@ -165,12 +162,12 @@ echo $this->element('statement_entries', array
 		      'grid_div_id' => 'collected-entries',
 		      'grid_div_class' => 'text-below',
 		      'grid_events' => array('loadComplete' => 'onGridLoadComplete()'),
-		      'grid_setup' => array('hiddengrid' => true),
+		      //'grid_setup' => array('hiddengrid' => true),
+		      //'caption' => '<SPAN id="receipt-charges-caption"></SPAN>',
 		      'caption' => 'Collected ' . Inflector::pluralize($account['name']),
-		      'action' => 'collected',
-		      'filter' => array('ChargeEntry.account_id' => $account['id']),
-		      'include' => array('Amount'),
-		      'exclude' => array(/*'Type',*/ 'Debit', 'Credit'),
+		      'filter' => array(//'StatementEntry.type' => 'DISBURSEMENT',
+					'ChargeEntry.account_id' => $account['id']),
+		      'exclude' => array('Account', 'Charge', 'Type'),
 		      ),
 		     ));

@@ -205,3 +202,5 @@ echo '</div>' . "\n";
 echo '</div>' . "\n";

 ?>
+
+<a href="#" onClick="$('#debug').html(''); return false;">Clear Debug Output</a>
--- a/site/views/customers/receipt.ctp
+++ b/site/views/customers/receipt.ctp
@@ -81,33 +81,6 @@ function resetForm() {
  updateCharges($("#customer-id").val());
 }

-function updateCharges(id) {
-  $('#charge-entries-jqGrid').clearGridData();
-  $("#receipt-balance").html("Calculating...");
-  $("#receipt-charges-caption").html("Please Wait...");
-
-  var custom = new Array();
-  custom['customer_id'] = id;
-
-  var dynamic_post = new Array();
-  dynamic_post['custom'] = custom;
-
-  $('#charge-entries-jqGrid').setPostDataItem('dynamic_post_replace', serialize(dynamic_post));
-  $('#charge-entries-jqGrid')
-    .setGridParam({ page: 1 })
-    .trigger("reloadGrid");
-
-  var gridstate = $('#charge-entries-jqGrid').getGridParam('gridstate');
-  if (gridstate == 'hidden')
-    $('#charge-entries .HeaderButton').click();
-}
-
-function onGridLoadComplete() {
-  var userdata = $('#charge-entries-jqGrid').getGridParam('userData');
-  $('#receipt-balance').html(fmtCurrency(userdata['balance']));
-  $("#receipt-charges-caption").html("Outstanding Charges");
-}
-
 function onRowSelect(grid_id, customer_id) {
  // Set the customer id that will be returned with the form
  $("#customer-id").val(customer_id);
@@ -118,10 +91,7 @@ function onRowSelect(grid_id, customer_id) {
  //   This is not intended as a long term solution,
  //   but I need a way to enter data and then view
  //   the results.  This link will help.
-  $("#receipt-customer-id").html('<A HREF="' +
-				 "<?php echo $html->url(array('controller' => 'customers',
-		                                              'action'     => 'view')); ?>"
-				 + "/" +
+  $("#receipt-customer-id").html('<A HREF="/pmgr/site/customers/view/' +
 				 $(grid_id).getCell(customer_id, 'Customer-id').replace(/^#/,'') +
 				 '">' +
 				 $(grid_id).getCell(customer_id, 'Customer-id') +
@@ -244,6 +214,48 @@ function switchPaymentType(paymentid_base, paymentid, radioid) {
  $("#"+paymentid_base+"-"+paymentid+"-"+type_id).slideDown();
 }

+function updateChargesGrid(idlist) {
+  var dynamic_post = new Array();
+  dynamic_post['idlist'] = idlist;
+
+  $('#charge-entries-jqGrid').setPostDataItem('dynamic_post_replace', serialize(dynamic_post));
+  $('#charge-entries-jqGrid')
+    .setGridParam({ page: 1 })
+    .trigger("reloadGrid");
+}
+
+function updateCharges(id) {
+  var url = '<?php echo ($html->url(array("controller" => $this->params["controller"],
+					  "action"     => "unreconciled"))); ?>';
+  url += '/'+id;
+
+  $('#charge-entries-jqGrid').clearGridData();
+  $("#receipt-balance").html("Calculating...");
+  $("#receipt-charges-caption").html("Please Wait...");
+
+  $.ajax({
+    type: "GET",
+	url: url,
+	dataType: "xml",
+	success: function(xml) {
+	var ids = new Array();
+	$('entry',xml).each(function(i){
+	    ids.push($(this).attr('id'));
+	  });
+	$('#receipt-balance').html(fmtCurrency($('entries',xml).attr('balance')));
+	$("#receipt-charges-caption").html("Outstanding Charges");
+	updateChargesGrid(ids);
+        },
+	error: function(XMLHttpRequest, textStatus, errorThrown) {
+/* 	alert('ERROR'); */
+/* 	$('#debug').html('<P>request<BR>'+escape(XMLHttpRequest)); */
+/* 	$('#debug').append('<P>status<BR>'+escape(textStatus)); */
+/* 	$('#debug').append('<P>error<BR>'+escape(errorThrown)); */
+        }
+    });
+}
+
+
 --></script>

 <?php
@@ -291,19 +303,17 @@ echo ('<DIV CLASS="receipt grid-selection-text">' .


 echo $this->element('statement_entries', array
-		    (// Grid configuration
+		    (// Element configuration
+		     'account_ftype' => 'credit',
+		     'limit' => 8,
+
+		     // Grid configuration
 		     'config' => array
 		     (
 		      'grid_div_id' => 'charge-entries',
 		      'grid_div_class' => 'text-below',
-		      'grid_events' => array('loadComplete' => 'onGridLoadComplete()'),
-		      'grid_setup' => array('hiddengrid' => true),
 		      'caption' => '<SPAN id="receipt-charges-caption"></SPAN>',
-		      'action' => 'unreconciled',
-		      'exclude' => array('Customer', 'Type', 'Debit', 'Credit'),
-		      'include' => array('Applied', 'Balance'),
-		      'remap' => array('Applied' => 'Paid'),
-		      'limit' => 8,
+		      'rows' => $charges,
 		      ),
 		     ));

@@ -383,18 +393,19 @@ Configure::write('debug', '0');
                      showCurrentAtPos: 0,
                      dateFormat: 'mm/dd/yy' });

+      datepickerNow('TransactionStamp');
+
      $("#receipt-customer-id").html("INTERNAL ERROR");
      $("#receipt-customer-name").html("INTERNAL ERROR");
      $("#receipt-balance").html("INTERNAL ERROR");
      $("#receipt-charges-caption").html("Outstanding Charges");

+      resetForm();
+
      <?php if (isset($customer['id'])): ?>
      $("#customer-id").val(<?php echo $customer['id']; ?>);
      //$("#receipt-customer-id").html("<?php echo '#'.$customer['id']; ?>");
-      $("#receipt-customer-id").html('<A HREF="' +
-				     "<?php echo $html->url(array('controller' => 'customers',
-		                                                  'action'     => 'view')); ?>"
-				     + "/" +
+      $("#receipt-customer-id").html('<A HREF="/pmgr/site/customers/view/' +
 				     "<?php echo $customer['id']; ?>" +
 				     '">#' +
 				     "<?php echo $customer['id']; ?>" +
@@ -406,14 +417,6 @@ Configure::write('debug', '0');
      onGridState(null, 'visible');
      <?php endif; ?>

-      resetForm();
-      datepickerNow('TransactionStamp');
-
-      <?php if ($this->params['dev']): ?>
-      $('#output-debug').html('Post Output');
-      $('#output-debug').show();
-      <?php endif; ?>
-
  });
 --></script>

--- a/site/views/double_entries/view.ctp
+++ b/site/views/double_entries/view.ctp
@@ -52,6 +52,8 @@ $ledgers        = array('debit'  => $entry['DebitLedger'],
 			'credit' => $entry['CreditLedger']);
 $entries        = array('debit'  => $entry['DebitEntry'],
 			'credit' => $entry['CreditEntry']);
+$customer       = $entry['Customer'];
+$lease          = $entry['Lease'];
 $entry          = $entry['DoubleEntry'];

 $rows = array();
@@ -61,7 +63,21 @@ $rows[] = array('Transaction',      $html->link('#'.$transaction['id'],
 						      'action'     => 'view',
 						      $transaction['id'])));
 $rows[] = array('Timestamp',        FormatHelper::datetime($transaction['stamp']));
-$rows[] = array('Comment',          $entry['comment']);
+$rows[] = array('Effective',        FormatHelper::date($entry['effective_date']));
+//$rows[] = array('Through',          FormatHelper::date($entry['through_date']));
+$rows[] = array('Customer',         (isset($customer['name'])
+				     ? $html->link($customer['name'],
+						   array('controller' => 'customers',
+							 'action'     => 'view',
+							 $customer['id']))
+				     : null));
+$rows[] = array('Lease',            (isset($lease['id'])
+				     ? $html->link('#'.$lease['id'],
+						   array('controller' => 'leases',
+							 'action'     => 'view',
+							 $lease['id']))
+				     : null));
+$rows[] = array('Comment',           $entry['comment']);

 echo $this->element('table',
 		    array('class'   => 'item ledger-entry detail',
@@ -116,8 +132,8 @@ foreach ($ledgers AS $type => $ledger) {
 					   array('controller' => 'ledgers',
 						 'action'     => 'view',
 						 $ledger['id'])));
-  $rows[] = array('Amount',    FormatHelper::currency($entries[$type]['amount']));
-  //$rows[] = array('Effect',    $ledger['Account']['ftype'] == $type ? 'INCREASE' : 'DECREASE');
+  $rows[] = array('Amount',    FormatHelper::currency($entry['amount']));
+  $rows[] = array('Effect',    $ledger['Account']['ftype'] == $type ? 'INCREASE' : 'DECREASE');

  echo $this->element('table',
 		      array('class'   => array('item', $type, 'detail'),
--- a/site/views/elements/jqGrid.ctp
+++ b/site/views/elements/jqGrid.ctp
@@ -46,12 +46,12 @@ if (!isset($grid_setup))
  $grid_setup = array();

 // Do some prework to bring in the appropriate libraries
-$imgpath = '/pmgr/site/css/jqGrid/basic/images';
-$html->css('jqGrid/basic/grid', null, null, false);
-$html->css('jqGrid/jqModal', null, null, false);
-$javascript->link('jqGrid/jquery.jqGrid.js', false);
-$javascript->link('jqGrid/js/jqModal', false);
-$javascript->link('jqGrid/js/jqDnR', false);
+$html->css('jqGrid/ui.jqgrid', null, null, false);
+//$html->css('jqGrid/jqModal', null, null, false);
+$javascript->link('jqGrid/grid.locale-en', false);
+$javascript->link('jqGrid/jquery.jqGrid.min', false);
+//$javascript->link('jqGrid/js/jqModal', false);
+//$javascript->link('jqGrid/js/jqDnR', false);
 $javascript->link('pmgr_jqGrid', false);


@@ -63,6 +63,7 @@ $javascript->link('pmgr_jqGrid', false);
 // as part of the data fetch.
 $url = $html->url(array('controller' => $controller,
 			'action'     => 'gridData',
+			'debug'      => 0,
 			));

 // Create extra parameters that jqGrid will pass to our
@@ -201,11 +202,11 @@ foreach (array_merge(array('loadComplete' => '', 'loadError' => ''),

  if ($event == 'loadComplete') {
    $grid_events[$event] = 
-      array('--special' => "function($params) {url=jQuery('#{$grid_id}').getGridParam('url');url=url+'/debug:1?'; pd=jQuery('#{$grid_id}').getPostData();$.each(pd,function(i){ url+=i+'='+escape(pd[i])+'&'; }); jQuery('#{$grid_id}-query').html('<A HREF=\"'+url+'\">Grid Query</A><BR>'); $statement;}");
+      array('--special' => "function($params) {url=jQuery('#{$grid_id}').getGridParam('url');url=url.replace(/\/debug.*$/,'?'); pd=jQuery('#{$grid_id}').getPostData();$.each(pd,function(i){ url+=i+'='+escape(pd[i])+'&'; }); jQuery('#{$grid_id}-query').html('<A HREF=\"'+url+'\">Grid Query</A><BR>'); $statement;}");
  }
  elseif ($event == 'loadError') {
    $grid_events[$event] = 
-      array('--special' => "function($params) {url=jQuery('#{$grid_id}').getGridParam('url');url=url+'/debug:1?'; pd=jQuery('#{$grid_id}').getPostData();$.each(pd,function(i){ url+=i+'='+escape(pd[i])+'&'; }); jQuery('#{$grid_id}-query').html('<A HREF=\"'+url+'\">Grid Error Query</A><BR>'); $statement;}");
+      array('--special' => "function($params) {url=jQuery('#{$grid_id}').getGridParam('url');url=url.replace(/\/debug.*$/,'?'); pd=jQuery('#{$grid_id}').getPostData();$.each(pd,function(i){ url+=i+'='+escape(pd[i])+'&'; }); jQuery('#{$grid_id}-query').html('<A HREF=\"'+url+'\">Grid Error Query</A><BR>'); $statement;}");
  }
  else {
    $grid_events[$event] = 
@@ -230,8 +231,8 @@ $jqGrid_setup = array_merge
 	 'sortname'    => $sortname,
 	 'sortorder'   => $sortorder,
 	 'caption'     => $caption,
-	 'imgpath'     => $imgpath,
 	 'viewrecords' => true,
+	 'gridview'    => true,
 	 'pager'       => $grid_id.'-pager',
 	 ),
   $grid_events,
@@ -250,16 +251,16 @@ $jqGrid_setup = array_merge
 <script type="text/javascript"><!--

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

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

  jQuery('#<?php echo $grid_id; ?>').jqGrid(
@@ -271,36 +272,6 @@ jQuery(document).ready(function(){
 		del:false,
 		search:true,
 		refresh:true});
-
-<?php
-/*   jQuery('#t_<?php echo $grid_id; ?>').height(25).hide() */
-/*     .filterGrid('#<?php echo $grid_id; ?>', { */
-/*       gridModel:true, */
-/* 	  gridToolbar:true, */
-/* 	  autosearch:true, */
-/* 	  }); */
-
-/*   jQuery('#<?php echo $grid_id; ?>').navGrid('#<?php echo $grid_id; ?>-pager', */
-/* 				   { view:false,   */
-/* 				     edit:false, */
-/* 				       add:false, */
-/* 				       del:false, */
-/* 				       search:false, */
-/* 				       refresh:false}) */
-/*     .navButtonAdd('#<?php echo $grid_id; ?>-pager',{ */
-/*       caption:"Search", */
-/* 	  title:"Toggle Search", */
-/* 	  buttonimg:'<?php echo $imgpath; ?>' + '/find.gif', */
-/* 	  onClickButton:function(){ */
-/* 	  if(jQuery('#t_<?php echo $grid_id; ?>').css("display")=="none") { */
-/* 	    jQuery('#t_<?php echo $grid_id; ?>').css("display",""); */
-/* 	  } else { */
-/* 	    jQuery('#t_<?php echo $grid_id; ?>').css("display","none"); */
-/* 	  } */
-/* 	} */
-/*       }); */
-?>
-
 });

 --></script>
--- a/site/views/elements/leases.ctp
+++ b/site/views/elements/leases.ctp
@@ -12,20 +12,9 @@ $cols['Signed']    = array('index' => 'Lease.lease_date',    'formatter' => 'dat
 $cols['Move-In']   = array('index' => 'Lease.movein_date',   'formatter' => 'date');
 $cols['Move-Out']  = array('index' => 'Lease.moveout_date',  'formatter' => 'date');
 $cols['Closed']    = array('index' => 'Lease.close_date',    'formatter' => 'date');
-$cols['Paid-Thru'] = array('index' => 'Lease.paid_through_date', 'formatter' => 'date');
-$cols['Status']    = array('index' => 'status',              'formatter' => 'enum', 'width' => 100);
 $cols['Balance']   = array('index' => 'balance',             'formatter' => 'currency');
 $cols['Comment']   = array('index' => 'Lease.comment',       'formatter' => 'comment');

-if (!empty($this->params['action'])) {
-  if ($this->params['action'] === 'closed')
-    $grid->invalidFields(array('Paid-Thru', 'Status'));
-  elseif ($this->params['action'] === 'active')
-    $grid->invalidFields(array('Closed'));
-  elseif ($this->params['action'] === 'delinquent')
-    $grid->invalidFields(array('Closed'));
-}
-
 // Render the grid
 $grid
 ->columns($cols)
@@ -33,4 +22,4 @@ $grid
 ->defaultFields(array('LeaseID', 'Lease'))
 ->searchFields(array('Customer', 'Unit'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Signed', 'Status', 'Comment')));
+	 array_diff(array_keys($cols), array('Comment')));
--- a/site/views/elements/statement_entries.ctp
+++ b/site/views/elements/statement_entries.ctp
@@ -21,11 +21,7 @@ $cols['Type']           = array('index' => 'StatementEntry.type', 'formatter' =>
 $cols['Debit']          = array('index' => 'charge',              'formatter' => 'currency');
 $cols['Credit']         = array('index' => 'disbursement',        'formatter' => 'currency');

-$cols['Amount']         = array('index' => "StatementEntry.amount", 'formatter' => 'currency');
 $cols['Applied']        = array('index' => "applied",             'formatter' => 'currency');
-// 'balance' is already in use as part of charge/disbursement/balance.
-// 'unapplied' isn't quite the right term, but it's not customer visible.
-$cols['Balance']        = array('index' => "unapplied",           'formatter' => 'currency');
 $cols['Sub-Total']      = array('index' => 'subtotal-balance',    'formatter' => 'currency', 'sortable' => false);


@@ -44,6 +40,6 @@ $grid
 ->searchFields(array('Customer', 'Unit'))
 ->render($this, isset($config) ? $config : null,
 	 array_diff(array_keys($cols), array('Through', 'Lease',
-					     'Amount', 'Applied', 'Balance', 'Sub-Total',
+					     'Applied', 'Sub-Total',
 					     'Comment')));

--- a/site/views/empty.ctp
+++ b/site/views/empty.ctp
@@ -1,5 +0,0 @@
-<?php /* -*- mode:PHP -*- */
-if (!empty($message))
-   echo $message;
-
-
--- a/site/views/helpers/format.php
+++ b/site/views/helpers/format.php
@@ -24,21 +24,9 @@ class FormatHelper extends AppHelper {
      return '-';
      //return null;

-    // Use of the $number->currency() function results in the clever,
-    // but problematic, use of cents for amounts less than $1.  For
-    // example, 50 cents is shown as '50c', not '$0.50'.  We want to
-    // keep everything in terms of dollars, especially for the cases
-    // where this result is placed into a form for input.  50 cents
-    // will end up as 50 dollars upon submission :-(
-    $currency = self::$number->format
-      (abs($amount),
-       array('places' => 2,
-	     'before' => $spans ? '' : (isset($dollar_sign) ? $dollar_sign : '$'),
-	     'after'  => $spans ? '' : null,
-	     ));
-
-    if ($amount < 0)
-      $currency = '(' . $currency . ')';
+    $currency = self::$number->currency($amount,
+					isset($dollar_sign) ? $dollar_sign : 'USD',
+					$spans ? array('before'=>'', 'after'=>'') : array());

    if ($spans)
      return ('<SPAN CLASS="dollar-sign">$</SPAN>' .
@@ -47,29 +35,22 @@ class FormatHelper extends AppHelper {
    return $currency;
  }

-  function date($date, $age = false, $class = null, $time = false) {
+  function date($date, $age = false) {
    if (!$date) return null;

-    if (empty($class))
-      $class = '';
-
-    if ($time)
-      $date_html = self::$time->nice($date);
-    else
-      $date_html = self::$time->format('m/d/Y', $date);
-
-    $date_html = '<span class="fmt-date '.$class.'">'.$date_html.'</span>';
-
-    if ($age) {
-      $date_html .= ' (' . self::age($date, $class, $time ? 0 : 60*60*24) . ')';
-      $date_html = '<span class="fmt-dateage '.$class.'">'.$date_html.'</span>';
-    }
-
-    return $date_html;
+    $date_fmt = 'm/d/Y';
+    return (self::$time->format($date_fmt, $date) .
+	    ($age
+	     ? ' (' . self::age($date, 60*60*24) . ')'
+	     : ''));
  }

-  function datetime($datetime, $age = false, $class = null) {
-    return self::date($datetime, $age, $class, true);
+  function datetime($datetime, $age = false) {
+    if (!$datetime) return null;
+    return (self::$time->nice($datetime) .
+	    ($age
+	     ? ' (' . self::age($datetime) . ')'
+	     : ''));
  }

  function phone($phone, $ext = null) {
@@ -100,13 +81,10 @@ class FormatHelper extends AppHelper {
    return $comment;
  }

-  function age($datetime, $class, $min_span = 0) {
+  function age($datetime, $min_span = 0) {
    if (!isset($datetime))
      return null;

-    if (empty($class))
-      $class = '';
-
    $now = time();
    $seconds = self::$time->fromString($datetime);
    $backwards = ($seconds > $now);
@@ -117,11 +95,9 @@ class FormatHelper extends AppHelper {

    //pr(compact('now', 'seconds', 'backwards', 'timefrom', 'timeto', 'span', 'min_span'));

-    // If now, just use 'now'
-    if ($span === 0) {
-      $approx = 0;
-      $unit = 'now';
-    }
+    // If now, just return so
+    if ($span === 0)
+      return __('now', true);

    // Display seconds if under 45 seconds
    if ($span < 45 && $span >= $min_span) {
@@ -188,33 +164,20 @@ class FormatHelper extends AppHelper {
    //pr(compact('span', 'min_span', 'approx', 'unit'));

    if ($approx == 0) {
-      if ($unit == 'now')
-	$age = 'now';
-      elseif ($unit == 'day')
-	$age = 'today';
-      else
-	$age = 'this ' . $unit;
+      if ($unit == 'day')
+	return __('today', true);
+
+      return __('this ' . $unit, true);
    }
-    else {
-      if (isset($relative))
-	$age = $relative;
-      elseif ($approx > $span)
-	$age = 'almost';
-      elseif ($approx < $span)
-	$age = 'over';
-      else
-	$age = '';

-      $age .= ' ' . self::_n($approx, $unit);
-
-      if ($backwards)
-	$age .= ' ago';
-
-    }
-    
-    $age = '<span class="fmt-age '.$class.'">'.__($age, true).'</span>';
-
-    return $age;
+    return (__(isset($relative)
+	       ? $relative
+	       : ($approx == $span
+		  ? ''
+		  : ($approx > $span ? 'almost' : 'over')), true)
+	    . ' '
+	    . self::_n($approx, $unit)
+	    . ($backwards ? '' : __(' ago', true)));
  }

 /*****************************
--- a/site/views/helpers/grid.php
+++ b/site/views/helpers/grid.php
@@ -166,14 +166,9 @@ class GridHelper extends AppHelper {
    $included = array_diff(array_merge($this->included, $included),
 			   array_merge($this->invalid, $excluded));

-    // Defined the columns, based on the inclusion set,
-    // remapping column names as necessary.
-    $this->jqGrid_options['jqGridColumns'] = array();
-    foreach (array_intersect_key($this->columns, array_flip($included)) AS $name => $col) {
-      if (!empty($config['remap'][$name]))
-	$name = $config['remap'][$name];
-      $this->jqGrid_options['jqGridColumns'][$name] = $col;
-    }
+    // Extract the columns that correspond to the inclusion set
+    $this->jqGrid_options['jqGridColumns']
+      = array_intersect_key($this->columns, array_flip($included));

    // Make sure search fields are all part of the inclusion set
    $this->jqGrid_options['search_fields']
@@ -229,4 +224,4 @@ class GridHelper extends AppHelper {
    return $this;
  }
  
-}
+}
--- a/site/views/layouts/default.ctp
+++ b/site/views/layouts/default.ctp
@@ -35,12 +35,12 @@
 		echo $html->css('layout') . "\n";
 		echo $html->css('print', null, array('media' => 'print')) . "\n";
 		echo $html->css('sidemenu') . "\n";
-		//echo $html->css('jquery/base/ui.all') . "\n";
-		//echo $html->css('jquery/smoothness/ui.all') . "\n";
-		//echo $html->css('jquery/dotluv/ui.all') . "\n";
-		echo $html->css('jquery/start/ui.all') . "\n";
-		echo $javascript->link('jquery/jquery') . "\n";
-		echo $javascript->link('jquery/jquery-ui') . "\n";
+		echo $javascript->link('http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js') . "\n";
+		echo $javascript->link('http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js') . "\n";
+		//echo $html->css('themes/base/ui.all') . "\n";
+		//echo $html->css('themes/smoothness/ui.all') . "\n";
+		//echo $html->css('themes/dotluv/ui.all') . "\n";
+		echo $html->css('themes/start/ui.all') . "\n";
 		echo $javascript->link('jquery.form') . "\n";
 		echo $javascript->link('pmgr') . "\n";
 		echo $scripts_for_layout . "\n";
--- a/site/views/leases/invoice.ctp
+++ b/site/views/leases/invoice.ctp
@@ -64,20 +64,14 @@ function showResponse(responseText, statusText)  {

    if (!$("#repeat").attr("checked")) {
      window.location.href =
-      <?php if (empty($movein)): ?>
 	"<?php echo $html->url(array('controller' => 'leases',
 		                     'action'     => 'view')); ?>"
 	+ "/" + $("#lease-id").val();
-      <?php else: ?>
-	"<?php echo $html->url(array('controller' => 'customers',
-		                     'action'     => 'receipt')); ?>"
-	+ "/" + $("#lease-id").val();
-      <?php endif; ?>
      return;
    }

    // get a clean slate
-    resetForm();
+    //resetForm();
  }
  else {
    $('#results').html('<H2>Failed to save invoice!</H2>');
@@ -105,10 +99,7 @@ function onRowSelect(grid_id, lease_id) {
  //   This is not intended as a long term solution,
  //   but I need a way to enter data and then view
  //   the results.  This link will help.
-  $("#invoice-lease").html('<A HREF="' +
-			   "<?php echo $html->url(array('controller' => 'leases',
-		                                        'action'     => 'view')); ?>"
-			   + "/" +
+  $("#invoice-lease").html('<A HREF="/pmgr/site/leases/view/' +
 			   $(grid_id).getCell(lease_id, 'Lease-id').replace(/^#/,'') +
 			   '">' +
 			   $(grid_id).getCell(lease_id, 'Lease-number') +
@@ -207,24 +198,23 @@ function addChargeSource(flash) {
 // Re-Enable warnings
 Configure::write('debug', $saved_debug_state);

-if (empty($movein))
-  echo $this->element('leases', array
-		      ('config' => array
-		       ('grid_div_id' => 'leases-list',
-			'grid_div_class' => 'text-below',
-			'caption' => ('<A HREF="#" ONCLICK="$(\'#leases-list .HeaderButton\').click();'.
-				      ' return false;">Select Lease</A>'),
-			'grid_setup' => array('hiddengrid' => isset($lease['id'])),
-			'grid_events' => array('onSelectRow' =>
-					       array('ids' =>
-						     'if (ids != null){onRowSelect("#"+$(this).attr("id"), ids);}'),
-					       'onHeaderClick' =>
-					       array('gridstate' =>
-						     'onGridState("#"+$(this).attr("id"), gridstate)'),
-					       ),
-			'nolinks' => true,
-			'limit' => 10,
-			)));
+echo $this->element('leases', array
+		    ('config' => array
+		     ('grid_div_id' => 'leases-list',
+		      'grid_div_class' => 'text-below',
+		      'caption' => ('<A HREF="#" ONCLICK="$(\'#leases-list .HeaderButton\').click();'.
+				    ' return false;">Select Lease</A>'),
+		      'grid_setup' => array('hiddengrid' => isset($lease['id'])),
+		      'grid_events' => array('onSelectRow' =>
+					     array('ids' =>
+						   'if (ids != null){onRowSelect("#"+$(this).attr("id"), ids);}'),
+					     'onHeaderClick' =>
+					     array('gridstate' =>
+						   'onGridState("#"+$(this).attr("id"), gridstate)'),
+					     ),
+		      'nolinks' => true,
+		      'limit' => 10,
+		      )));

 echo ('<DIV CLASS="invoice grid-selection-text">' .

@@ -276,13 +266,10 @@ echo $this->element('form_table',

 /* echo '</fieldset>' . "\n"; */

-if (empty($movein)) {
-  echo "<BR>\n";
-  echo $form->input('repeat', array('type'  => 'checkbox',
-				    'id'    => 'repeat',
-				    'label' => 'Enter Multiple Invoices')) . "\n";
-}
-
+echo "<BR>\n";
+echo $form->input('repeat', array('type'  => 'checkbox',
+				  'id'    => 'repeat',
+				  'label' => 'Enter Multiple Invoices')) . "\n";
 echo $form->submit('Generate Invoice') . "\n";
 ?>

@@ -344,7 +331,6 @@ Configure::write('debug', '0');
 	 ' value="<?php echo date('m/d/Y', $movein['time']); ?>">');
      $("#TransactionComment").val('Move-In Charges');

-      <?php if ($movein['deposit'] != 0): ?>
      id = addChargeSource(false);
      $('#Entry'+id+'Form').removeCol(2);
      $('#Entry'+id+'Form input, #Entry'+id+'Form select').attr('disabled', true);
@@ -365,7 +351,7 @@ Configure::write('debug', '0');
 	 ' value="<?php echo FormatHelper::currency($movein['deposit']); ?>">');
      //$('#Entry'+id+'Comment').val('Move-In Security Deposit');
      $('#Entry'+id+'Comment').removeAttr('disabled');
-      <?php endif; ?>
+

      id = addChargeSource(false);
      $('#Entry'+id+'Form').removeCol(2);
@@ -390,7 +376,8 @@ Configure::write('debug', '0');
 	('<input type="hidden"' +
 	 ' name="data[Entry]['+id+'][amount]"' +
 	 ' value="<?php echo FormatHelper::currency($movein['prorated_rent']); ?>">');
-      $('#Entry'+id+'Comment').val("<?php echo($movein['prorated'] ? 'Move-In Rent (Prorated)' : ''); ?>");
+      $('#Entry'+id+'Comment').val('Move-In Rent'
+				   <?php if ($movein['prorated']) echo "+ ' (Prorated)'" ?>);
      $('#Entry'+id+'Comment').removeAttr('disabled');

      <?php endif; ?>
@@ -399,10 +386,7 @@ Configure::write('debug', '0');
      <?php if (isset($lease['id'])): ?>
      $("#lease-id").val(<?php echo $lease['id']; ?>);
      //$("#invoice-lease").html("<?php echo '#'.$lease['number']; ?>");
-      $("#invoice-lease").html('<A HREF="' +
-			       "<?php echo $html->url(array('controller' => 'leases',
-		                                            'action'     => 'view')); ?>"
-			       + "/" +
+      $("#invoice-lease").html('<A HREF="/pmgr/site/leases/view/' +
 			       "<?php echo $lease['id']; ?>" +
 			       '">#' +
 			       "<?php echo $lease['number']; ?>" +
@@ -416,12 +400,6 @@ Configure::write('debug', '0');
      <?php else: ?>
      onGridState(null, 'visible');
      <?php endif; ?>
-
-      <?php if ($this->params['dev']): ?>
-      $('#output-debug').html('Post Output');
-      $('#output-debug').show();
-      <?php endif; ?>
-
  });
 --></script>

--- a/site/views/leases/move.ctp
+++ b/site/views/leases/move.ctp
@@ -128,7 +128,7 @@ if ($move_type !== 'out') {
 					       ),
 			'include' => array('Deposit'),
 			'exclude' => array('Balance'),
-			'action' => 'vacant',
+			'action' => 'unoccupied',
 			'nolinks' => true,
 			'limit' => 10,
 			)));
--- a/site/views/leases/view.ctp
+++ b/site/views/leases/view.ctp
@@ -39,6 +39,7 @@ $rows[] = array('Notice Received',  FormatHelper::date($lease['notice_received_d
 $rows[] = array('Closed',           FormatHelper::date($lease['close_date'], true));
 $rows[] = array('Deposit',          FormatHelper::currency($lease['deposit']));
 $rows[] = array('Rent',             FormatHelper::currency($lease['rent']));
+$rows[] = array('Paid Through',     FormatHelper::date($lease['paid_through'], true));
 $rows[] = array('Comment',          $lease['comment']);


@@ -57,9 +58,6 @@ echo '<div class="infobox">' . "\n";
 $rows = array();
 $rows[] = array('Security Deposit:',  FormatHelper::currency($outstandingDeposit));
 $rows[] = array('Balance Owed:',      FormatHelper::currency($outstandingBalance));
-$rows[] = array('Paid Through:',      FormatHelper::date($lease['paid_through_date'], false));
-if ($lease['delinquent'])
-  $rows[] = array('Delinquent:',      FormatHelper::age($lease['paid_through_date'], 'delinquent'));
 echo $this->element('table',
 		    array('class'   => 'summary',
 			  'rows'    => $rows,
--- a/site/views/ledger_entries/view.ctp
+++ b/site/views/ledger_entries/view.ctp
@@ -14,7 +14,6 @@ $ledger         = $entry['Ledger'];
 $account        = $ledger['Account'];
 $tender         = $entry['Tender'];
 $matching       = $entry['MatchingEntry'];
-$double         = $entry['DoubleEntry'];
 $entry          = $entry['LedgerEntry'];

 $rows = array();
@@ -44,10 +43,6 @@ $rows[] = array('Cr/Dr',            ($entry['crdr'] .
 							 'action'     => 'view',
 							 $matching['id'])) .
 				     ')'));
-$rows[] = array('Double Entry',     $html->link('#'.$double['id'],
-						array('controller' => 'double_entries',
-						      'action'     => 'view',
-						      $double['id'])));
 $rows[] = array('Comment',           $entry['comment']);

 echo $this->element('table',
--- a/site/views/statement_entries/view.ctp
+++ b/site/views/statement_entries/view.ctp
@@ -15,7 +15,7 @@ $customer       = $entry['Customer'];
 $lease          = $entry['Lease'];
 $entry          = $entry['StatementEntry'];

-$Ttype = ucwords(strtolower(str_replace('_', ' ', $transaction['type'])));
+$Ttype = ucfirst(strtolower($transaction['type']));

 $rows = array();
 $rows[] = array('ID',               $entry['id']);
@@ -113,9 +113,9 @@ echo $this->element('statement_entries', array

 		     // Grid configuration
 		     'config' => array
-		     ('caption'     => $applied_caption,
+		     ('caption'     => 'Entries Applied',
 		      //'filter' => array('id' => $entry['id']),
-		      'exclude' => array('Transaction'),
+		      'exclude' => array('Entry'),
 		      )));


--- a/site/views/tenders/deposit.ctp
+++ b/site/views/tenders/deposit.ctp
@@ -30,8 +30,7 @@ foreach ($depositTypes AS $type) {
 			  'separator' => '<BR>',
 			  'onclick' => "switchSelection({$type['id']})",
 			  'legend' => false,
-			  // REVISIT <AP>: 20080811; Make opt-in, or opt-out?
-			  'value' => $type['stats']['undeposited'] > 0 ? 'none' : 'none',
+			  'value' => $type['stats']['undeposited'] > 0 ? 'all' : 'none',
 			  'disabled' => $type['stats']['undeposited'] <= 0,
 			  'options' => $radioOptions,
 			  ));
--- a/site/views/tenders/edit.ctp
+++ b/site/views/tenders/edit.ctp
@@ -26,7 +26,7 @@ if (empty($this->data['Tender']))
  INTERNAL_ERROR('Creation of new Tender not allowed.');

 echo $form->input('tender_type_id',
-		  array('div' => 'tender input',
+		  array('div' => 'tender',
 			// REVISIT <AP>: 20090810
 			//  We're not ready to allow changing the type
 			//  of a tender, since it will force us to deal
@@ -59,6 +59,7 @@ foreach ($types AS $type) {

  for ($i=1; $i<=4; ++$i) {
    if (!empty($type["data{$i}_name"])) {
+      echo ("<!-- data{$i}_name -->\n");
      echo $form->input("type.{$type['id']}.data$i",
 			array('label' => $type["data{$i}_name"],
 			      'div' => 'input text tender',
--- a/site/views/transactions/refund.ctp
+++ b/site/views/transactions/refund.ctp
@@ -58,7 +58,7 @@ echo $this->element('form_table',
 			   "amount"       => array('prefix' => 'Entry.0',
 						   'opts' =>
 						   array('value' =>
-							 FormatHelper::currency($balance),
+							 FormatHelper::currency($balance, false, ''),
 							 ),
 						   ),
 			   "account_id"   => array('prefix' => 'Entry.0',
--- a/site/views/transactions/view.ctp
+++ b/site/views/transactions/view.ctp
@@ -11,14 +11,13 @@ echo '<div class="transaction view">' . "\n";

 $account     = $transaction['Account'];
 $ledger      = $transaction['Ledger'];
-$nsf_tender  = $transaction['NsfTender'];

 if (isset($transaction['Transaction']))
  $transaction = $transaction['Transaction'];

 $rows = array();
 $rows[] = array('ID',        $transaction['id']);
-$rows[] = array('Type',      str_replace('_', ' ', $transaction['type']));
+$rows[] = array('Type',      $transaction['type']);
 $rows[] = array('Timestamp', FormatHelper::datetime($transaction['stamp']));
 $rows[] = array('Amount',    FormatHelper::currency($transaction['amount']));
 $rows[] = array('Account',   $html->link($account['name'],
@@ -29,11 +28,7 @@ $rows[] = array('Ledger',    $html->link($ledger['name'],
 					 array('controller' => 'ledgers',
 					       'action'     => 'view',
 					       $ledger['id'])));
-if (!empty($nsf_tender['id']))
-  $rows[] = array('NSF Tender', $html->link($nsf_tender['name'],
-					    array('controller' => 'tenders',
-						  'action'     => 'view',
-						  $nsf_tender['id'])));
+$rows[] = array('Comment',   $transaction['comment']);

 echo $this->element('table',
 		    array('class'   => 'item transaction detail',
@@ -84,8 +79,7 @@ if ($transaction['type'] === 'INVOICE' ||
 			'caption' => 'Statement Entries',
 			'filter' => array('Transaction.id' => $transaction['id'],
 					  'type !=' => 'VOID'),
-			'exclude' => array('Transaction', 'Debit', 'Credit'),
-			'include' => array('Amount'),
+			'exclude' => array('Transaction', 'Account'),
 			)));
 }

--- a/site/views/units/view.ctp
+++ b/site/views/units/view.ctp
@@ -81,14 +81,12 @@ if (isset($current_lease['id'])) {
 			 'config' => array
 			 (
 			  'caption' =>
-			  ('Current Lease Statement ('
+			  ('Current Lease Account ('
 			   . $current_lease['Customer']['name']
 			   . ')'),
 			  'filter' => array('Lease.id' => $current_lease['id']),
 			  'include' => array('Through'),
 			  'exclude' => array('Customer', 'Lease', 'Unit'),
-			  'sort_column' => 'Effective',
-			  'sort_order'  => 'DESC',
 			  )));
 }

--- a/site/webroot/css/jqGrid/basic/grid.css
+++ b/site/webroot/css/jqGrid/basic/grid.css
@@ -1,447 +0,0 @@
-.GridHeader {
-}
-.Header {
-	width: 100%;
-	}
-
-.Header th { 
-	font-size: 100%; font-weight: bold; text-align: left;
-	padding: 2px;
-	background-image: url(images/headerbg.gif) ;
-	color: #FFFFFF;
-	width: 100%;
-	white-space: nowrap;
-	}
-
-.HeaderLeft { 
-	background-image: url(images/headerleft.gif);
-	}
-
-.HeaderRight { 
-	background-image: url(images/headerright.gif);
-	}
-.HeaderButton {
-	background-image: url(images/headerbg.gif);	
-}
-.HeaderButton img{
-	width: 17px;
-}
-
-.HeaderLeft img{
-	width: 14px;
-	}
-
-.HeaderRight img{
-	width: 10px;
-	}
-
-.GridHeader table {margin:0;}
-.GridHeader td, tr {padding:0;}
-/* Grid */
-table.scroll {
-	table-layout: fixed;
-	/*border-right: 1px solid #D4D0C8;*/
-	margin-bottom:0;
-}
-table.scroll tbody tr {
-	background-color: #ffffff; 
-}
-
-table.scroll tbody tr.alt {
-	background-color: #F9F9F9;
-}
-	
-table.scroll tr.over td{
-	background-color: #E1DCF4;
-}
-	
-	table.scroll tr.selected td {
-	background: #3d84cc;
-	color: White;
-}
-
-	table.scroll tbody td  {
-	padding: 2px;
-	text-align: left;
-	border-bottom: 1px solid #D4D0C8;
-	border-left: 1px solid #D4D0C8; 
-	text-overflow: ellipsis;
-	overflow: hidden;
-	white-space: nowrap;
-	height : auto;
-}
-	
-	table.scroll thead th  {
-	padding: 2px;
-	border-bottom: 1px solid #CBC7B8; 
-	border-left: 1px solid #D4D0C8; 
-	text-align: left;
-	font-weight: normal;
-	overflow: hidden;
-	white-space: nowrap;
-	background-image: url(images/grid-blue-hd.gif);
-	height : 17px;
-}
-	
-	table.scroll th div {
-	overflow: hidden;
-/*	white-space: nowrap;*/
-	word-wrap: break-word;
-	height : 17px;
-}
-	table.scroll th span {
-	cursor: e-resize;
-/*	border-right: 1px solid #D6D2C2;  */
-	width: 10px;
-	float: right;
-	display: block;
-	margin: -2px -1px -2px 0px;
-	height: 17px;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-/* End Grid */
-
-/* Pager */
-div.scroll {
-	vertical-align: top;
-	height: 23px;
-	white-space: nowrap;
-	text-align: center;
-	background-image: url(images/grid-blue-ft.gif);
-}
-div.scroll span {
-	vertical-align : top; 	
-}
-.selbox {
-	font-size: x-small;
-	vertical-align : top;
-}
-input.selbox{
-	font-size: x-small;
-	vertical-align : top;
-}
-.pgbuttons {
-	margin-top :2px;
-}
-.nav-table-left {
-	padding:1px;
-	float: left;
-/*	position:absolute;*/
-}
-.nav-table-right {
-	padding:1px;
-	float: right;
-}
-
-table.navtable {margin-bottom:0; width: auto;}
-table.navtable tr{
-	background-image: url(images/grid-blue-ft.gif);	
-}
-
-table.navtable td.nav-button {
-	border: 1px solid #E2ECF8;
-	white-space: nowrap;
-}
-
-table.navtable td.nav-hover {
-	border: 1px solid #83B4D8;
-}
-
-table.tbutton tr td{
-	border : none;
-	padding:0px;
-}
-
-img.jsHover { /*not used */
-	border: 1px solid #99CCFF;
-}
-/* End Pager */
-/*multiselect checkbox */
-.cbox {
-	height: 10px;
-	width: 10px;
-	/*border:1px solid #999;*/
-}
-/* end multiselect */
-
-
-/* loading div */
-div.loading {
-	position: absolute;
-	padding: 3px;
-	text-align: center;
-	font-weight: bold;
-	background: red;
-	color: white;
-	display: none;
-}
-
-div.loadingui {
-   display:none;
-   z-index:6000;
-   position:absolute;
-}
-
-
-div.loadingui div.msgbox {
-   position: relative;
-   z-index:6001;
-   left: 35%;
-   top:45%;
-   background: url(images/loading.gif)  no-repeat left;
-   width: 100px;
-   border: 2px solid #B2D2FF;
-   text-align: right;
-   height: auto;
-   padding:2px;
-   margin: 0px;
-} 
-/* end loading div */
-/* toolbar */
-div.userdata {
-	margin-top: 0px;
-	background-color : #EAF9F9;
-	height : 20px;
-	overflow: hidden;	
-}
-/* end toolbar */
-/*Subgrid  text mode*/
-.subgrid {
-	height: 100%;
-	overflow:  auto;
-}
-.tablediv {
-	background-color: White;
-	border-spacing: 1px; /*cellspacing:poor IE support for  this*/
-	border-collapse: separate;
-	width:100%; /* FF hack poor when scroling subgrid */
-}
-.celldiv {
-	float: left;
-	display: table-cell;
-	border: 1px dotted #CCCCCC;
-	overflow: auto;
-	white-space: normal;
-}
-.celldivth {
-	float: left; /*fix for  buggy browsers*/
-	border: 1px solid #CCCCCC;
-	background-color: #99CCFF;
-	border-bottom: 1px solid #CBC7B8;
-	text-align: left;
-	overflow: auto;
-}
-.rowdiv  {
-	display: table-row;
-	background: #F9F9F9 none;
-	color: #000000;
-	width: 100%;
-	overflow:auto;
-}
-/* End Subgrid */
-
-/* InLine editing */
-input.editable[type="text"] {
-	font-size: x-small;
-	overflow: hidden;
-	height : 15px;
-}
-input.editable[type="checkbox"]  {
-}
-
-textarea.editable {
-	overflow: hidden;
-}
-
-select.editable {
-	font-size: x-small;
-}
-/* End Inline Editing */
-
-/*Modal Window */
-.modaltext{ 
-    text-align : left;
-}
-.modalwin{
-    border:1px solid #555555;
-    background:#F9F9F9;
-    text-align:left;
-    margin: 0 auto;
-	overflow: auto;
-}
-
-
-.modalhead {
-	background-image: url(images/grid-blue-hd.gif);
-	height: 20px;
-	
-}
-.modalcontent {
-	overflow: auto;
-	margin-bottom: 9px;
-	margin-left: 5px;
-}
-/* end Modal window*/
-/* Search window */
-input.search {
-	margin: 2px;
-	width: 70px;
-	font-size: 10px;
-	color: #15428B;	
-}
-
-select.search {
-	margin: 2px;
-	width: 70px;
-	font-size: 10px;
-	color: #15428B;		
-}
-.buttonsearch {
-	width : 50px;
-	font-size: 10px;
-	color: #15428B;		
-}
-/*End search */
-
-/* Form edit */
-
-.FormGrid {
-	margin: 0px;
-}
-.EditTable {
-	width: 100%;
-}
-
-.FormData { /* tr */
-	
-}
-
-#FormError td {
-	font-size: 90%;
-	color: #FF0000;
-	vertical-align: top;
-	background-color: #f7f7f7; 
-}
-
-.CaptionTD{ /* td */
-	font-weight: normal; text-align: left; vertical-align: top;
-	padding: 1px;
-	border-top: 1px solid #D4D0C8;
-	white-space: nowrap;
-	color: #000000;
-}
-.DataTD { /* td */
-	padding: 1px;
-	border-top: 1px solid #D4D0C8;
-	vertical-align: top;
-}
-.navButton{
-	border-top: 1px solid #D4D0C8;
-	border-bottom: 1px solid #D4D0C8;
-	text-align: center;
-}
-.navButton input{
-	width:17px;
-}
-input.EditButton { /* buttons are at footer tr */
-	font-size: 10px;
-	color: #15428B;
-}
-td.EditButton {
-	text-align: right;
-	border-top: 1px solid #D4D0C8;
-	border-bottom: 1px solid #D4D0C8;
-}
-
-.FormElement { /* form element  - input -text,textarea,checkbox - select  */
-	
-}
-.FormElement {
-	font-size: 10px;	
-}
-input[type="text"].FormElement{
-	color: #15428B;		
-}
-input[type="checkbox"].FormElement{
-	width: 15px;
-	color: #15428B;		
-}
-input[type="textarea"].FormElement{
-	color: #15428B;		
-}
-select.FormElement {
-	font-size: 10px;
-	color: #15428B;		
-}
-/* End Eorm edit */
-
-/* Delete Dialog */
-.DelButton > input { /* buttons are at footer tr */
-	font-size: 10px;
-	color: #15428B;
-}
-.DelButton {
-	text-align: right;
-}
-/* End Delete Dialog */
-
-img.jqResize {
-	position:absolute;
-	bottom: 0px;
-	right: 0px;
-	cursor :se-resize;
-}
-.dirty-cell {
-	background: transparent url(images/dirty.gif) no-repeat 0 0;	
-}
-#DelError td {
-	font-size: 90%;
-	color: #FF0000;
-	vertical-align: top;
-	background-color: #f7f7f7; 
-}
-/* Tree Grid */
-.tree-wrap
-{
-	float: left; 
-	position: relative;
-	height: 18px;
-	white-space: nowrap;
-	overflow: hidden;
-}
-.tree-minus
-{
-	position: absolute;
-	height: 18px; 
-	width: 16px;
-	overflow: hidden;
-	background: url(images/tree_minus.gif) no-repeat;
-}
-.tree-plus
-{
-	position: absolute;
-	height: 18px; 
-	width: 16px;
-	overflow: hidden;
-	background: url(images/tree_plus.gif) no-repeat;
-}
-.tree-leaf
-{
-	position: absolute;
-	height: 18px; 
-	width: 16px;
-	overflow: hidden;
-	background: url(images/tree_leaf.gif) no-repeat;
-}
-.treeclick
-{
-	cursor: pointer;
-}
-.edit-cell {
-	background-color: #E1DCF4 !important;
-}
-.selected-row, .selected-row TD {
-	background-color: #3d84cc; 
-}
--- a/site/webroot/css/jqGrid/basic/images/cd_run.gif
+++ b/site/webroot/css/jqGrid/basic/images/cd_run.gif
--- a/site/webroot/css/jqGrid/basic/images/dirty.gif
+++ b/site/webroot/css/jqGrid/basic/images/dirty.gif
--- a/site/webroot/css/jqGrid/basic/images/down.gif
+++ b/site/webroot/css/jqGrid/basic/images/down.gif
--- a/site/webroot/css/jqGrid/basic/images/find.gif
+++ b/site/webroot/css/jqGrid/basic/images/find.gif
--- a/site/webroot/css/jqGrid/basic/images/first.gif
+++ b/site/webroot/css/jqGrid/basic/images/first.gif
--- a/site/webroot/css/jqGrid/basic/images/folder.png
+++ b/site/webroot/css/jqGrid/basic/images/folder.png
--- a/site/webroot/css/jqGrid/basic/images/grid-blue-ft.gif
+++ b/site/webroot/css/jqGrid/basic/images/grid-blue-ft.gif
--- a/site/webroot/css/jqGrid/basic/images/grid-blue-hd.gif
+++ b/site/webroot/css/jqGrid/basic/images/grid-blue-hd.gif
--- a/site/webroot/css/jqGrid/basic/images/headerbg.gif
+++ b/site/webroot/css/jqGrid/basic/images/headerbg.gif
--- a/site/webroot/css/jqGrid/basic/images/headerleft.gif
+++ b/site/webroot/css/jqGrid/basic/images/headerleft.gif
--- a/site/webroot/css/jqGrid/basic/images/headerright.gif
+++ b/site/webroot/css/jqGrid/basic/images/headerright.gif
--- a/site/webroot/css/jqGrid/basic/images/ico-close.gif
+++ b/site/webroot/css/jqGrid/basic/images/ico-close.gif
--- a/site/webroot/css/jqGrid/basic/images/last.gif
+++ b/site/webroot/css/jqGrid/basic/images/last.gif
--- a/site/webroot/css/jqGrid/basic/images/line3.gif
+++ b/site/webroot/css/jqGrid/basic/images/line3.gif
--- a/site/webroot/css/jqGrid/basic/images/loading.gif
+++ b/site/webroot/css/jqGrid/basic/images/loading.gif
--- a/site/webroot/css/jqGrid/basic/images/minus.gif
+++ b/site/webroot/css/jqGrid/basic/images/minus.gif
--- a/site/webroot/css/jqGrid/basic/images/next.gif
+++ b/site/webroot/css/jqGrid/basic/images/next.gif
--- a/site/webroot/css/jqGrid/basic/images/nochild.gif
+++ b/site/webroot/css/jqGrid/basic/images/nochild.gif
--- a/site/webroot/css/jqGrid/basic/images/off-first.gif
+++ b/site/webroot/css/jqGrid/basic/images/off-first.gif
--- a/site/webroot/css/jqGrid/basic/images/off-last.gif
+++ b/site/webroot/css/jqGrid/basic/images/off-last.gif
--- a/site/webroot/css/jqGrid/basic/images/off-next.gif
+++ b/site/webroot/css/jqGrid/basic/images/off-next.gif
--- a/site/webroot/css/jqGrid/basic/images/off-prev.gif
+++ b/site/webroot/css/jqGrid/basic/images/off-prev.gif
--- a/site/webroot/css/jqGrid/basic/images/plus.gif
+++ b/site/webroot/css/jqGrid/basic/images/plus.gif
--- a/site/webroot/css/jqGrid/basic/images/prev.gif
+++ b/site/webroot/css/jqGrid/basic/images/prev.gif
--- a/site/webroot/css/jqGrid/basic/images/refresh.gif
+++ b/site/webroot/css/jqGrid/basic/images/refresh.gif
--- a/site/webroot/css/jqGrid/basic/images/resize.gif
+++ b/site/webroot/css/jqGrid/basic/images/resize.gif
--- a/site/webroot/css/jqGrid/basic/images/row_add.gif
+++ b/site/webroot/css/jqGrid/basic/images/row_add.gif
--- a/site/webroot/css/jqGrid/basic/images/row_delete.gif
+++ b/site/webroot/css/jqGrid/basic/images/row_delete.gif
--- a/site/webroot/css/jqGrid/basic/images/row_edit.gif
+++ b/site/webroot/css/jqGrid/basic/images/row_edit.gif
--- a/site/webroot/css/jqGrid/basic/images/sort_asc.gif
+++ b/site/webroot/css/jqGrid/basic/images/sort_asc.gif
--- a/site/webroot/css/jqGrid/basic/images/sort_desc.gif
+++ b/site/webroot/css/jqGrid/basic/images/sort_desc.gif
--- a/site/webroot/css/jqGrid/basic/images/spacer.gif
+++ b/site/webroot/css/jqGrid/basic/images/spacer.gif
--- a/site/webroot/css/jqGrid/basic/images/tab_close-on.gif
+++ b/site/webroot/css/jqGrid/basic/images/tab_close-on.gif
--- a/site/webroot/css/jqGrid/basic/images/tree_leaf.gif
+++ b/site/webroot/css/jqGrid/basic/images/tree_leaf.gif
--- a/site/webroot/css/jqGrid/basic/images/tree_minus.gif
+++ b/site/webroot/css/jqGrid/basic/images/tree_minus.gif
--- a/site/webroot/css/jqGrid/basic/images/tree_plus.gif
+++ b/site/webroot/css/jqGrid/basic/images/tree_plus.gif
--- a/site/webroot/css/jqGrid/basic/images/up.gif
+++ b/site/webroot/css/jqGrid/basic/images/up.gif
--- a/site/webroot/css/jqGrid/coffee/grid.css
+++ b/site/webroot/css/jqGrid/coffee/grid.css
@@ -1,457 +0,0 @@
-.GridHeader {
-}
-.Header {
-	width: 100%;
-	}
-
-.Header th { 
-	font-size: 100%; font-weight: bold; text-align: left;
-	padding: 2px;
-	background-image: url(images/headerbg.gif); color: #ffffff;
-	width: 100%;
-	white-space: nowrap;
-	}
-
-.HeaderLeft { 
-	background-image: url(images/headerleft.gif);
-	}
-
-.HeaderRight { 
-	background-image: url(images/headerright.gif);
-	}
-.HeaderButton {
-	background-image: url(images/headerbg.gif);	
-}
-.HeaderButton img{
-	width: 21px;
-}
-
-.HeaderLeft img{
-	width: 4px;
-	}
-
-.HeaderRight img{
-	width: 9px;
-	}
-.GridHeader table {margin:0;}
-.GridHeader td, tr {padding:0;}
-
-
-/* Grid */
-table.scroll {
-	border-right: 1px solid #FFFFFF;	
-	table-layout: fixed;
-	margin-bottom:0;
-}
-table.scroll tbody tr {
-	background-color: #eceae3; 
-}
-
-table.scroll tbody tr.alt{
-	background-color: #e3dfd1; 
-}
-	
-table.scroll tr.over td{
-	background-color: #D2B48C;
-}
-	
-	
-table.scroll tr.selected td {
-	background-color: #c9b9b1;
-	color: Black;
-}
-
-table.scroll tbody tr td  {
-	font-size: 90%;
-	padding: 2px;
-	text-align: left;
-	border-left: 1px solid #FFFFFF;
-	border-bottom: 1px solid #FFFFFF; 
-	text-overflow: ellipsis;
-	overflow: hidden;
-	white-space: nowrap;
-	height : auto;
-}
-
-table.scroll thead tr th  {
-	font-size: 90%;
-	font-weight: normal;
-	padding: 2px;
-	border-left: 1px solid #FFFFFF; 
-	border-bottom: 1px solid #FFFFFF; 
-	text-align: left;
-	overflow: hidden;
-	white-space: nowrap;
-	background: url(images/grid-blue-hd.gif) transparent repeat-x;
-	height : 18px;
-}
-table.scroll thead tr th div img {
-	width: 9px;
-}
-	
-table.scroll th div {
-	overflow: hidden;
-/*	white-space: nowrap;*/
-	word-wrap: break-word;
-	height : 18px;
-}
-	table.scroll th span {
-	cursor: e-resize;
-/*	border-right: 1px solid #D6D2C2;  */
-	width: 5px;
-	float: right;
-	position: relative;
-	display: block;
-	margin: -1px -1px -1px 0px;
-	height: 18px;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-table.scroll thead {
-}
-
-/* End Grid */
-
-/* Pager */
-div.scroll {
-	vertical-align: top;
-	height: 23px;
-	text-align: center;	
-	white-space: nowrap;
-	background-image: url(images/grid-blue-ft.gif);
-	border-right: 1px solid #FFFFFF;
-	border-left: 1px solid #FFFFFF;	
-	border-bottom: 1px solid #FFFFFF;
-}
-div.scroll span {
-	vertical-align : top;
-}
-.selbox {
-	font-size: x-small;
-	vertical-align : top;
-}
-input.selbox{
-	font-size: x-small;
-	vertical-align : top;
-}
-.pgbuttons {
-	margin-top :1px;
-}
-.nav-table-left {
-	padding:1px;
-	float: left;
-	margin-top:2px;
-/*	position:absolute;*/
-}
-.nav-table-right {
-	padding:1px;
-	float: right;
-	margin-top:2px;
-}
-table.navtable {margin-bottom:0; width: auto;}
-table.navtable tbody tr {
-	background-image: url(images/grid-blue-ft.gif);
-}
-table.navtable tbody tr td.nav-button {
-	border: 1px solid #FFFFFF;
-	white-space: nowrap;
-}
-table.navtable tbody tr td.nav-hover {
-	border: 1px solid #c9b9b1;
-}
-table.tbutton tbody tr td {
-	border : none;
-	padding:0px;
-}
-img.jsHover { /*not used */
-	border: 1px solid #99CCFF;
-}
-/* End Pager */
-/*multiselect checkbox */
-.cbox {
-	height: 10px;
-	width: 10px;
-/*	text-align: center;*/
-/*border:1px solid #999;*/
-}
-/* end multiselect */
-
-
-/* loading div */
-div.loading {
-	position: absolute;
-	padding: 3px;
-	text-align: center;
-	font-weight: bold;
-	background: red;
-	color: white;
-	display: none;
-}
-div.loadingui {
-   display:none;
-   z-index:6000;
-   position:absolute;
-}
-
-
-div.loadingui div.msgbox {
-   position: relative;
-   z-index:6001;
-   left: 35%;
-   top:45%;
-   background: url(images/loading.gif)  no-repeat left;
-   width: 100px;
-   border: 2px solid #B2D2FF;
-   text-align: right;
-   height: auto;
-   padding:2px;
-   margin: 0px;
-} 
-
-/* end loading div */
-/*toolbar */
-div.userdata {
-	margin-top: 0px;
-	background-color : #e3dfd1;
-	height : 20px;
-	overflow: hidden;	
-}
-/* end toolbar */
-/*Subgrid  text mode*/
-.subgrid {
-	height: 100%;
-	overflow:  auto;
-}
-.tablediv {
-	background-color: White;
-	border-spacing: 1px; /*cellspacing:poor IE support for  this*/
-	border-collapse: separate;
-	width:100%; /* FF hack poor when scroling subgrid */
-}
-.celldiv {
-	float: left;
-	display: table-cell;
-	border: 1px dotted #CCCCCC;
-	overflow: auto;
-	white-space: normal;
-}
-.celldivth {
-	float: left; /*fix for  buggy browsers*/
-	border: 1px solid #CCCCCC;
-	background-color: #99CCFF;
-	border-bottom: 1px solid #CBC7B8;
-	text-align: left;
-	overflow: auto;
-}
-.rowdiv  {
-	display: table-row;
-	background: #F9F9F9 none;
-	color: #000000;
-	width: 100%;
-	overflow:auto;
-}
-/* End Subgrid */
-
-/* InLine editing */
-input.editable[type="text"]  {
-	font-size: x-small;
-	overflow: hidden;
-}
-input.editable[type="checkbox"]  {
-}
-
-textarea.editable {
-	overflow: hidden;
-}
-
-select.editable {
-	font-size: x-small;
-}
-/* End Inline Editing */
-
-/*Modal Window */
-.modaltext{ 
-    text-align : left;
-}
-.modalwin{
-    border:1px solid #555555;
-    background:#F9F9F9;
-    text-align:left;
-    margin: 0 auto;
-	overflow: auto;
-}
-
-
-.modalhead {
-	background-image: url(images/grid-blue-hd.gif);
-	height: 20px;
-	
-}
-.modalcontent {
-	overflow: auto;
-	margin-bottom: 9px;
-	margin-left: 5px;
-}
-/* end Modal window*/
-/* Search window */
-input.search {
-	margin: 2px;
-	width: 70px;
-	font-size: 10px;
-	color: #15428B;	
-}
-
-select.search {
-	margin: 2px;
-	width: 70px;
-	font-size: 10px;
-	color: #15428B;		
-}
-.buttonsearch {
-	width : 50px;
-	font-size: 10px;
-	color: #15428B;		
-}
-/*End search */
-
-/* Form edit */
-
-.FormGrid {
-	margin: 0px;
-}
-.EditTable {
-	width: 100%;
-}
-
-.FormData { /* tr */
-	
-}
-
-#FormError td {
-	font-size: 90%;
-	color: #FF0000;
-	vertical-align: top;
-	background-color: #f7f7f7; 
-}
-
-.CaptionTD{ /* td */
-	font-weight: normal; text-align: left; vertical-align: top;
-	padding: 1px;
-	border-top: 1px solid #D4D0C8;
-	white-space: nowrap;
-	color: #000000;
-}
-.DataTD { /* td */
-	padding: 1px;
-	border-top: 1px solid #D4D0C8;
-	vertical-align: top;
-}
-.navButton{
-	border-top: 1px solid #D4D0C8;
-	border-bottom: 1px solid #D4D0C8;
-	text-align: center;
-}
-.navButton input{
-	width:19px;
-}
-input.EditButton { /* buttons are at footer tr */
-	font-size: 10px;
-	color: #15428B;
-}
-td.EditButton {
-	text-align: right;
-	border-top: 1px solid #D4D0C8;
-	border-bottom: 1px solid #D4D0C8;
-}
-
-.FormElement { /* form element  - input -text,textarea,checkbox - select  */
-	
-}
-.FormElement {
-	font-size: 10px;	
-}
-input[type="text"].FormElement{
-	color: #15428B;		
-}
-input[type="checkbox"].FormElement{
-	width: 15px;
-	color: #15428B;		
-}
-input[type="textarea"].FormElement{
-	color: #15428B;		
-}
-select.FormElement {
-	font-size: 10px;
-	color: #15428B;		
-}
-/* End Eorm edit */
-
-/* Delete Dialog */
-.DelButton > input { /* buttons are at footer tr */
-	font-size: 10px;
-	color: #15428B;
-}
-.DelButton {
-	text-align: right;
-}
-/* End Delete Dialog */
-
-img.jqResize {
-	position:absolute;
-	bottom: 0px;
-	right: 0px;
-	cursor :se-resize;
-}
-.dirty-cell {
-	background: transparent url(images/dirty.gif) no-repeat 0 0;	
-}
-#DelError td {
-	font-size: 90%;
-	color: #FF0000;
-	vertical-align: top;
-	background-color: #f7f7f7; 
-}
-/* Tree Grid */
-.tree-wrap
-{
-	float: left; 
-	position: relative;
-	height: 18px;
-	white-space: nowrap;
-	overflow: hidden;
-}
-.tree-minus
-{
-	position: absolute;
-	height: 18px; 
-	width: 16px;
-	overflow: hidden;
-	background: url(images/tree_minus.gif) no-repeat;
-}
-.tree-plus
-{
-	position: absolute;
-	height: 18px; 
-	width: 16px;
-	overflow: hidden;
-	background: url(images/tree_plus.gif) no-repeat;
-}
-.tree-leaf
-{
-	position: absolute;
-	height: 18px; 
-	width: 16px;
-	overflow: hidden;
-	background: url(images/tree_leaf.gif) no-repeat;
-}
-.treeclick
-{
-	cursor: pointer;
-}
-.edit-cell {
-	background-color: #D2B48C !important;
-}
-.selected-row, .selected-row TD {
-	background-color: #c9b9b1; 
-}
--- a/site/webroot/css/jqGrid/coffee/images/cd_run.gif
+++ b/site/webroot/css/jqGrid/coffee/images/cd_run.gif
--- a/site/webroot/css/jqGrid/coffee/images/dirty.gif
+++ b/site/webroot/css/jqGrid/coffee/images/dirty.gif
--- a/site/webroot/css/jqGrid/coffee/images/down.gif
+++ b/site/webroot/css/jqGrid/coffee/images/down.gif
--- a/site/webroot/css/jqGrid/coffee/images/find.gif
+++ b/site/webroot/css/jqGrid/coffee/images/find.gif
--- a/site/webroot/css/jqGrid/coffee/images/first.gif
+++ b/site/webroot/css/jqGrid/coffee/images/first.gif
--- a/site/webroot/css/jqGrid/coffee/images/folder.png
+++ b/site/webroot/css/jqGrid/coffee/images/folder.png
--- a/site/webroot/css/jqGrid/coffee/images/grid-blue-ft.gif
+++ b/site/webroot/css/jqGrid/coffee/images/grid-blue-ft.gif
--- a/site/webroot/css/jqGrid/coffee/images/grid-blue-hd.gif
+++ b/site/webroot/css/jqGrid/coffee/images/grid-blue-hd.gif
--- a/site/webroot/css/jqGrid/coffee/images/headerbg.gif
+++ b/site/webroot/css/jqGrid/coffee/images/headerbg.gif
--- a/site/webroot/css/jqGrid/coffee/images/headerleft.gif
+++ b/site/webroot/css/jqGrid/coffee/images/headerleft.gif
--- a/site/webroot/css/jqGrid/coffee/images/headerright.gif
+++ b/site/webroot/css/jqGrid/coffee/images/headerright.gif
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
abijah	cbdce4f166	Added the gridview parameter, since we're not doing anything too complicated with grids. Updated the jqGrid css, some of which is just not longer needed, and some of which is broken by the move to jqGrid 3.5 git-svn-id: file:///svn-source/pmgr/branches/jqgrid_3.5@528 97e9348a-65ac-dc4b-aefc-98561f571b83	2009-08-11 07:08:54 +00:00
abijah	e9b9bdc420	Preliminary move to jqGrid 3.5.1. It has proven troublesome to change over, although really, I've only found one compatibility break so far. The real problem has been the elimination of the jqGrid loader code. We now have to build the jqGrid package through a selection form on the jqGrid download page, and the errors made it difficult to determine that the package configuration was the problem (such as destroying the entire page content). It's working alright at the moment. git-svn-id: file:///svn-source/pmgr/branches/jqgrid_3.5@527 97e9348a-65ac-dc4b-aefc-98561f571b83	2009-08-11 04:43:33 +00:00
abijah	704412727d	Branch to roll up to the 3.5 version of jqGrid git-svn-id: file:///svn-source/pmgr/branches/jqgrid_3.5@526 97e9348a-65ac-dc4b-aefc-98561f571b83	2009-08-11 04:11:45 +00:00