Fixed defect found from visual inspection

git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1037 97e9348a-65ac-dc4b-aefc-98561f571b83

site/.htaccess

@@ -1,25 +1,20 @@
 <IfModule mod_rewrite.c>
-    RewriteEngine on
+  RewriteEngine  on 
-    RewriteRule    ^$    webroot/    [L]
+
-    RewriteRule    (.*) webroot/$1    [L]
+   RewriteRule    ^$ webroot/    [L]
+
+   # Need this prevent a 400 error without trailing /
+   RewriteCond  %{REQUEST_FILENAME} !-d
+   RewriteRule    (.*)  webroot/$1 [L]
+
  </IfModule>
 
-# Lets deny everyone -- its a clean slate!
+# Need to make sure directories can't be listed, since the rewrite
-order deny,allow
+# rule excludes rewriting when an actual directory is requested
-deny from all
+Options -Indexes
-
-# Now allow local access
-# Localhost
-# allow from 127.0.0
-# Local subnet
-# allow from 192.168.7
 
 # Provide a mechanism for user authentication
-AuthType Digest
+AuthType Basic
-AuthName "Property Manager"
+AuthName "Valley Storage"
-AuthUserFile "D:/Website/auth/pmgr.htpasswd"
+AuthUserFile "/home/perki2/valley_storage.pmgr.htpasswd"
 Require valid-user
-
-# Instead of satisfy all (too restrictive)
-# This allows EITHER local domain OR authenticated user
-satisfy any

site/app_controller.php

@@ -37,7 +37,7 @@
 class AppController extends Controller {
   var $uses = array('Option', 'Permission');
   var $helpers = array('Html', 'Form', 'Javascript', 'Format', 'Time', 'Grid');
-  var $components = array('DebugKit.Toolbar');
+  //var $components = array('DebugKit.Toolbar');
 
   var $sidemenu   = array('areas' => array('SITE' => false, 'REPORT' => false, 'CONTROLLER' => false, 'ACTION' => false, 'SANDBOX' => false));
   var $std_area   = 10;
@@ -272,14 +272,26 @@ class AppController extends Controller {
       $this->addSideMenuLink('Unpaid Charges',
 			     array('controller' => 'statement_entries', 'action' => 'unpaid'), null,
 			     'REPORT');
-      $this->addSideMenuLink('Lease Up',
-			     array('controller' => 'leases', 'action' => 'overview'), null,
-			     'REPORT');
       $this->addSideMenuLink('Unit Summary',
 			     array('controller' => 'units', 'action' => 'overview'), null,
 			     'REPORT');
-      $this->addSideMenuLink('Monthly Charges',
+      $this->addSideMenuLink('Lease Up',
-			     array('controller' => 'statement_entries', 'action' => 'chargesbymonth'), null,
+			     array('controller' => 'leases', 'action' => 'overview'), null,
+			     'REPORT');
+      /* $this->addSideMenuLink('Monthly Income', */
+      /* 			     array('controller' => 'statement_entries', 'action' => 'incomebymonth'), null, */
+      /* 			     'REPORT'); */
+      /* $this->addSideMenuLink('Monthly Expenses', */
+      /* 			     array('controller' => 'statement_entries', 'action' => 'expensebymonth'), null, */
+      /* 			     'REPORT'); */
+      /* $this->addSideMenuLink('Quickbook Invoice', */
+      /* 			     array('controller' => 'statement_entries', 'action' => 'incomebymonth', 4, 1), null, */
+      /* 			     'REPORT'); */
+      /* $this->addSideMenuLink('Quickbook Credits', */
+      /* 			     array('controller' => 'statement_entries', 'action' => 'expensebymonth', 4, 0), null, */
+      /* 			     'REPORT'); */
+      $this->addSideMenuLink('Monthly Income',
+			     array('controller' => 'statement_entries', 'action' => 'netbymonth'), null,
 			     'REPORT');
     }
     else {
@@ -452,7 +464,8 @@ class AppController extends Controller {
     App::import('Helper', 'Html');
     $url = HtmlHelper::url($url, true);
 
-    if (headers_sent()) {
+    if (headers_sent() ||
+	($this->dev() && $this->Option->enabled('dev'))) {
       // 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
@@ -526,6 +539,9 @@ class AppController extends Controller {
     // Retreive the appropriate subset of data
     $records = $this->gridDataRecords($params, $model, $pagination);
 
+    // If subtotaling, figure out the running total before pagination...
+    $this->gridDataRecordsRunningSubtotal($params, $model, $pagination);
+
     // Post process the records
     $this->gridDataPostProcess($params, $model, $records);
 
@@ -948,13 +964,24 @@ class AppController extends Controller {
 			  'value' => $params['filtValue']);
     }
 
+    // Translate a user specified date into the SQL date format
+    foreach ($searches AS &$search) {
+      if (preg_match('/(_date|stamp)$/', $search['field']) &&
+	  preg_match('%(\d{1,2})[-/](\d{1,2})[-/](\d{2,4})%', $search['value'], $matches)) {
+	$search['value'] = sprintf('%04d%02d%02d',
+				   $matches[3] + ($matches[3] < 50 ? 2000 : ($matches[3] < 100 ? 1900 : 0)),
+				   $matches[2], $matches[1]);
+      }
+    }
+    unset($search);
+
     $ops = array('eq' => array('op' => null,   'pre' => '',  'post' => ''),
 		 'ne' => array('op' => '<>',   'pre' => '',  'post' => ''),
 		 'lt' => array('op' => '<',    'pre' => '',  'post' => ''),
 		 'le' => array('op' => '<=',   'pre' => '',  'post' => ''),
 		 'gt' => array('op' => '>',    'pre' => '',  'post' => ''),
 		 'ge' => array('op' => '>=',   'pre' => '',  'post' => ''),
-		 'in' => array('op' => 'IN',   'pre' => '(', 'post' => ')'),
+		 'in' => array('op' => 'IN',   'pre' => '(', 'post' => ')'),
 		 'bw' => array('op' => 'LIKE', 'pre' => '',  'post' => '%'),
 		 'ew' => array('op' => 'LIKE', 'pre' => '%', 'post' => ''),
 		 'cn' => array('op' => 'LIKE', 'pre' => '%', 'post' => '%'),
@@ -1011,6 +1038,53 @@ class AppController extends Controller {
     return $model->find($type, $query);
   }
 
+  function gridDataRecordsRunningSubtotal(&$params, $model, $pagination) {
+
+    // REVISIT <AP>: 20090722
+    //  Horrible solution to something that should be done
+    //  in SQL.  Doesn't really work, but for a grid that contains
+    //  ALL records, and is sorted on the correct field, it does
+    //  actually work.
+    //
+    //  If this function worked correctly, this mechanism would also
+    //  work for grids that did not contain ALL records.
+
+    $subtotals = array();
+    foreach ($params['post']['fields'] AS $field) {
+      if (preg_match('/subtotal-(.*)$/', $field, $matches))
+	$subtotals[] = array('field' => $matches[1],
+			     'name' => $field,
+			     'amount' => 0);
+    }
+
+    // This part, if functioning, should do a sub-total off all records
+    // that are not part of the grid, instead of starting at zero, so that
+    // the totals come out correctly for the each record entry.
+
+    /* $pagination['start'] = $pagination['start'] + $pagination['limit']; */
+    /* $pagination['limit'] = 10000000; */
+
+    /* // Retreive the appropriate subset of data */
+    /* $params_copy = $params; */
+    /* $records = $this->gridDataRecords($params_copy, $model, $pagination); */
+
+    /* foreach ($records AS &$record) { */
+    /*   foreach ($subtotals AS &$subtotal) { */
+    /* 	$field = $subtotal['field']; */
+    /* 	if (preg_match("/\./", $field)) { */
+    /* 	  list($tbl, $col) = explode(".", $field); */
+    /* 	  $record['subtotal-'.$tbl][$col] = */
+    /* 	    ($subtotal['amount'] += $record[$tbl][$col]); */
+    /* 	} */
+    /* 	else { */
+    /* 	  $record[$model->alias]['subtotal-'.$field] =  */
+    /* 	    ($subtotal['amount'] += $record[$model->alias][$field]); */
+    /* 	} */
+    /*   } */
+    /* } */
+
+    $params['subtotals'] = $subtotals;
+  }
 
   /**************************************************************************
    **************************************************************************
@@ -1061,15 +1135,11 @@ class AppController extends Controller {
 
     // REVISIT <AP>: 20090722
     //  Horrible solution to something that should be done
-    //  in SQL.  But, it works for now, so what the heck...
+    //  in SQL.  Doesn't really work, but for a grid that contains
+    //  ALL records, and is sorted on the correct field, it does
+    //  actually work.
 
-    $subtotals = array();
+    $subtotals = $params['subtotals'];
-    foreach ($params['post']['fields'] AS $field) {
-      if (preg_match('/subtotal-(.*)$/', $field, $matches))
-	$subtotals[] = array('field' => $matches[1],
-			     'name' => $field,
-			     'amount' => 0);
-    }
 
     foreach ($records AS &$record) {
       foreach ($subtotals AS &$subtotal) {
@@ -1157,7 +1227,7 @@ class AppController extends Controller {
   }
 
   function gridDataOutputSummary(&$params, &$model, $pagination) {
-    if ($params['debug'])
+    if ($params['debug'])
       echo " <params><![CDATA[\n" . print_r($params, true) . "\n]]></params>\n";
     echo " <page>{$pagination['page']}</page>\n";
     echo " <total>{$pagination['total']}</total>\n";

site/build_devbox.cmd

@@ -1,5 +0,0 @@
-@echo off
-mysqldump --user=pmgr --password=pmgruser --opt property_manager > H:\pmgr_dev.sql
-mysql --user=pmgr --password=pmgruser --database=pmgr_dev < H:\pmgr_dev.sql
-del H:\pmgr_dev.sql
-echo Build Complete!

site/build_sandbox.cmd

@@ -1,5 +0,0 @@
-@echo off
-mysqldump --user=pmgr --password=pmgruser --opt property_manager > H:\pmgr_sand.sql
-mysql --user=pmgr --password=pmgruser --database=pmgr_sand < H:\pmgr_sand.sql
-del H:\pmgr_sand.sql
-echo Build Complete!

site/config/database.php

@@ -5,17 +5,17 @@ class DATABASE_CONFIG {
 		'driver' => 'mysql',
 		'persistent' => false,
 		'host' => 'localhost',
-		'login' => 'pmgr',
+		'login' => 'perki2_pmgruser',
-		'password' => 'pmgruser',
+		'password' => 'pmgrauth',
-		'database' => 'property_manager',
+		'database' => 'perki2_pmgr',
-		'prefix' => 'pmgr_',
+		'prefix' => '',
 	);
 
 	function __construct() {
 		if (devbox())
-			$this->default['database'] = 'pmgr_dev';
+			$this->default['database'] = 'perki2_pmgr_dev';
 		if (sandbox())
-			$this->default['database'] = 'pmgr_sand';
+			$this->default['database'] = 'perki2_pmgr_sand';
 	}
 }
 ?>

site/controllers/leases_controller.php

@@ -334,15 +334,6 @@ class LeasesController extends AppController {
    *  - Closes a lease to any further action
    */
 
-  // REVISIT <AP>: 20090809
-  //  While cleaning up the sitelink data, then delete reldep()
-  function reldep($id) {
-    $this->Lease->id = $id;
-    $stamp = $this->Lease->field('moveout_date');
-    $this->Lease->releaseSecurityDeposits($id, $stamp);
-    $this->redirect(array('action'=>'view', $id));
-  }
-
   function close($id) {
     // REVISIT <AP>: 20090708
     //  We should probably seek confirmation first...
@@ -355,6 +346,21 @@ class LeasesController extends AppController {
     $this->redirect(array('action'=>'view', $id));
   }
 
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: open
+   *  - Re-opens a lease for further action
+   */
+
+  function open($id) {
+    // REVISIT <AP>: 20131204
+    //  We should probably seek confirmation first, since this wipes out
+    //  the old close date, with no way to restore that date.
+    $this->Lease->reopen($id);
+    $this->redirect(array('action'=>'view', $id));
+  }
+
 
   /**************************************************************************
    **************************************************************************
@@ -574,13 +580,18 @@ class LeasesController extends AppController {
 	$this->addSideMenuLink('Write-Off',
 			       array('action' => 'bad_debt', $id), null,
 			       'ACTION');
-
-      if ($this->Lease->closeable($id))
-	$this->addSideMenuLink('Close',
-			       array('action' => 'close', $id), null,
-			       'ACTION');
     }
 
+    if ($this->Lease->closeable($id))
+      $this->addSideMenuLink('Close',
+			     array('action' => 'close', $id), null,
+			     'ACTION');
+
+    if ($this->Lease->isClosed($id))
+      $this->addSideMenuLink('Re-Open',
+			     array('action' => 'open', $id), null,
+			     'ACTION');
+
     // Prepare to render
     $title = 'Lease: #' . $lease['Lease']['id'];
     $this->set(compact('lease', 'title',

site/controllers/statement_entries_controller.php

@@ -260,38 +260,65 @@ class StatementEntriesController extends AppController {
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * action: chargesbymonth
+   * action: incexpbymonth
-   *  - Displays charges by month
+   *  - Displays income and/or expenses by month
    */
 
-  function chargesbymonth($months = 12) {
+  function incexpbymonth($accts, $security_deposits, $months) {
+    $datefrom = 'DATE(NOW() - INTERVAL '.($months-1).' MONTH - INTERVAL DAY(NOW())-1 DAY)';
+    $dateto   = 'NOW()';
+    /* $datefrom = '"2009-01-01"'; */
+    /* $dateto   = '"2012-12-31"'; */
+
     $result = $this->StatementEntry->find
       ('all',
        array('link' => array('Account' => array('fields' => 'name')),
 	     'fields' => array_merge(array('MONTHNAME(effective_date) AS month',
 					   'YEAR(effective_date) AS year'),
 				     $this->StatementEntry->chargeDisbursementFields(true)),
-	     'conditions' => array('Account.type' => 'INCOME',
+	     'conditions' => array('Account.type' => $accts,
-				   'effective_date >= DATE(NOW() - INTERVAL '.($months-1).' MONTH - INTERVAL DAY(NOW())-1 DAY)',
+				   "effective_date >= $datefrom",
-				   'effective_date <= NOW()',
+				   "effective_date <= $dateto",
 				   ),
 	     'group' => array('YEAR(effective_date)', 'MONTH(effective_date)', 'Account.id'),
-	     'order' => array('YEAR(effective_date) DESC', 'MONTH(effective_date) DESC', 'Account.name'),
+	     'order' => array('YEAR(effective_date) DESC', 'MONTH(effective_date) DESC', 'Account.type',
+			      'IF(Account.id = '.$this->StatementEntry->Account->rentAccountID().', "---", Account.name)'),
 	     ));
 
-    $overview = array('months' => array(), 'charges' => 0);
+    if ($security_deposits) {
-    foreach ($result AS $row) {
+      $sdresult = $this->StatementEntry->Transaction->LedgerEntry->find
+	('all',
+	 array('link' => array('Transaction' => array('StatementEntry' => array('fields' => 'effective_date'),
+						      'fields' => array()),
+			       'Account' => array('fields' => 'name')),
+	       'fields' => array_merge(array('MONTHNAME(effective_date) AS month',
+					     'YEAR(effective_date) AS year'),
+				       $this->StatementEntry->Transaction->LedgerEntry->debitCreditFields(true)),
+	       'conditions' => array('LedgerEntry.account_id' => $this->StatementEntry->Account->securityDepositAccountID(),
+				     "effective_date >= $datefrom",
+				     "effective_date <= $dateto",
+				     'StatementEntry.id = (SELECT MIN(id) FROM statement_entries WHERE transaction_id = `Transaction`.id)'
+				     ),
+	       'group' => array('YEAR(effective_date)', 'MONTH(effective_date)', 'Account.id'),
+	       'order' => array('YEAR(effective_date) DESC', 'MONTH(effective_date) DESC', 'Account.type', 'Account.name'),
+	       ));
+    } else {
+      $sdresult = array();
+    }
+
+    $overview = array('months' => array(), 'amount' => 0);
+    foreach (array_merge($result, $sdresult) AS $row) {
       $mname = $row[0]['month'] .', '. $row[0]['year'];
       if (empty($overview['months'][$mname]))
 	$overview['months'][$mname] = array('name' => $mname,
 					   'subs' => array(),
-					   'charges' => 0);
+					   'amount' => 0);
       $month = &$overview['months'][$mname];
       $month['subs'][] = array('name' => $row['Account']['name'],
-			       'charges' => $row[0]['balance']);
+			       'amount' => $row[0]['balance']);
 
-      $month['charges'] += $row[0]['balance'];
+      $month['amount'] += $row[0]['balance'];
-      $overview['charges'] += $row[0]['balance'];
+      $overview['amount'] += $row[0]['balance'];
     }
 
     // Enable the Reports menu section
@@ -299,8 +326,26 @@ class StatementEntriesController extends AppController {
 
     // Prepare to render.
     $this->set('months', $months);
-    $this->set('title', 'Monthly Charges');
     $this->set(compact('overview'));
+    $this->render('chargesbymonth');
+  }
+
+  function incomebymonth($months = 12, $invoice = false) {
+    $this->set('title', 'Monthly Gross Income');
+    $this->set('reptype', 'Gross Income');
+    $this->incexpbymonth(array('INCOME'), $invoice, $months);
+  }
+
+  function expensebymonth($months = 12) {
+    $this->set('title', 'Gross Monthly Expenses');
+    $this->set('reptype', 'Gross Expenses');
+    $this->incexpbymonth(array('EXPENSE'), false, $months);
+  }
+
+  function netbymonth($months = 12) {
+    $this->set('title', 'Net Monthly Income');
+    $this->set('reptype', 'Net Income');
+    $this->incexpbymonth(array('INCOME', 'EXPENSE'), true, $months);
   }
 
 

site/controllers/transactions_controller.php

@@ -93,7 +93,8 @@ class TransactionsController extends AppController {
     $fields[] = ("IF(Transaction.type = 'DEPOSIT'," .
 		 "   COUNT(DepositTender.id)," .
 		 "   COUNT(StatementEntry.id)) AS entries");
-    return $fields;
+    return array_merge($fields,
+		       $this->Transaction->LedgerEntry->debitCreditFields(false, true, 'Transaction'));
   }
 
   function gridDataConditions(&$params, &$model) {
@@ -468,7 +469,7 @@ class TransactionsController extends AppController {
   function deposit_slip($id) {
     // Find the deposit transaction
     $this->Transaction->id = $id;
-    $deposit = $this->Transaction->find('first', array('contain' => false));
+    $deposit = $this->Transaction->find('first', array('contain' => array('Account')));
 
     // Get a summary of all forms of tender in the deposit
     $tenders = $this->Transaction->find
@@ -503,8 +504,8 @@ class TransactionsController extends AppController {
     foreach ($deposit['types'] AS $type)
       $deposit_total += $type['total'];
 
-    if ($deposit['Transaction']['amount'] != $deposit_total)
+    if (abs($deposit['Transaction']['amount'] - $deposit_total) >= .001)
-      $this->INTERNAL_ERROR("Deposit items do not add up to deposit slip total");
+      $this->INTERNAL_ERROR("Deposit items ($deposit_total) do not add up to deposit slip total (".$deposit['Transaction']['amount'].")");
 
     $this->addSideMenuLink('View',
 			   array('action' => 'view', $id), null,

site/controllers/unit_sizes_controller.php

@@ -91,8 +91,8 @@ class UnitSizesController extends AppController {
     $fields[] = 'SUM(IF(' . $this->UnitSize->Unit->conditionUnavailable() . ', 1, 0)) AS unavailable';
     $fields[] = 'SUM(IF(' . $this->UnitSize->Unit->conditionAvailable() . ', 1, 0)) AS available';
     $fields[] = 'SUM(IF(' . $this->UnitSize->Unit->conditionOccupied() . ', 1, 0)) AS occupied';
-    $fields[] = 'SUM(IF(' . $this->UnitSize->Unit->conditionOccupied() . ', 0, 1)) / COUNT(unit.id) AS vacancy';
+    $fields[] = 'SUM(IF(' . $this->UnitSize->Unit->conditionOccupied() . ', 0, 1)) / COUNT(Unit.id) AS vacancy';
-    $fields[] = 'SUM(IF(' . $this->UnitSize->Unit->conditionOccupied() . ', 1, 0)) / COUNT(unit.id) AS occupancy';
+    $fields[] = 'SUM(IF(' . $this->UnitSize->Unit->conditionOccupied() . ', 1, 0)) / COUNT(Unit.id) AS occupancy';
 
     return $fields;
   }

site/controllers/util_controller.php

@@ -4,31 +4,6 @@ class UtilController extends AppController {
 
   var $uses = array();
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: reset_data
-   *  - Development function.  TO BE DELETED
-   */
-
-  function reset_data() {
-    $this->layout = null;
-    $this->autoLayout = false;
-    $this->autoRender = false;
-    Configure::write('debug', '0');
-    $script = $_SERVER['DOCUMENT_ROOT'] . '/pmgr/build.cmd';
-    echo "<P>" . date('r') . "\n";
-    //echo "<P>Script: $script" . "\n";
-    $handle = popen($script . ' 2>&1', 'r');
-    //echo "<P>Handle: $handle; " . gettype($handle) . "\n";
-    echo "<P><PRE>\n";
-    while (($read = fread($handle, 2096))) {
-      echo $read;
-    }
-    echo "</PRE>\n";
-    pclose($handle);
-  }
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -40,21 +15,20 @@ class UtilController extends AppController {
     $this->autoLayout = false;
     $this->autoRender = false;
     Configure::write('debug', '0');
-    $script = preg_replace('%/webroot/index.php$%',
-			   '/build_'.$type.'box.cmd',
-			   $_SERVER['SCRIPT_FILENAME']);
 
-    // REVISIT <AP>: 20090828
+    $usrpass = '--user=perki2_pmgruser --password=pmgrauth';
-    //  Just use system call
+    $boxdb = 'perki2_pmgr_' . $type;
-    $handle = popen($script . ' 2>&1', 'r');
+
+    $handle = popen("mysqldump $usrpass --opt perki2_pmgr" .
+		    " | mysql $usrpass --database=$boxdb", 'r');
     while (($read = fread($handle, 2096))) {
       // Do nothing
     }
     pclose($handle);
 
     $url = $_SERVER['HTTP_REFERER'];
-    if (empty($url))
+    if (empty($url) || $url == 'undefined')
-      $url = "/";
+      $url = "/$type";
 
     $this->redirect($url);
   }

site/models/contact.php

@@ -91,7 +91,7 @@ class Contact extends AppModel {
 
 	// If the user has entered all new data, we need to
 	// save that as a brand new entry.
-	if (!isset($item['id'])) {
+	if (!isset($item['id']) || $item['source'] == 'new') {
 	  $I = new $class();
 	  $I->create();
 	  if (!$I->save($item, false)) {

site/models/customer.php

@@ -330,13 +330,15 @@ class Customer extends AppModel {
     }
 
     // Remove any contacts which are already destination customer contacts
-    $contacts = array_diff($contacts, array_keys($dst_contacts));
+    $new_contacts = array_diff($contacts, array_keys($dst_contacts));
+    $all_contacts = array_merge($new_contacts, array_keys($dst_contacts));
+    $this->pr(17, compact('new_contacts', 'all_contacts'));
 
     // For now, we'll assume the operation will succeed.
     $ret = true;
 
     // Add each desired source customer contact to the destination customer
-    foreach ($contacts AS $contact_id) {
+    foreach ($new_contacts AS $contact_id) {
       $CM = new ContactsCustomer();
       if (!$CM->save(array('customer_id' => $dst_id)
 		     + $src_contacts[$contact_id], false)) {
@@ -372,7 +374,7 @@ class Customer extends AppModel {
     $this->delete($src_id);
 
     // Delete all the orphaned customers
-    foreach (array_diff(array_keys($src_contacts), $contacts) AS $contact_id) {
+    foreach (array_diff(array_keys($src_contacts), $all_contacts) AS $contact_id) {
       // Delete un-used or duplicate contacts
       // REVISIT <AP> 20100702:
       //   Not sure if we really want to do this.

site/models/lease.php

@@ -347,6 +347,8 @@ class Lease extends AppModel {
     $this->pr(17, compact('date', 'charge_through_date')
 	      + array('date_str' => date('Y-m-d', $date),
 		      'charge_through_date_str' => date('Y-m-d', $charge_through_date)));
+    if (!$charge_through_date)
+      return $this->prReturn(null);
     if ($charge_through_date >= $date)
       return $this->prReturn(null);
 
@@ -544,7 +546,7 @@ class Lease extends AppModel {
   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 10 DAY))");
+	    " NOW() > DATE_ADD({$t}paid_through_date, INTERVAL 1 DAY))");
   }
 
   function delinquentDaysSQL($table_name = 'Lease') {
@@ -726,6 +728,53 @@ class Lease extends AppModel {
   }
 
 
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: reopen
+   *  - Re-Opens the lease for further action
+   */
+
+  function reopen($id) {
+    $this->prEnter(compact('id'));
+
+    if (!$this->isClosed($id))
+      return $this->prReturn(false);
+
+    // Reset the data
+    $this->create();
+    $this->id = $id;
+
+    // Set the close date
+    $this->data['Lease']['close_date'] = null;
+
+    // Save it!
+    $this->save($this->data, false);
+
+    // Update the current lease count for the customer
+    $this->Customer->updateLeaseCount($this->field('customer_id'));
+
+    return $this->prReturn(true);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: isClosed
+   *  - Checks to see if the lease is closed
+   */
+
+  function isClosed($id) {
+    $this->prEnter(compact('id'));
+
+    $this->recursive = -1;
+    $this->read(null, $id);
+
+    return $this->prReturn(!empty($this->data['Lease']['close_date']));
+  }
+
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************

site/plugins/debug_kit/controllers/components/toolbar.php

@@ -163,7 +163,7 @@ class ToolbarComponent extends Object {
 				trigger_error(sprintf(__('Could not load DebugToolbar panel %s', true), $panel), E_USER_WARNING);
 				continue;
 			}
-			$panelObj =& new $className();
+			$panelObj = new $className();
 			if (is_subclass_of($panelObj, 'DebugPanel') || is_subclass_of($panelObj, 'debugpanel')) {
 				$this->panels[$panel] =& $panelObj;
 			}
@@ -456,7 +456,7 @@ class LogPanel extends DebugPanel {
  * @return array
  */
 	function _parseFile($filename) {
-		$file =& new File($filename);
+		$file = new File($filename);
 		$contents = $file->read();
 		$timePattern = '/(\d{4}-\d{2}\-\d{2}\s\d{1,2}\:\d{1,2}\:\d{1,2})/';
 		$chunks = preg_split($timePattern, $contents, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);

site/plugins/debug_kit/views/elements/timer_panel.ctp

@@ -30,14 +30,14 @@ $timers = DebugKitDebugger::getTimers();
 ?>
 <h2><?php __('Timers'); ?></h2>
 <p class="request-time">
-	<?php $totalTime = sprintf(__('%s (seconds)', true), $number->precision(DebugKitDebugger::requestTime(), 6)); ?>
+	<?php $totalTime = sprintf(__('%.6s (seconds)', true), DebugKitDebugger::requestTime()); ?>
 	<?php echo $toolbar->message(__('Total Request Time:', true), $totalTime)?>
 </p>
 
 <?php foreach ($timers as $timerName => $timeInfo):
 	$rows[] = array(
 		$timeInfo['message'],
-		$number->precision($timeInfo['time'], 6)
+		sprintf(__('%.6s', true), $timeInfo['time'])
 	);
 	$headers = array(__('Message', true), __('time in seconds', true));
 endforeach;

site/valley_storage.pmgr.htpasswd

@@ -0,0 +1,9 @@
+abijah:Property Manager:a2369e3cc9e231ea6f02ce799a8b9970
+anja:Property Manager:4539d5a6e58dd5895f2f3891d29705b0
+kevin:Property Manager:f01accc9f5e5cdfc028dcf0cca837cf1
+adam:Property Manager:ae6835569bb2fc0a0a4a773580ac8cda
+shirley:Property Manager:e7e9d674c700796c99cdbf3cf105e739
+admin:Property Manager:bab2226685d9b4b66220db8df80f1822
+dev:Property Manager:e5c27b3c025e47239a45daceea2c0a00
+vasst:Property Manager:523abc6c2b8458b463d5a9baa4f58f2e
+answerfirst:Property Manager:6ac128447fab8be985c74ba7539c39b3

site/views/accounts/view.ctp

@@ -100,7 +100,7 @@ echo $this->element('ledger_entries', array
 		      'filter' => array('Account.id' => $account['id']),
 		      'exclude' => array('Account', 'Amount', 'Cr/Dr', 'Balance',
 					 empty($account['receipts']) ? 'Tender' : null),
-		      'include' => array('Debit', 'Credit', 'Sub-Total'),
+		      'include' => array('Transaction', 'Debit', 'Credit', 'Sub-Total'),
 		      'limit' => 50,
 		      )));
 

site/views/contacts/edit.ctp

@@ -68,7 +68,7 @@ function contactMethodDiv($obj, $type, $legend, $values = null) {
     '</DIV>' . "\n" .
 
     // BEGIN method-div
-    '<div id="'.$type.'-%{id}-method-div"' . "\n" .
+    '<div id="'.$type.'-%{id}-method-div"' . '>' . "\n" .
 
     $obj->element
     ('form_table',
@@ -131,14 +131,18 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
     elseif ($stype === 'new') {
       $fields = array
 	('type' => array('label_attributes' => array('class' => 'required'),
-			 'opts' => array('options' => $obj->varstore['phoneTypes']),
+			 'opts' => array('autocomplete' => 'off',
+					 'options' => $obj->varstore['phoneTypes']),
 			 'after' => "Physical type of the phone."),
 	 'phone' => array('label_attributes' => array('class' => 'required empty'),
+			  'opts' => array('autocomplete' => 'off'),
 			  'after' => "Required: Phone number."),
 	 'ext' => array('name' => "Extension",
 			'label_attributes' => array('class' => 'optional empty'),
+			'opts' => array('autocomplete' => 'off'),
 			'after' => "Optional: Extension number."),
 	 'comment' => array('label_attributes' => array('class' => 'optional empty'),
+			    'opts' => array('autocomplete' => 'off'),
 			    'after' => "Optional: Comments about this phone number."),
 	 );
     }
@@ -167,17 +171,23 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
     elseif ($stype === 'new') {
       $fields = array
 	('address' => array('label_attributes' => array('class' => 'required empty'),
+			    'opts' => array('autocomplete' => 'off'),
 			    'after' => "Required: First line of mailing address."),
 	 'city' => array('label_attributes' => array('class' => 'required empty'),
+			 'opts' => array('autocomplete' => 'off'),
 			 'after' => "Required."),
 	 'state' => array('label_attributes' => array('class' => 'required empty'),
+			  'opts' => array('autocomplete' => 'off'),
 			  'after' => "Required."),
 	 'postcode' => array('name' => 'Zip Code',
 			     'label_attributes' => array('class' => 'required empty'),
+			     'opts' => array('autocomplete' => 'off'),
 			     'after' => "Required."),
 	 'country' => array('label_attributes' => array('class' => 'optional empty'),
+			    'opts' => array('autocomplete' => 'off'),
 			    'after' => "Optional: USA is presumed."),
 	 'comment' => array('label_attributes' => array('class' => 'optional empty'),
+			    'opts' => array('autocomplete' => 'off'),
 			    'after' => "Optional: Comments about this mailing address."),
 	 );
     }
@@ -208,8 +218,10 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
     elseif ($stype === 'new') {
       $fields = array
 	('email' => array('label_attributes' => array('class' => 'required empty'),
-			    'after' => "Required: E-mail address."),
+			  'opts' => array('autocomplete' => 'off'),
+			  'after' => "Required: E-mail address."),
 	 'comment' => array('label_attributes' => array('class' => 'optional empty'),
+			    'opts' => array('autocomplete' => 'off'),
 			    'after' => "Optional: Comments about this email address."),
 	 );
     }

site/views/customers/edit.ctp

@@ -66,7 +66,7 @@ function customerContactDiv($obj, $values = null, $primary = false) {
     '</DIV>' . "\n" .
 
     // BEGIN contact-div
-    '<div id="contact-%{id}-contact-div"' . "\n" .
+    '<div id="contact-%{id}-contact-div">' . "\n" .
 
     $obj->element
     ('form_table',

site/views/customers/receipt.ctp

@@ -157,7 +157,10 @@ function onRowSelect(grid_id, customer_id) {
   $("#customer-id").val(customer_id);
 
   // Set the customer name, so the user knows who the receipt is for
-  $("#receipt-customer-name").html($(grid_id).getCell(customer_id, 'Customer-name'));
+  $("#receipt-customer-name")
+    .html('<A HREF="view/' + customer_id + '">'
+	  + $(grid_id).getCell(customer_id, 'Customer-name')
+	  + '</A>');
 
   // Hide the "no customer" message and show the current customer
   $(".customer-selection-invalid").hide();

site/views/customers/view.ctp

@@ -105,6 +105,27 @@ echo $this->element('ledger_entries', array
 		      )));
 
 
+/**********************************************************************
+ * Invoice History
+ */
+
+/* NOT COMPLETED
+echo $this->element('transactions', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Invoices',
+		      'limit'   => 5,
+		      'filter' => array('Customer.id' => $customer['Customer']['id'],
+					'Transaction.type' => 'INVOICE',
+					),
+		      //'include' => array(),
+		      'exclude' => array('Type'),
+		      'remap'   => array('ID' => 'Invoice',
+					 //'Timestamp' => 'Date',
+					 'Entries' => 'Charges'),
+		      )));
+NOT COMPLETED */
+
 /**********************************************************************
  * Lease History
  */
@@ -136,13 +157,14 @@ echo $this->element('contacts', array
 
 
 /**********************************************************************
- * Customer Account History
+ * Customer Statement History
  */
 
 echo $this->element('statement_entries', array
 		    (// Grid configuration
 		     'config' => array
 		     ('caption' => 'Customer Statement',
+		      'grid_setup' => array('hiddengrid' => true),
 		      'filter' => array('Customer.id' => $customer['Customer']['id'],
 					'type !=' => 'VOID'),
 		      //'include' => array('Sub-Total'),
@@ -150,6 +172,28 @@ echo $this->element('statement_entries', array
 		      )));
 
 
+/**********************************************************************
+ * Customer Transaction History
+ */
+
+echo $this->element('transactions', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Balance History',
+		      'limit'   => 10000,
+		      'limitOptions' => array('10000'),
+		      'sort_column' => 'Timestamp',
+		      'sort_order' => 'ASC',
+		      'grid_setup' => array('hiddengrid' => true),
+		      'filter' => array('Customer.id' => $customer['Customer']['id']),
+		      'include' => array('Comment', 'PosNeg', 'Balance'),
+		      'exclude' => array('Amount', 'Entries'),
+		      'remap'   => array(//'ID' => 'Invoice',
+					 'PosNeg' => 'Amount',
+					 //'Entries' => 'Charges',
+					 ),
+		      )));
+
 /* End "detail supporting" div */
 echo '</div>' . "\n";
 

site/views/elements/customers.ctp

@@ -2,6 +2,7 @@
 
 // Define the table columns
 $cols = array();
+$cols['Customer']      = array('index' => 'Customer.id',                'formatter' => 'id');
 $cols['Relationship']  = array('index' => 'ContactsCustomer.type',      'formatter' => 'enum');
 $cols['Name']          = array('index' => 'Customer.name',              'formatter' => 'longname');
 $cols['Last Name']     = array('index' => 'PrimaryContact.last_name',   'formatter' => 'name');

site/views/elements/form_table.ctp

@@ -113,7 +113,7 @@ foreach ($fields AS $field => $config) {
   if (isset($config['with_value_after']))
     $value = $value . $config['with_value_after'];
   elseif (isset($with_value_after))
-    $value = $valeu . $with_value_after;
+    $value = $value . $with_value_after;
   $cells[] = $value;
 
   if ($include_after) {

site/views/elements/jqGrid.ctp

@@ -50,6 +50,7 @@ if (!isset($grid_setup))
 $html->css('ui.jqgrid', null, null, false);
 $javascript->link('jqGrid/grid.locale-en', false);
 $javascript->link('jqGrid/jquery.jqGrid.min', false);
+$javascript->link('jqGrid/grid.postext', false);
 $javascript->link('pmgr_jqGrid', false);
 
 
@@ -129,12 +130,12 @@ foreach ($jqGridColumns AS $header => &$col) {
     elseif ($col['formatter'] === 'currency') {
       // Use our custom formatting for currency
       $col['formatter'] = array('--special' => 'currencyFormatter');
-      $default['width'] = 85;
+      $default['width'] = 65;
       $default['align'] = 'right';
     }
     elseif ($col['formatter'] === 'date') {
       $default['formatoptions'] = array('newformat' => 'm/d/Y');
-      $default['width'] = 95;
+      $default['width'] = 90;
       $default['align'] = 'center';
     }
     elseif (preg_match("/^(long|short)?name$/",

site/views/elements/tenders.ctp

@@ -5,7 +5,7 @@ $cols = array();
 $cols['Date']       = array('index' => 'Transaction.stamp',  'formatter' => 'date');
 $cols['Customer']   = array('index' => 'Customer.name',      'formatter' => 'longname');
 $cols['Item']       = array('index' => 'Tender.name',        'formatter' => 'longname');
-$cols['Type']       = array('index' => 'TenderType.name',    'formatter' => 'name');
+$cols['Type']       = array('index' => 'TenderType.name',    'formatter' => 'shortname');
 $cols['Comment']    = array('index' => 'Tender.comment',     'formatter' => 'comment');
 $cols['Amount']     = array('index' => 'LedgerEntry.amount', 'formatter' => 'currency');
 $cols['Sub-Total']  = array('index' => 'subtotal-LedgerEntry.amount', 'formatter' => 'currency');

site/views/elements/transactions.ctp

@@ -11,9 +11,11 @@ $cols['ID']        = array('index' => 'Transaction.id',            'formatter' =
 $cols['Type']      = array('index' => 'Transaction.type',          'formatter' => 'enum');
 $cols['Customer']  = array('index' => 'Customer.name',             'formatter' => 'longname');
 $cols['Timestamp'] = array('index' => 'Transaction.stamp',         'formatter' => 'date');
-$cols['Amount']    = array('index' => 'Transaction.amount',        'formatter' => 'currency');
+$cols['Comment']   = array('index' => 'Transaction.comment',       'formatter' => 'comment', 'sortable' => false);
 $cols['Entries']   = array('index' => 'entries',                   'formatter' => 'number');
-$cols['Comment']   = array('index' => 'Transaction.comment',       'formatter' => 'comment');
+$cols['Amount']    = array('index' => 'Transaction.amount',        'formatter' => 'currency');
+$cols['PosNeg']    = array('index' => 'balance',                   'formatter' => 'currency');
+$cols['Balance']   = array('index' => 'subtotal-balance',          'formatter' => 'currency', 'sortable' => false);
 
 // Render the grid
 $grid
@@ -22,4 +24,4 @@ $grid
 ->defaultFields(array('ID', 'Timestamp'))
 ->searchFields(array('Type', 'Comment'))
 ->render($this, isset($config) ? $config : null,
-	 array_merge($include, array_diff(array_keys($cols), array('Customer', 'Comment'))));
+	 array_merge($include, array_diff(array_keys($cols), array('Customer', 'PosNeg', 'Balance', 'Comment'))));

site/views/layouts/default.ctp

@@ -75,7 +75,7 @@
 		echo $html->css('print', null, array('media' => 'print')) . "\n";
 		echo $html->css('sidemenu') . "\n";
 
-		echo $javascript->link('jquery-1.3.2.min') . "\n";
+		echo $javascript->link('jquery-1.7.2.min') . "\n";
 		echo $javascript->link('jquery-ui-1.7.2.custom.min') . "\n";
 		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.js') . "\n";
 		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.js') . "\n";

site/views/statement_entries/chargesbymonth.ctp

@@ -10,11 +10,11 @@ echo '<div class="statement_entry overview">' . "\n";
  */
 
 $rows = array();
-$rows[] = array("$months Month Charges", FormatHelper::currency($overview['charges']));
+$rows[] = array("$months Month Total", FormatHelper::currency($overview['amount']) . " / (" . FormatHelper::currency($overview['amount'] / $months) . " per month)");
 
 echo $this->element('table',
                     array('class'   => 'item statement_entry detail',
-                          'caption' => 'Monthly Charges',  
+                          'caption' => $reptype,
                           'rows'    => $rows,
                           'column_class' => array('field', 'value')));
 
@@ -38,11 +38,11 @@ foreach ($overview['months'] AS $month) {
     $odd = 1;
     foreach ($month['subs'] AS $sub) {
         $row_class[] = array('subitem', $odd ? 'oddrow' : 'evenrow');
-        $rows[] = array($sub['name'], FormatHelper::currency($sub['charges']));
+        $rows[] = array($sub['name'], FormatHelper::currency($sub['amount']));
         $odd = !$odd;
     }
     $row_class[] = 'grand';
-    $rows[] = array('Total for '.$month['name'], FormatHelper::currency($month['charges']));
+    $rows[] = array('Total for '.$month['name'], FormatHelper::currency($month['amount']));
 }
 
 echo $this->element('table',

site/views/transactions/deposit_slip.ctp

@@ -2,11 +2,18 @@
 
 //style="display:inline;
 echo('<H2 style="display:inline;">Deposit Slip: ' .
-     FormatHelper::datetime($deposit['Transaction']['stamp'])
+     FormatHelper::date($deposit['Transaction']['stamp'])
-     . '</H2>' . "\n");
+     . '</H2><br>' . "\n");
 /* echo('(' . */
 /*      FormatHelper::age($deposit['Transaction']['stamp'], 60) */
 /*      . ')<BR>' . "\n"); */
+if ($deposit['Account']['external_name'] || $deposit['Account']['external_account']) {
+  echo('<H2 style="display:inline;">' .
+       ($deposit['Account']['external_name'] ? $deposit['Account']['external_name'] : '') .
+       ($deposit['Account']['external_name'] && $deposit['Account']['external_account'] ? ': ' : '') .
+       ($deposit['Account']['external_account'] ? 'Account #' . $deposit['Account']['external_account'] : '') .
+       '</H2><br>' . "\n");
+}
 
 //pr(compact('deposit'));
 
@@ -57,6 +64,7 @@ else {
 		       'config' => array
 		       (
 			'caption' => 'Deposited Items',
+			'sort_column' => 'Item',
 			'filter' => array('deposit_transaction_id'
 					  => $deposit['Transaction']['id'],
 					  ),

site/views/transactions/view.ctp

@@ -95,16 +95,17 @@ if ($transaction['type'] === 'INVOICE' ||
  * Ledger Entries
  */
 
-echo $this->element('ledger_entries', array
+if (0) {
-		    (// Grid configuration
+  echo $this->element('ledger_entries', array
-		     'config' => array
+		      (// Grid configuration
-		     (
+		       'config' => array
-		      'caption' => 'Ledger Entries',
+		       (
-		      'filter' => array('Transaction.id' => $transaction['id'],
+			'caption' => 'Ledger Entries',
-					'Account.id !=' => $account['id']),
+			'filter' => array('Transaction.id' => $transaction['id'],
-		      'exclude' => array('Transaction'),
+					  'Account.id !=' => $account['id']),
-		     )));
+			'exclude' => array('Transaction'),
-
+			)));
+}
 
 /* /\********************************************************************** */
 /*  * Tenders Deposited */

site/webroot/index.php

@@ -55,7 +55,7 @@
  *
  */
 	if (!defined('CAKE_CORE_INCLUDE_PATH')) {
-		define('CAKE_CORE_INCLUDE_PATH', 'D:\Website\localhost\CakePHP');
+		define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . APP_DIR . DS . 'CakePHP');
 	}
 
 /**

site/webroot/js/jqGrid/grid.locale-en.js

@@ -1 +1,169 @@
-(function(a){a.jgrid={defaults:{recordtext:"View {0} - {1} of {2}",emptyrecords:"No records to view",loadtext:"Loading...",pgtext:"Page {0} of {1}"},search:{caption:"Search...",Find:"Find",Reset:"Reset",odata:["equal","not equal","less","less or equal","greater","greater or equal","begins with","does not begin with","is in","is not in","ends with","does not end with","contains","does not contain"],groupOps:[{op:"AND",text:"all"},{op:"OR",text:"any"}],matchText:" match",rulesText:" rules"},edit:{addCaption:"Add Record",editCaption:"Edit Record",bSubmit:"Submit",bCancel:"Cancel",bClose:"Close",saveData:"Data has been changed! Save changes?",bYes:"Yes",bNo:"No",bExit:"Cancel",msg:{required:"Field is required",number:"Please, enter valid number",minValue:"value must be greater than or equal to ",maxValue:"value must be less than or equal to",email:"is not a valid e-mail",integer:"Please, enter valid integer value",date:"Please, enter valid date value",url:"is not a valid URL. Prefix required ('http://' or 'https://')"}},view:{caption:"View Record",bClose:"Close"},del:{caption:"Delete",msg:"Delete selected record(s)?",bSubmit:"Delete",bCancel:"Cancel"},nav:{edittext:"",edittitle:"Edit selected row",addtext:"",addtitle:"Add new row",deltext:"",deltitle:"Delete selected row",searchtext:"",searchtitle:"Find records",refreshtext:"",refreshtitle:"Reload Grid",alertcap:"Warning",alerttext:"Please, select row",viewtext:"",viewtitle:"View selected row"},col:{caption:"Show/Hide Columns",bSubmit:"Submit",bCancel:"Cancel"},errors:{errcap:"Error",nourl:"No url is set",norecords:"No records to process",model:"Length of colNames <> colModel!"},formatter:{integer:{thousandsSeparator:" ",defaultValue:"0"},number:{decimalSeparator:".",thousandsSeparator:" ",decimalPlaces:2,defaultValue:"0.00"},currency:{decimalSeparator:".",thousandsSeparator:" ",decimalPlaces:2,prefix:"",suffix:"",defaultValue:"0.00"},date:{dayNames:["Sun","Mon","Tue","Wed","Thr","Fri","Sat","Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],monthNames:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec","January","February","March","April","May","June","July","August","September","October","November","December"],AmPm:["am","pm","AM","PM"],S:function(b){return b<11||b>13?["st","nd","rd","th"][Math.min((b-1)%10,3)]:"th"},srcformat:"Y-m-d",newformat:"d/m/Y",masks:{ISO8601Long:"Y-m-d H:i:s",ISO8601Short:"Y-m-d",ShortDate:"n/j/Y",LongDate:"l, F d, Y",FullDateTime:"l, F d, Y g:i:s A",MonthDay:"F d",ShortTime:"g:i A",LongTime:"g:i:s A",SortableDateTime:"Y-m-d\\TH:i:s",UniversalSortableDateTime:"Y-m-d H:i:sO",YearMonth:"F, Y"},reformatAfterEdit:false},baseLinkUrl:"",showAction:"",target:"",checkbox:{disabled:true},idName:"id"}}})(jQuery);
+;(function($){
+/**
+ * jqGrid English Translation
+ * Tony Tomov tony@trirand.com
+ * http://trirand.com/blog/ 
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+**/
+$.jgrid = $.jgrid || {};
+$.extend($.jgrid,{
+	defaults : {
+		recordtext: "View {0} - {1} of {2}",
+		emptyrecords: "No records to view",
+		loadtext: "Loading...",
+		pgtext : "Page {0} of {1}"
+	},
+	search : {
+		caption: "Search...",
+		Find: "Find",
+		Reset: "Reset",
+		odata : ['equal', 'not equal', 'less', 'less or equal','greater','greater or equal', 'begins with','does not begin with','is in','is not in','ends with','does not end with','contains','does not contain'],
+		groupOps: [	{ op: "AND", text: "all" },	{ op: "OR",  text: "any" }	],
+		matchText: " match",
+		rulesText: " rules"
+	},
+	edit : {
+		addCaption: "Add Record",
+		editCaption: "Edit Record",
+		bSubmit: "Submit",
+		bCancel: "Cancel",
+		bClose: "Close",
+		saveData: "Data has been changed! Save changes?",
+		bYes : "Yes",
+		bNo : "No",
+		bExit : "Cancel",
+		msg: {
+			required:"Field is required",
+			number:"Please, enter valid number",
+			minValue:"value must be greater than or equal to ",
+			maxValue:"value must be less than or equal to",
+			email: "is not a valid e-mail",
+			integer: "Please, enter valid integer value",
+			date: "Please, enter valid date value",
+			url: "is not a valid URL. Prefix required ('http://' or 'https://')",
+			nodefined : " is not defined!",
+			novalue : " return value is required!",
+			customarray : "Custom function should return array!",
+			customfcheck : "Custom function should be present in case of custom checking!"
+			
+		}
+	},
+	view : {
+		caption: "View Record",
+		bClose: "Close"
+	},
+	del : {
+		caption: "Delete",
+		msg: "Delete selected record(s)?",
+		bSubmit: "Delete",
+		bCancel: "Cancel"
+	},
+	nav : {
+		edittext: "",
+		edittitle: "Edit selected row",
+		addtext:"",
+		addtitle: "Add new row",
+		deltext: "",
+		deltitle: "Delete selected row",
+		searchtext: "",
+		searchtitle: "Find records",
+		refreshtext: "",
+		refreshtitle: "Reload Grid",
+		alertcap: "Warning",
+		alerttext: "Please, select row",
+		viewtext: "",
+		viewtitle: "View selected row"
+	},
+	col : {
+		caption: "Select columns",
+		bSubmit: "Ok",
+		bCancel: "Cancel"
+	},
+	errors : {
+		errcap : "Error",
+		nourl : "No url is set",
+		norecords: "No records to process",
+		model : "Length of colNames <> colModel!"
+	},
+	formatter : {
+		integer : {thousandsSeparator: ",", defaultValue: '0'},
+		number : {decimalSeparator:".", thousandsSeparator: ",", decimalPlaces: 2, defaultValue: '0.00'},
+		currency : {decimalSeparator:".", thousandsSeparator: ",", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
+		date : {
+			dayNames:   [
+				"Sun", "Mon", "Tue", "Wed", "Thr", "Fri", "Sat",
+				"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
+			],
+			monthNames: [
+				"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+				"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
+			],
+			AmPm : ["am","pm","AM","PM"],
+			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th';},
+			srcformat: 'Y-m-d',
+			newformat: 'n/j/Y',
+			masks : {
+				// see http://php.net/manual/en/function.date.php for PHP format used in jqGrid
+				// and see http://docs.jquery.com/UI/Datepicker/formatDate
+				// and https://github.com/jquery/globalize#dates for alternative formats used frequently
+				// one can find on https://github.com/jquery/globalize/tree/master/lib/cultures many
+				// information about date, time, numbers and currency formats used in different countries
+				// one should just convert the information in PHP format
+				ISO8601Long:"Y-m-d H:i:s",
+				ISO8601Short:"Y-m-d",
+				// short date:
+				//    n - Numeric representation of a month, without leading zeros
+				//    j - Day of the month without leading zeros
+				//    Y - A full numeric representation of a year, 4 digits
+				// example: 3/1/2012 which means 1 March 2012
+				ShortDate: "n/j/Y", // in jQuery UI Datepicker: "M/d/yyyy"
+				// long date:
+				//    l - A full textual representation of the day of the week
+				//    F - A full textual representation of a month
+				//    d - Day of the month, 2 digits with leading zeros
+				//    Y - A full numeric representation of a year, 4 digits
+				LongDate: "l, F d, Y", // in jQuery UI Datepicker: "dddd, MMMM dd, yyyy"
+				// long date with long time:
+				//    l - A full textual representation of the day of the week
+				//    F - A full textual representation of a month
+				//    d - Day of the month, 2 digits with leading zeros
+				//    Y - A full numeric representation of a year, 4 digits
+				//    g - 12-hour format of an hour without leading zeros
+				//    i - Minutes with leading zeros
+				//    s - Seconds, with leading zeros
+				//    A - Uppercase Ante meridiem and Post meridiem (AM or PM)
+				FullDateTime: "l, F d, Y g:i:s A", // in jQuery UI Datepicker: "dddd, MMMM dd, yyyy h:mm:ss tt"
+				// month day:
+				//    F - A full textual representation of a month
+				//    d - Day of the month, 2 digits with leading zeros
+				MonthDay: "F d", // in jQuery UI Datepicker: "MMMM dd"
+				// short time (without seconds)
+				//    g - 12-hour format of an hour without leading zeros
+				//    i - Minutes with leading zeros
+				//    A - Uppercase Ante meridiem and Post meridiem (AM or PM)
+				ShortTime: "g:i A", // in jQuery UI Datepicker: "h:mm tt"
+				// long time (with seconds)
+				//    g - 12-hour format of an hour without leading zeros
+				//    i - Minutes with leading zeros
+				//    s - Seconds, with leading zeros
+				//    A - Uppercase Ante meridiem and Post meridiem (AM or PM)
+				LongTime: "g:i:s A", // in jQuery UI Datepicker: "h:mm:ss tt"
+				SortableDateTime: "Y-m-d\\TH:i:s",
+				UniversalSortableDateTime: "Y-m-d H:i:sO",
+				// month with year
+				//    Y - A full numeric representation of a year, 4 digits
+				//    F - A full textual representation of a month
+				YearMonth: "F, Y" // in jQuery UI Datepicker: "MMMM, yyyy"
+			},
+			reformatAfterEdit : false
+		},
+		baseLinkUrl: '',
+		showAction: '',
+		target: '',
+		checkbox : {disabled:true},
+		idName : 'id'
+	}
+});
+})(jQuery);

site/webroot/js/jqGrid/grid.postext.js

@@ -0,0 +1,64 @@
+;(function($){
+/**
+ * jqGrid extension
+ * Paul Tiseo ptiseo@wasteconsultants.com
+ * 
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl-2.0.html
+**/ 
+$.jgrid.extend({
+	getPostData : function(){
+		var $t = this[0];
+		if(!$t.grid) { return; }
+		return $t.p.postData;
+	},
+	setPostData : function( newdata ) {
+		var $t = this[0];
+		if(!$t.grid) { return; }
+		// check if newdata is correct type
+		if ( typeof(newdata) === 'object' ) {
+			$t.p.postData = newdata;
+		}
+		else {
+			alert("Error: cannot add a non-object postData value. postData unchanged.");
+		}
+	},
+	appendPostData : function( newdata ) { 
+		var $t = this[0];
+		if(!$t.grid) { return; }
+		// check if newdata is correct type
+		if ( typeof(newdata) === 'object' ) {
+			$.extend($t.p.postData, newdata);
+		}
+		else {
+			alert("Error: cannot append a non-object postData value. postData unchanged.");
+		}
+	},
+	setPostDataItem : function( key, val ) {
+		var $t = this[0];
+		if(!$t.grid) { return; }
+		$t.p.postData[key] = val;
+	},
+	getPostDataItem : function( key ) {
+		var $t = this[0];
+		if(!$t.grid) { return; }
+		return $t.p.postData[key];
+	},
+	removePostDataItem : function( key ) {
+		var $t = this[0];
+		if(!$t.grid) { return; }
+		delete $t.p.postData[key];
+	},
+	getUserData : function(){
+		var $t = this[0];
+		if(!$t.grid) { return; }
+		return $t.p.userData;
+	},
+	getUserDataItem : function( key ) {
+		var $t = this[0];
+		if(!$t.grid) { return; }
+		return $t.p.userData[key];
+	}
+});
+})(jQuery);