Fixed bug that was using an existing entry, even when the source had been selected as new.

git-svn-id: file:///svn-source/pmgr/branches/hosted_migration_20130215@1029 97e9348a-65ac-dc4b-aefc-98561f571b83
Prevent redirection when in dev mode, so that we can see the debug output from each page
2013-05-30 03:38:17 +00:00 · 2013-05-30 03:36:38 +00:00 · 2013-05-30 03:35:55 +00:00 · 2013-05-30 02:04:42 +00:00 · 2013-02-16 00:10:48 +00:00 · 2013-02-16 00:09:39 +00:00
59 changed files with 2175 additions and 1347 deletions
--- a/bookkeeping.notes
+++ b/bookkeeping.notes
@@ -1,51 +0,0 @@
 Book Keeping Challenges / Issues
  - Chart of Accounts is not sufficient
    - One payment can go towards more than one charge
    - One charge can be paid for by more than one payment
    - Need to know: how much money does customer owe?
    - Need to know: how much money has customer been charged for "Rent"?
    - Need to know: how much money has customer paid towards "Rent" (nothing else)?
  - Reverse a charge
    To make charge reversal work, I'm presently issuing a credit note
    (transaction) that has 3 ledger entries:
       Debit charged account   -  Credit A/R
       Debit A/R               -  Credit "Credit" account
       Debit "Credit" account  -  Credit A/R
    And 3 statement entries:
       Reversal on charged account
       Negative Disbursement on "Credit" account
       Positive Disbursement on "Credit" account
    Obviously, the two "Credit" account ledger entries cancel each other
    out.  However, the monies need to be reversed in the A/R account, and a
    previous transaction will have already performed an A/R credit and so
    the two A/R credits will create an imbalance in A/R unless we move
    those funds to our "Credit" account.  The "Credit" account statement
    entries are needed to undo any previous disbursement to the charge
    being reversed, and then to re-disburse those funds to a different
    charge (or possibly just a Surplus entry if no other charges exist.)
 Question
  - What should be recorded with this charge reversal?
    Charge of $5 for "Parking"
    Charge of $6 for "Rent"
    Payment of $6
    Reverse the $5 "Parking" charge
  - What should be recorded with this charge reversal?
    Charge of $5 for "Parking"
    Charge of $6 for "Rent"
    Charge of $7 for "Pets"
    Payment of $13
    Reverse the $5 "Parking" charge
  - What should be recorded with this charge reversal?
    Charge of $5 for "Parking"
    Charge of $6 for "Rent"
    Charge of $7 for "Pets"
    Payment of $18
    Reverse the $5 "Parking" charge
--- a/build.cmd
+++ b/build.cmd
@@ -1,3 +0,0 @@
@echo off
 mysql --user=pmgr --password=pmgruser < %~dp0\db\property_manager.sql
 echo Done!
--- a/db/property_manager.sql
+++ b/db/property_manager.sql
--- a/db/scratch.sql
+++ b/db/scratch.sql
@@ -1,678 +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;
 -- Delete all but one customer
 SET @cid = 6;
 -- DELETE T FROM pmgr_transactions T
 --  LEFT JOIN pmgr_customers C ON C.id = T.customer_id
 --  WHERE C.id IS NOT NULL AND C.id <> @cid;
 DELETE C FROM pmgr_customers C
 WHERE C.id <> @cid;
 DELETE L FROM pmgr_leases L
 LEFT JOIN pmgr_customers C ON C.id = L.customer_id
 WHERE C.id IS NULL;
 DELETE T FROM pmgr_transactions T
 LEFT JOIN pmgr_customers C ON C.id = T.customer_id
 WHERE C.id IS NULL;
 DELETE SE FROM pmgr_statement_entries SE
 LEFT JOIN pmgr_customers C ON C.id = SE.customer_id
 WHERE C.id IS NULL;
 DELETE LE FROM pmgr_ledger_entries LE
 LEFT JOIN pmgr_transactions T ON T.id = LE.transaction_id
 WHERE T.id IS NULL;
 DELETE M FROM pmgr_tenders M
 LEFT JOIN pmgr_ledger_entries LE ON M.ledger_entry_id = LE.id
 WHERE LE.id IS NULL;
 DELETE DE FROM pmgr_double_entries DE
 LEFT JOIN pmgr_ledger_entries LE ON LE.id = DE.debit_entry_id
 WHERE LE.id IS NULL;
 DELETE DE FROM pmgr_double_entries DE
 LEFT JOIN pmgr_ledger_entries LE ON LE.id = DE.credit_entry_id
 WHERE LE.id IS NULL;
 UPDATE pmgr_ledger_entries LE, pmgr_ledgers L, pmgr_accounts A
 SET LE.ledger_id = L.id
 WHERE A.id = LE.account_id AND L.account_id = A.id AND L.sequence = 1;
 DELETE FROM pmgr_ledgers WHERE sequence > 1;
 UPDATE pmgr_ledgers SET prior_ledger_id = NULL, close_transaction_id = NULL;
 -- Delete a ledger entry, associated double entry, and matching ledger_entry
 SET @leid = 1365;
 DELETE FROM pmgr_ledger_entries WHERE id = @leid;
 DELETE DE FROM pmgr_double_entries DE
 LEFT JOIN pmgr_ledger_entries LE ON LE.id = DE.debit_entry_id
 WHERE LE.id IS NULL;
 DELETE DE FROM pmgr_double_entries DE
 LEFT JOIN pmgr_ledger_entries LE ON LE.id = DE.credit_entry_id
 WHERE LE.id IS NULL;
 DELETE LE FROM pmgr_ledger_entries LE
 LEFT JOIN pmgr_double_entries DE 
   ON DE.credit_entry_id = LE.id OR DE.debit_entry_id = LE.id
 WHERE DE.id IS NULL;
 -- Add and update every Tender.ledger_entry_id (for rolling up old databases)
 -- Takes a while to complete (~30s at time of writing)
 ALTER TABLE `pmgr_tenders`
 ADD `deposit_ledger_entry_id` INT UNSIGNED DEFAULT NULL
 AFTER `nsf_ledger_entry_id`;
 UPDATE
 pmgr_tenders Tnd
 JOIN pmgr_tender_types TndT ON TndT.id = Tnd.tender_type_id
 JOIN pmgr_transactions T ON T.id = Tnd.deposit_transaction_id
 JOIN pmgr_ledger_entries LE ON LE.transaction_id = T.id AND LE.account_id = TndT.account_id
 JOIN pmgr_double_entries DE ON DE.debit_entry_id = LE.id OR DE.credit_entry_id = LE.id
 JOIN pmgr_ledger_entries LEd ON (DE.debit_entry_id = LEd.id OR DE.credit_entry_id = LEd.id)
    AND LEd.id <> LE.id    
 SET Tnd.deposit_ledger_entry_id = LEd.id;
 -- Add auto_deposit and deposit_account_id to tenders
 ALTER TABLE `pmgr_tender_types`
 ADD `auto_deposit` TINYINT(1) UNSIGNED DEFAULT '0' NOT NULL
 AFTER `tillable`;
 ALTER TABLE `pmgr_tender_types`
 ADD `deposit_account_id` INTEGER(10) UNSIGNED DEFAULT NULL
 AFTER `account_id`;
 -- 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.amount <> IF(T.type IN ('INVOICE','TRANSFER','DEPOSIT','PAYMENT'), Tamt, Oamt))
      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')
 -- #################################################################
 -- #################################################################
 -- #################################################################
 -- #################################################################
 -- #################################################################
 -- #################################################################
 -- #################################################################
 -- #################################################################
 -- #################################################################
 -- ## USER / GROUP
 INSERT INTO pmgr_groups (`code`, `name`, `rank`)
 VALUES('Owner', 'Owner Group', 25);
 SET @o_gid = LAST_INSERT_ID();
 INSERT INTO pmgr_groups (`code`, `name`, `rank`)
 VALUES('Admin', 'Admin Group', 50);
 SET @a_gid = LAST_INSERT_ID();
 INSERT INTO pmgr_groups (`code`, `name`, `rank`)
 VALUES('Manager', 'Manager Group', 75);
 SET @m_gid = LAST_INSERT_ID();
 INSERT INTO pmgr_groups (`code`, `name`)
 VALUES('Temp', 'Temporary Help');
 SET @t_gid = LAST_INSERT_ID();
 INSERT INTO pmgr_users (`code`, `login`, `contact_id`)
 VALUES('AP', 'abijah', 0);
 SET @a_uid = LAST_INSERT_ID();
 INSERT INTO pmgr_users (`code`, `login`, `contact_id`)
 VALUES('SK', 'shirley', 0);
 SET @s_uid = LAST_INSERT_ID();
 INSERT INTO pmgr_users (`code`, `login`, `contact_id`)
 VALUES('DE', 'dan', 0);
 SET @d_uid = LAST_INSERT_ID();
 INSERT INTO pmgr_users (`code`, `login`, `contact_id`)
 VALUES('KD', 'kevin', 0);
 SET @k_uid = LAST_INSERT_ID();
 INSERT INTO pmgr_sites (`code`, `name`)
 VALUES('VSS', 'Valley Storage');
 SET @v_sid = LAST_INSERT_ID();
 INSERT INTO pmgr_sites (`code`, `name`)
 VALUES('FAKE', 'Fake Site');
 SET @f_sid = LAST_INSERT_ID();
 -- Site Membership
 INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
 VALUES(@v_sid, @a_uid, @o_gid);
 INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
 VALUES(@v_sid, @a_uid, @a_gid);
 INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
 VALUES(@v_sid, @a_uid, @m_gid);
 INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
 VALUES(@v_sid, @s_uid, @m_gid);
 INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
 VALUES(@v_sid, @d_uid, @t_gid);
 INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
 VALUES(@f_sid, @s_uid, @a_gid);
 INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
 VALUES(@f_sid, @s_uid, @m_gid);
 INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
 VALUES(@f_sid, @k_uid, @o_gid);
 INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
 VALUES(@f_sid, @d_uid, @t_gid);
 -- Options
 INSERT INTO pmgr_options (`name`) VALUES ('theme');
 SET @t_oid = LAST_INSERT_ID();
 INSERT INTO pmgr_options (`name`) VALUES ('menu');
 SET @m_oid = LAST_INSERT_ID();
 -- Default Option Values
 INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@t_oid, 'blue');
 INSERT INTO pmgr_default_options (`option_value_id`) VALUES(LAST_INSERT_ID());
 INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@m_oid, 'basic');
 INSERT INTO pmgr_default_options (`option_value_id`) VALUES(LAST_INSERT_ID());
 -- Group options
 INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@t_oid, 'gold');
 INSERT INTO pmgr_group_options (`group_id`, `option_value_id`)
 VALUES(@o_gid, LAST_INSERT_ID());
 INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@t_oid, 'silver');
 INSERT INTO pmgr_group_options (`group_id`, `option_value_id`)
 VALUES(@a_gid, LAST_INSERT_ID());
 INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@t_oid, 'red');
 INSERT INTO pmgr_group_options (`group_id`, `option_value_id`)
 VALUES(@m_gid, LAST_INSERT_ID());
 INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@m_oid, 'advanced');
 INSERT INTO pmgr_group_options (`group_id`, `option_value_id`)
 VALUES(@o_gid, LAST_INSERT_ID());
 INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@m_oid, 'advanced');
 INSERT INTO pmgr_group_options (`group_id`, `option_value_id`)
 VALUES(@a_gid, LAST_INSERT_ID());
 INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@m_oid, 'restricted');
 INSERT INTO pmgr_group_options (`group_id`, `option_value_id`)
 VALUES(@t_gid, LAST_INSERT_ID());
 -- User Options
 INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@m_oid, 'special');
 INSERT INTO pmgr_user_options (`user_id`, `option_value_id`)
 VALUES(@s_uid, LAST_INSERT_ID());
 -- Site Options
 INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@t_oid, 'site-theme');
 INSERT INTO pmgr_site_options (`site_id`, `option_value_id`)
 VALUES(@f_sid, LAST_INSERT_ID());
 -- SELECT U.id, P.name, MAX(P.access)
 --  FROM pmgr_users U
 --    LEFT JOIN pmgr_site_membership   M ON M.user_id = U.id
 --    LEFT JOIN pmgr_groups            G ON G.id = M.group_id
 --    LEFT JOIN pmgr_group_permissions P ON P.group_id = G.id
 -- GROUP BY U.id, P.name
 -- User access to site
 SELECT U.id, U.login, COUNT(G.id) AS 'groups', MIN(G.rank) AS highest_rank
 FROM pmgr_users U
   JOIN pmgr_site_memberships  M ON M.user_id = U.id
   JOIN pmgr_sites             S ON S.id = M.site_id
   JOIN pmgr_groups            G ON G.id = M.group_id
 WHERE S.code = 'VSS'
 GROUP BY U.id
 -- User Options
 SELECT O.id, O.name, O.default,
       GROUP_CONCAT(Uopt.value) AS 'value', COUNT(U.id) AS 'count'
 FROM pmgr_options O
   LEFT JOIN pmgr_user_options  Uopt ON Uopt.option_id = O.id
   LEFT JOIN pmgr_users         U    ON U.id = Uopt.user_id
 WHERE U.id = 1
 GROUP BY O.id
 -- Group Options
 SELECT O.id, O.name, O.default,
       GROUP_CONCAT(Gopt.value) AS 'value', COUNT(G.id) AS 'count'
 FROM pmgr_options O
   LEFT JOIN pmgr_group_options  Gopt ON Gopt.option_id = O.id
   LEFT JOIN pmgr_groups         G    ON G.id = Gopt.group_id
 WHERE G.id = 1
 GROUP BY O.id
 -- Site Options
 SELECT O.id, O.name, O.default,
       GROUP_CONCAT(Sopt.value) AS 'value', COUNT(S.id) AS 'count'
 FROM pmgr_options O
   LEFT JOIN pmgr_site_options  Sopt ON Sopt.option_id = O.id
   LEFT JOIN pmgr_sites         S    ON S.id = Sopt.site_id
 WHERE S.id = 1
 GROUP BY O.id
 -- Option value for member & site
 SELECT O.id, O.name, O.default,
       S.id AS site_id, Sopt.value,
       G.id AS group_id, Gopt.value,
       U.id AS user_id, Uopt.value
 FROM pmgr_options O
   LEFT JOIN pmgr_site_options  Sopt ON Sopt.option_id = O.id
   LEFT JOIN pmgr_sites         S    ON S.id = Sopt.site_id
   LEFT JOIN pmgr_group_options Gopt ON Gopt.option_id = O.id
   LEFT JOIN pmgr_groups        G    ON G.id = Gopt.group_id
   LEFT JOIN pmgr_user_options  Uopt ON Uopt.option_id = O.id
   LEFT JOIN pmgr_users         U    ON U.id = Uopt.user_id
 WHERE O.name = 'theme'
 --GROUP BY O.id
 -- Option value for member & site
 -- 1) User
 SET @sid = 1;
 SET @uid = 1;
 SET @oid = 1;
 SELECT O.name, U.id, Uopt.value
 FROM pmgr_options O
   JOIN pmgr_user_options      Uopt ON Uopt.option_id = O.id
   JOIN pmgr_users             U    ON U.id = Uopt.user_id
 --   JOIN pmgr_site_memberships  M    ON M.user_id = U.id
 --   JOIN pmgr_groups            G    ON G.id = M.group_id
 --   JOIN pmgr_sites             S    ON S.id = M.site_id
 WHERE -- S.id = @sid AND
     U.id = @uid AND O.id = @oid
 ;
 -- 2) Group
 SELECT O.name, G.rank, G.id, Gopt.value
 FROM pmgr_options O
   JOIN pmgr_group_options     Gopt ON Gopt.option_id = O.id
   JOIN pmgr_groups            G    ON G.id = Gopt.group_id
   JOIN pmgr_site_memberships  M    ON M.group_id = G.id
   JOIN pmgr_users             U    ON U.id = M.user_id
   JOIN pmgr_sites             S    ON S.id = M.site_id
 WHERE S.id = @sid AND U.id = @uid AND O.id = @oid
 ORDER BY G.rank
 ;
 -- 3) Site
 SELECT O.name, S.id, Sopt.value
 FROM pmgr_options O
   JOIN pmgr_site_options      Sopt ON Sopt.option_id = O.id
   JOIN pmgr_sites             S    ON S.id = Sopt.site_id
 --    JOIN pmgr_site_memberships  M    ON M.site_id = S.id
 --    JOIN pmgr_groups            G    ON G.id = M.group_id
 --    JOIN pmgr_users             U    ON U.id = M.user_id
 WHERE S.id = @sid
 --      AND U.id = @uid
      AND O.id = @oid
 ;
 -- 3) Default
 SELECT O.name, O.default AS 'value'
 FROM pmgr_options O
 WHERE O.id = @oid
 ;
 -- User Permissions
 -- Group Permissions
 -- All option values, in order
 SELECT O.name, V.value,
       U.id AS uid, G.id AS gid, S.id as sid,
       Dopt.id AS did, G.rank
 FROM pmgr_option_values V
   JOIN pmgr_options              O    ON O.id = V.option_id
   LEFT JOIN pmgr_user_options    Uopt ON Uopt.option_value_id = V.id
   LEFT JOIN pmgr_group_options   Gopt ON Gopt.option_value_id = V.id
   LEFT JOIN pmgr_site_options    Sopt ON Sopt.option_value_id = V.id
   LEFT JOIN pmgr_default_options Dopt ON Dopt.option_value_id = V.id
   LEFT JOIN pmgr_groups          G    ON G.id = Gopt.group_id
   LEFT JOIN pmgr_users           U    ON U.id = Uopt.user_id
   LEFT JOIN pmgr_sites           S    ON S.id = Sopt.site_id
 WHERE O.id = @oid
 ORDER BY IF(U.id IS NOT NULL, 1,
            IF (G.id IS NOT NULL, 2,
                IF (S.id IS NOT NULL, 3, 4))) ASC,
         IF (G.id IS NOT NULL, G.rank, 0) ASC
 -- Option values relevant to the user and site, in order
 SELECT O.name, V.value,
       U.id AS uid, G.id AS gid, S.id as sid,
       Dopt.id AS did, G.rank
 FROM pmgr_option_values V
   JOIN pmgr_options              O    ON O.id = V.option_id
   LEFT JOIN pmgr_user_options    Uopt ON Uopt.option_value_id = V.id
   LEFT JOIN pmgr_group_options   Gopt ON Gopt.option_value_id = V.id
   LEFT JOIN pmgr_site_options    Sopt ON Sopt.option_value_id = V.id
   LEFT JOIN pmgr_default_options Dopt ON Dopt.option_value_id = V.id
   LEFT JOIN pmgr_groups          G    ON G.id = Gopt.group_id
   LEFT JOIN pmgr_users           U    ON U.id = Uopt.user_id
   LEFT JOIN pmgr_sites           S    ON S.id = Sopt.site_id
   JOIN pmgr_site_memberships  M    ON M.user_id = U.id AND M.site_id = S.id
 WHERE S.id = @sid AND U.id = @uid AND O.id = @oid
 ORDER BY IF(U.id IS NOT NULL, 1,
            IF (G.id IS NOT NULL, 2,
                IF (S.id IS NOT NULL, 3, 4))) ASC,
         IF (G.id IS NOT NULL, G.rank, 0) ASC
 SET @sid = 1;
 SET @uid = 1;
 SET @oid = 1;
 SELECT O.name, V.value,
       U.id AS uid,
 		 -- G.id AS gid,
 		 S.id as sid,
       Dopt.id AS did
 		 -- G.rank
 FROM pmgr_option_values V
   JOIN pmgr_options              O    ON O.id = V.option_id
   LEFT JOIN pmgr_user_options    Uopt ON Uopt.option_value_id = V.id
   LEFT JOIN pmgr_site_options    Sopt ON Sopt.option_value_id = V.id
 --   LEFT JOIN pmgr_users           U    ON U.id = Uopt.user_id
 --   LEFT JOIN pmgr_group_options   Gopt ON Gopt.option_value_id = V.id
   LEFT JOIN pmgr_default_options Dopt ON Dopt.option_value_id = V.id
 --   LEFT JOIN pmgr_groups          G    ON G.id = Gopt.group_id
   LEFT JOIN pmgr_users           U    ON U.id = Uopt.user_id
   LEFT JOIN pmgr_sites           S    ON S.id = Sopt.site_id
   JOIN pmgr_site_memberships     M    ON M.user_id = U.id -- AND M.site_id = S.id
 WHERE -- S.id = @sid AND U.id = @uid AND 
  O.id = @oid
 ORDER BY IF(U.id IS NOT NULL, 1,
 --            IF (G.id IS NOT NULL, 2,
                IF (S.id IS NOT NULL, 3, 4)) -- ) ASC,
 --         IF (G.id IS NOT NULL, G.rank, 0) ASC
 -- ------------------------------------------------------------
 -- ------------------------------------------------------------
 -- ------------------------------------------------------------
 --  Working version (without defaults)
 SET @sid = 1;
 SET @uid = 1;
 SET @oid = 1;
 SELECT O.name, O.id AS oid, V.value, V.id AS vid,
       U.id AS uid,
       G.id AS gid,
       S.id AS sid,
 --       Dopt.id AS did
       G.rank
 FROM pmgr_users U
   JOIN pmgr_site_memberships     M ON M.user_id = U.id
   JOIN pmgr_sites                S ON S.id = M.site_id
   LEFT JOIN pmgr_groups          G ON G.id = M.group_id
   LEFT JOIN pmgr_user_options    Uopt ON Uopt.user_id  = U.id
   LEFT JOIN pmgr_group_options   Gopt ON Gopt.group_id = G.id
   LEFT JOIN pmgr_site_options    Sopt ON Sopt.site_id  = S.id
   LEFT JOIN pmgr_option_values   V    ON (V.id = Uopt.option_value_id OR
                                           V.id = Gopt.option_value_id OR
                                           V.id = Sopt.option_value_id)
   JOIN pmgr_options              O    ON O.id = V.option_id
 WHERE S.id = @sid AND U.id = @uid AND O.id = @oid
 ORDER BY IF(U.id IS NOT NULL, 1,
            IF (G.id IS NOT NULL, 2,
                IF (S.id IS NOT NULL, 3, 4))) ASC,
         IF (G.id IS NOT NULL, G.rank, 0) ASC
 ;
 SET @sid = 1;
 SET @uid = 1;
 SET @oid = 1;
 SELECT O.name, O.id AS oid, V.value, V.id AS vid,
       U.id AS uid,
       G.id AS gid,
       S.id AS sid,
 --       Dopt.id AS did
       G.rank
 FROM pmgr_options O
   LEFT JOIN pmgr_option_values     V    ON V.option_id = O.id
   -- Now have the option and all possible values
   LEFT JOIN pmgr_user_options      Uopt ON Uopt.option_value_id = V.id
   LEFT JOIN pmgr_group_options     Gopt ON Gopt.option_value_id = V.id
   LEFT JOIN pmgr_site_options      Sopt ON Sopt.option_value_id = V.id
   -- Now have the user/group/site that each value applies to
   LEFT JOIN pmgr_users U           U    ON Uopt.user_id = U.id OR Uopt.user_id IS NULL
   -- Now restricted to our user
        JOIN pmgr_site_memberships  M    ON M.user_id = U.id
        JOIN pmgr_sites             S    ON S.id = M.site_id
   ON O.id = V.option_id
   LEFT JOIN pmgr_groups          G ON G.id = M.group_id
   LEFT JOIN pmgr_option_values   V    ON (V.id = Uopt.option_value_id OR
                                           V.id = Gopt.option_value_id OR
                                           V.id = Sopt.option_value_id)
   JOIN 
 WHERE S.id = @sid AND U.id = @uid AND O.id = @oid
 ORDER BY IF(U.id IS NOT NULL, 1,
            IF (G.id IS NOT NULL, 2,
                IF (S.id IS NOT NULL, 3, 4))) ASC,
         IF (G.id IS NOT NULL, G.rank, 0) ASC
 ;
 SET @sid = 1;
 SET @uid = 1;
 SET @oid = 1;
 SELECT O.name, O.id AS oid, V.value, V.id AS vid,
       U.id AS uid,
       G.id AS gid,
       S.id AS sid,
 --       Dopt.id AS did
       G.rank
 FROM pmgr_options O LEFT JOIN pmgr_option_values V ON V.option_id = O.id,
   pmgr_users U
   JOIN pmgr_site_memberships     M ON M.user_id = U.id
   JOIN pmgr_sites                S ON S.id = M.site_id
   LEFT JOIN pmgr_groups          G ON G.id = M.group_id
   LEFT JOIN pmgr_user_options    Uopt ON Uopt.user_id  = U.id
   LEFT JOIN pmgr_group_options   Gopt ON Gopt.group_id = G.id
   LEFT JOIN pmgr_site_options    Sopt ON Sopt.site_id  = S.id,
 WHERE S.id = @sid AND U.id = @uid AND O.id = @oid
  AND (V.id = Uopt.option_value_id OR
       V.id = Gopt.option_value_id OR
       V.id = Sopt.option_value_id)
 ORDER BY IF(U.id IS NOT NULL, 1,
            IF (G.id IS NOT NULL, 2,
                IF (S.id IS NOT NULL, 3, 4))) ASC,
         IF (G.id IS NOT NULL, G.rank, 0) ASC
 ;
 -- ----------------------------------------------------
 -- Income by Month
 SELECT MONTH(SE.effective_date) AS mon, YEAR(SE.effective_date) AS yr,
       SE.account_id AS acct, ROUND(SUM(SE.amount)) AS amt
 FROM pmgr_statement_entries SE
 WHERE SE.type = 'CHARGE'
  AND SE.effective_date >= '2009-04-01' AND SE.effective_date <= NOW()  
 GROUP BY yr, mon, acct WITH ROLLUP
 -- ----------------------------------------------------
 -- Rent Income by Month
 SELECT MONTH(SE.effective_date) AS mon, YEAR(SE.effective_date) AS yr,
       ROUND(SUM(SE.amount)) AS amt
 FROM pmgr_statement_entries SE
 WHERE SE.type = 'CHARGE'
  AND SE.effective_date >= '2009-04-01' AND SE.effective_date <= NOW()  
  AND SE.account_id = 13
 GROUP BY yr, mon WITH ROLLUP
 -- ----------------------------------------------------
 -- Occupancy during given month
 SELECT COUNT(L.id) FROM pmgr_leases L
 WHERE L.movein_date < '2009-10-01'
  AND (L.moveout_date IS NULL OR L.moveout_date > '2009-09-01')
 -- ----------------------------------------------------
 -- Move-ins by month
 SELECT MONTH(L.movein_date) AS mon, YEAR(L.movein_date) AS yr, COUNT(L.id)
 FROM pmgr_leases L
 WHERE L.movein_date >= '2009-04-01'
 GROUP BY yr, mon
 -- ----------------------------------------------------
 -- Move-outs by month
 SELECT MONTH(L.moveout_date) AS mon, YEAR(L.moveout_date) AS yr, COUNT(L.id)
 FROM pmgr_leases L
 WHERE L.moveout_date >= '2009-04-01'
 GROUP BY yr, mon
 -- ----------------------------------------------------
 -- Move-ins/Move-outs by month
 SELECT
   MONTH(L.movein_date) AS mon, YEAR(L.movein_date) AS yr,
   IF(L.movein_date AS mon, YEAR(L.movein_date) AS yr,
 FROM pmgr_leases L
 WHERE L.movein_date >= '2009-04-01'
 GROUP BY yr, mon
 -- ----------------------------------------------------
 -- Rent charged
 SELECT SUM(SE.amount)
 FROM pmgr_statement_entries SE
 LEFT JOIN pmgr_accounts A ON A.id = SE.account_id 
 WHERE A.name = 'Rent'
 -- AND SE.effective_date >= '2009-04-01'
 -- AND SE.effective_date < '2009-12-01'
 -- --------------------------------------------------------------
 -- Merge two customers
 SELECT * FROM pmgr_statement_entries WHERE customer_id = 65
 ;
 UPDATE pmgr_leases SET customer_id=21 WHERE customer_id=65;
 UPDATE pmgr_reservations SET customer_id=21 WHERE customer_id=65;
 UPDATE pmgr_statement_entries SET customer_id=21 WHERE customer_id=65;
 UPDATE pmgr_tenders SET customer_id=21 WHERE customer_id=65;
 UPDATE pmgr_transactions SET customer_id=21 WHERE customer_id=65;
 -- Make sure to update customer info afterwards
 -- --------------------------------------------------------------
 -- Determine income from a customer
 SELECT NT.name AS 'type', SUM(LE.amount) AS 'total'
 FROM pmgr_tenders N 
   LEFT JOIN pmgr_tender_types NT ON NT.id = N.tender_type_id   
   LEFT JOIN pmgr_ledger_entries LE ON LE.id = N.ledger_entry_id   
   LEFT JOIN pmgr_customers C ON C.id = N.customer_id
 WHERE
   N.customer_id = 49
   AND N.nsf_ledger_entry_id IS NULL
   AND (NT.tillable OR NT.auto_deposit)  
 GROUP BY NT.name WITH ROLLUP
 -- --------------------------------------------------------------
 -- Determine rent charges by month
 SELECT MONTH(SE.effective_date) AS 'mon',
       YEAR(SE.effective_date) AS 'yr',       
       DATE_FORMAT(SE.effective_date, "%m/1/%Y") AS 'date',
       SUM(SE.amount) AS 'total'
 FROM pmgr_accounts A
 LEFT JOIN pmgr_statement_entries SE ON SE.account_id = A.id
 WHERE
 A.name = 'Rent' 
 AND SE.effective_date < NOW()
 GROUP BY yr, mon -- WITH ROLLUP
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,68 +0,0 @@
 N - GATE
 N - ACH / CREDIT CARD PROCESSING
 Y - CREDIT CARD ENTRY
 Y - ACH ENTRY
 P - INVENTORY TRACKING / POS
 Y - UNIT TYPES
 Y - UNIT SIZES
 Y - UNITS
 Y - MOVE IN / OUT
 Y - UNIT TRANSFERS
 Y - LEASE TRACKING (PDF Generation)
 Y - LETTERS (PDF Generation)
 Y - REMINDERS
 Y - MULTIPLE LATE RENT SCHEDULES (Tenant A vs Tenant B)
 Y - ACCOUNTING (assign charges to accounts)
 Y - DETAILED REPORTING (HTML & PDF)
 Y - SITE MAP; HOT CLICKABLE
 P - PROSPECTIVE TENANTS
 Y - MARKETING
 P - RESERVATIONS
 P - MOVE OUT NOTICES
 P - MULTI-SITE (One database, multiple sites)
 Y - GENERATE GEOGRAPHIC MAP OF CUSTOMERS USING GOOGLE!
    - Major advantage here... MapPoint only choice with competitors
 Y - WEB BASED
 Y - CUSTOMER VIEW / MANAGER VIEW
 Y - CUSTOMERS CAN CREATE ACCOUNTS, VIEW HISTORY
 Y - CUSTOMERS CAN SIGN UP FOR AUTO PAY
 ----------------------------------------------------------------------
 ----------------------------------------------------------------------
 Operations to be functional
 'X' marks functionality sufficiently completed
 X - Create Customer ID/Account
 X - Add Contact information to Customer
 X - Move Customer into Unit
 X - Enter Rent Concessions given
 X - Asses Rent Charges
 X - Asses Late Charges
 X - Asses Security Deposits
 X - Receive and record Checks
 X - Receive and record Money Orders
 X - Receive and record Cash
 X - Receive and record ACH Deposits
 X - Reverse rent charges (early moveout on prepaid occupancy)
 X - Handle NSF checks
 X - Assess NSF Fees
 X - Determine Lease Paid-Through status
 X - Report: List of customers overdue
 X - Flag unit as overlocked
 X - Flag unit as evicting
 X - Flag unit as normal status
 X - Flag unit as dirty
   - Enter notes when communicating with Customer
 X - Accept pre-payments
 X - Record Customer Move-Out from Unit
 X - Record utilization of Security Deposit
 X - Record issuing of a refund
   - Record Deposit into Petty Cash
   - Record Payment from Petty Cash to expenses
 X - Record Petty Cash to refund.
 X - Write Off Bad Debt
 X - Perform a Deposit
 X - Close the Books (nightly / weekly, etc)
 X - Determine Rents Collected for a given period.
--- a/site/.htaccess
+++ b/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
--- a/site/app_controller.php
+++ b/site/app_controller.php
@@ -37,9 +37,9 @@
 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, 'CONTROLLER' => false, 'ACTION' => false, 'SANDBOX' => false));
+  var $sidemenu   = array('areas' => array('SITE' => false, 'REPORT' => false, 'CONTROLLER' => false, 'ACTION' => false, 'SANDBOX' => false));
  var $std_area   = 10;
  var $admin_area = 20;
  var $dev_area   = 30;
@@ -52,6 +52,15 @@ class AppController extends Controller {
    parent::__construct();
  }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
   * function: dev/admin()
   *  - Indicates if the user has dev/admin access
   */
  function dev()   { return !empty($this->params['dev']); }
  function admin() { return !empty($this->params['admin']); }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
@@ -71,6 +80,8 @@ class AppController extends Controller {
      $name = Inflector::humanize($this->params['controller']);
    elseif ($area == 'ACTION')
      $name = Inflector::humanize(Inflector::singularize($this->params['controller']));
    elseif ($area == 'REPORT')
      $name = 'Reports';
    elseif ($area == 'SANDBOX')
      $name = 'Sandbox';
@@ -246,11 +257,50 @@ class AppController extends Controller {
    $this->addSideMenuLink('New Deposit',
 			   array('controller' => 'tenders', 'action' => 'deposit'), null,
 			   'SITE', $this->op_area);
-    if (!empty($this->params['admin']))
+    if ($this->admin())
      $this->addSideMenuLink('Assess Charges',
 			     array('controller' => 'leases', 'action' => 'assess_all'), null,
 			     'SITE', $this->op_area);
    if ($this->admin()) {
      $acct = new Account;
      $this->addSideMenuLink('Collected Rent',
 			     array('controller' => 'accounts',
 				   'action' => 'collected',
 				   $acct->rentAccountID()), null,
 			     'REPORT');
      $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 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 Net',
 			     array('controller' => 'statement_entries', 'action' => 'netbymonth'), null,
 			     'REPORT');
    }
    else {
      $this->sideMenuEnable('REPORT', null, false);
    }
    $url_components = array('plugin', 'controller', 'action', 'named');
    if (devbox()) {
 /*       $sources = ConnectionManager::sourceList(); */
@@ -308,19 +358,19 @@ class AppController extends Controller {
    $this->params['admin'] = $this->Option->enabled('admin');
    $this->params['dev']   = devbox();
-    if ($this->params['dev'] && !$this->Option->enabled('dev'))
+    if ($this->dev() && !$this->Option->enabled('dev'))
      $this->redirect("/");
-    if (!$this->params['dev'])
+    if (!$this->dev())
      Configure::write('debug', '0');
    $this->addDefaultSideMenuLinks();
    //$this->sideMenuEnable('SITE', $this->op_area, false);
    foreach ($this->sidemenu['areas'] AS $area_name => $area) {
-      if (empty($this->params['dev']))
+      if (!$this->dev())
 	$this->sideMenuEnable($area_name, $this->dev_area, false);
-      if (empty($this->params['admin']))
+      if (!$this->admin())
 	$this->sideMenuEnable($area_name, $this->admin_area, false);
    }
@@ -389,6 +439,13 @@ class AppController extends Controller {
 	$this->sideMenuAreaActivate($area_name);
    }
    // If generating reports, don't display the controller menu.
    // Each report comes from a controller, but there is no need
    // to present the controller actions, so remove that section
    // from the menu.
    if ($this->sidemenu['active']['area'] == 'REPORT')
      $this->sideMenuEnable('CONTROLLER', null, false);
    //pr($this->sidemenu);
    $this->set('sidemenu', $this->sidemenu);
  }
@@ -407,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
@@ -600,15 +658,12 @@ class AppController extends Controller {
    // Grouping (which would not be typical)
    $query['group'] = $this->gridDataCountGroup($params, $model);
    if ($params['debug'])
      $params['count_query'] = $query;
    // Get the number of records prior to pagination
    return $this->gridDataCountExecute($params, $model, $query);
  }
  function gridDataCountExecute(&$params, &$model, $query) {
-    return $model->find('count', $query);
+    return $this->gridDataFind($params, $model, 'count', $query);
  }
  function gridDataCountTables(&$params, &$model) {
@@ -826,6 +881,9 @@ class AppController extends Controller {
    $page  = ($params['page'] <= 1) ? 1 : (($params['page'] > $total) ? $total : $params['page']);
    $start = $limit * ($page - 1);
    // Adjust the limit upward, if multiple pages were requested.
    $limit *= empty($params['npage']) ? 1 : $params['npage'];
    return compact('record_count', 'limit', 'page', 'start', 'total');
  }
@@ -857,14 +915,11 @@ class AppController extends Controller {
 					      isset($params['sidx']) ? $params['sidx'] : null,
 					      isset($params['sord']) ? $params['sord'] : null);
    if ($params['debug'])
      $params['query'] = $query;
    return $this->gridDataRecordsExecute($params, $model, $query);
  }
  function gridDataRecordsExecute(&$params, &$model, $query) {
-    return $model->find('all', $query);
+    return $this->gridDataFind($params, $model, 'all', $query);
  }
  function gridDataTables(&$params, &$model) {
@@ -906,12 +961,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' => ')'),
 		 'bw' => array('op' => 'LIKE', 'pre' => '',  'post' => '%'),
 		 'ew' => array('op' => 'LIKE', 'pre' => '%', 'post' => ''),
 		 'cn' => array('op' => 'LIKE', 'pre' => '%', 'post' => '%'),
@@ -961,6 +1028,13 @@ class AppController extends Controller {
    return $start . ', ' . $limit;
  }
  function gridDataFind(&$params, &$model, $type, $query) {
    if ($params['debug'])
      $params['queries'][] = compact('type', 'query');
    return $model->find($type, $query);
  }
  /**************************************************************************
   **************************************************************************
@@ -1107,7 +1181,8 @@ class AppController extends Controller {
  }
  function gridDataOutputSummary(&$params, &$model, $pagination) {
-    echo " <params><![CDATA[\n" . print_r($params, true) . "\n]]></params>\n";
+    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";
    echo " <records>{$pagination['record_count']}</records>\n";
@@ -1148,7 +1223,7 @@ class AppController extends Controller {
  function gridDataOutputRecordCell(&$params, &$model, &$record, $field, $data) {
    // be sure to put text data in CDATA
-    if (preg_match("/^\d*$/", $data))
+    if (preg_match("/^[\d.]*$/", $data))
      echo "  <cell>$data</cell>\n"; 
    else
      echo "  <cell><![CDATA[$data]]></cell>\n"; 
--- a/site/build_devbox.cmd
+++ b/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!
--- a/site/build_sandbox.cmd
+++ b/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!
--- a/site/config/bootstrap.php
+++ b/site/config/bootstrap.php
@@ -32,15 +32,22 @@
 *
 */
-function sandbox() {
+function _box($type) {
-  $r = Router::requestRoute();
+  static $box = array('type' => null, 'test' => array());
-  return !empty($r[3]['sand_route']);
+  if (!isset($box['type']) && !isset($box['test'][$type])) {
    $r = Router::requestRoute();
 /*     if (!preg_match("/gridData/", $_SERVER['REQUEST_URI'])) { */
 /*       print("<PRE>Route:\n");print_r($r);print("\n</PRE>\n"); */
 /*     } */
    $box['test'][$type] = !empty($r[3]["${type}_route"]);
    if ($box['test'][$type])
      $box['type'] = $type;
  }
  return $box['type'] == $type;
 }
-function devbox() {
+function sandbox() { return _box('sand'); }
-  $r = Router::requestRoute();
+function devbox()  { return _box('dev'); }
  return !empty($r[3]['dev_route']);
 }
 function server_request_var($var) {
  if (preg_match("/^HTTP_ACCEPT|REMOTE_PORT/", $var))
--- a/site/config/database.php
+++ b/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';
 	}
 }
 ?>
--- a/site/config/routes.php
+++ b/site/config/routes.php
@@ -43,6 +43,16 @@ Router::connect('/sand',
 		array('sand_route' => true) + $default_path);
 Router::connect('/sand/:controller/:action/*',
 		array('sand_route' => true, 'action' => null));
 /* Unfortunately, for some reason we need an extra route to solve
 * a bug with form generation.  When $this->data is set by the
 * controller, and a URL is generated by the FormHelper, this
 * route is required to ensure the form action is correct.  An
 * example of a broken page is for /customers/edit/XX.  It appears
 * the page location uses the route above, it's only URL generation
 * that seems to be broken.
 */
 Router::connect('/sand/:controller/:action/:id/*',
 		array('sand_route' => true,'action' => null, 'id'=>null));
 /*
 * Route for developement functionality
@@ -51,5 +61,15 @@ Router::connect('/dev',
 		array('dev_route' => true) + $default_path);
 Router::connect('/dev/:controller/:action/*',
 		array('dev_route' => true, 'action' => null));
 /* Unfortunately, for some reason we need an extra route to solve
 * a bug with form generation.  When $this->data is set by the
 * controller, and a URL is generated by the FormHelper, this
 * route is required to ensure the form action is correct.  An
 * example of a broken page is for /customers/edit/XX.  It appears
 * the page location uses the route above, it's only URL generation
 * that seems to be broken.
 */
 Router::connect('/dev/:controller/:action/:id/*',
 		array('dev_route' => true,'action' => null, 'id'=>null));
 ?>
--- a/site/controllers/customers_controller.php
+++ b/site/controllers/customers_controller.php
@@ -2,6 +2,14 @@
 class CustomersController extends AppController {
  var $components = array('RequestHandler');
  // DEBUG FUNCTION ONLY!
  // Call without id to update ALL customers
  function force_update($id = null) {
    $this->Customer->update($id);
    $this->redirect(array('action'=>'index'));
  }
  /**************************************************************************
   **************************************************************************
@@ -305,6 +313,11 @@ class CustomersController extends AppController {
 			   array('action' => 'edit', $id), null,
 			   'ACTION');
    if ($this->admin())
      $this->addSideMenuLink('Merge',
 			     array('action' => 'merge', $id), null,
 			     'ACTION');
    // Prepare to render.
    $title = 'Customer: ' . $customer['Customer']['name'];
    $this->set(compact('customer', 'title',
@@ -439,6 +452,41 @@ class CustomersController extends AppController {
    $this->edit();
  }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
   * action: merge
   *  - Merges two customers
   */
  function merge($id = null) {
    if ($id) {
      $this->Customer->recursive = -1;
      $customer = $this->Customer->read(null, $id);
      $customer = $customer['Customer'];
      if (empty($customer))
 	$this->INTERNAL_ERROR("Customer $id does not exist");
      $this->set('dst_customer', $customer);
      $this->set('dst_name', $customer['name']);
      $this->set('dst_id', $id);
    }
    else {
      $this->INTERNAL_ERROR("Merge called with invalid customer");
    }
  }
  function mergeFinal() {
    if (!$this->RequestHandler->isPost()) {
      echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
      return;
    }
    $post = $this->params['form'];
    $this->Customer->merge($post['dst-id'], $post['src-id'],
 			   unserialize($post['contact-ids']));
    $this->redirect(array('action'=>'view', $post['dst-id']));
  }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
--- a/site/controllers/leases_controller.php
+++ b/site/controllers/leases_controller.php
@@ -176,16 +176,20 @@ class LeasesController extends AppController {
  function move_out($id = null) {
    if ($this->data) {
      // Handle the move out based on the data given
      //pr($this->data);
      $this->Lease->moveOut($this->data['Lease']['id'],
 			    'VACANT',
 			    $this->data['Lease']['moveout_date']
 			    );
-      $this->redirect(array('controller' => 'leases',
+      $lease = $this->Lease->find
 	('first', array
 	 ('contain' => array('Customer.id'),
 	  'conditions' => array(array('Lease.id' => $this->data['Lease']['id'])),
 	  ));
      $this->redirect(array('controller' => 'customers',
 			    'action' => 'view',
-			    $this->data['Lease']['id']));
+			    $lease['Customer']['id']));
    }
    if (isset($id)) {
@@ -440,6 +444,64 @@ class LeasesController extends AppController {
    $this->redirect(array('action'=>'index'));
  }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
   * action: overview
   *  - Displays lease up information
   */
  function overview($months = 12) {
    $overview = array('months' => array());
    for ($month = 0; $month < $months; ++$month) {
    //for ($month = 12; $month >= 0; --$month) {
      $this_month = "(DATE(NOW() - INTERVAL $month MONTH - INTERVAL DAY(NOW())-1 DAY))";
      $next_month = "($this_month + INTERVAL 1 MONTH)";
      $row = $this->Lease->find
 	('first', array('link' => array(),
 			'fields' => array("MONTHNAME($this_month) AS month",
 					  "YEAR($this_month) AS year"),
 			));
      $mname = $row[0]['month'] .', '. $row[0]['year'];
      $overview['months'][$mname] = array('name' => $mname);
      foreach(array('start'  => array('before' => $this_month, 'after' => $this_month),
 		    'finish' => array('before' => $next_month, 'after' => $next_month),
 		    'peak'   => array('before' => $next_month, 'after' => $this_month))
 	      AS $type => $parm) {
 	$count = $this->Lease->find
 	  ('count', 
 	   array('link' => array(),
 		 'conditions' => array("movein_date < {$parm['before']}",
 				       "(moveout_date IS NULL OR moveout_date >= {$parm['after']})",
 				       ),
 		 ));
 	$overview['months'][$mname][$type] = $count;
      }
      foreach(array('movein', 'moveout') AS $mvinout) {
 	$count = $this->Lease->find
 	  ('count', 
 	   array('link' => array(),
 		 'conditions' => array("{$mvinout}_date < $next_month",
 				       "{$mvinout}_date >= $this_month")
 		 ));
 	$overview['months'][$mname][$mvinout] = $count;
      }
    }
    // Enable the Reports menu section
    $this->sideMenuAreaActivate('REPORT');
    // Prepare to render.
    $this->set('title', 'Lease Up Report');
    $this->set(compact('overview'));
  }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
--- a/site/controllers/statement_entries_controller.php
+++ b/site/controllers/statement_entries_controller.php
@@ -11,6 +11,7 @@ class StatementEntriesController extends AppController {
   */
  function index()   { $this->gridView('All Statement Entries'); }
  function unpaid()  { $this->gridView('Unpaid Charges', 'unreconciled'); }
  /**************************************************************************
@@ -123,18 +124,6 @@ class StatementEntriesController extends AppController {
 			    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;
  }
@@ -158,33 +147,48 @@ class StatementEntriesController extends AppController {
    // defaults into the sort mechanism.  If we're already
    // sorting by one of them, it will only be redundant,
    // and should cause no harm (possible a longer query?)
-    $order[] = 'Transaction.stamp ' . $direction;
+    if ($index != 'Transaction.stamp' &&
-    $order[] = 'StatementEntry.effective_date ' . $direction;
+	$index != 'StatementEntry.effective_date') {
      $order[] = 'Transaction.stamp ' . $direction;
      $order[] = 'StatementEntry.effective_date ' . $direction;
    }
    $order[] = 'StatementEntry.id ' . $direction;
    return $order;
  }
  function gridDataCountExecute(&$params, &$model, $query) {
    if ($params['action'] === 'unreconciled') {
      // REVISIT <AP> 20100413:
      //   This is a lame solution, as it runs the same queries twice
      //   (and causes code duplication).  However, I'm not in the mood
      //   to flush out an actual "count" solution at the moment, and I
      //   also don't want to cache the results in $params (although
      //   that is probably the most sensible solution).  So, I'll just
      //   calculate the reconciled set both times and live with the
      //   performance and maintenance penalty
      $lquery = array('conditions' => $query['conditions']);
      $set = $this->StatementEntry->reconciledSet('CHARGE', $lquery, true);
      return count($set['entries']);
    }
    return parent::gridDataCountExecute($params, $model, $query);
  }
  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'", */
-/* 				"StatementEntry.amount - (" . */
+    if ($params['action'] === 'unreconciled') {
-/* 				"IF(StatementEntry.type = 'CHARGE'," . */
+      $lquery = array('conditions' => $query['conditions']);
-/* 				"   SUM(COALESCE(DisbursementEntry.amount,0))," . */
+      $set = $this->StatementEntry->reconciledSet('CHARGE', $lquery, true);
-/* 				"   SUM(COALESCE(ChargeEntry.amount,0)))" . */
+
-/* 				") AS 'balance'", */
+      $entries = array();
-/* 				); */
+      foreach ($set['entries'] AS $entry)
    	$entries[] = $entry['StatementEntry']['id'];
      $query['conditions'] = array('StatementEntry.id' => $entries);
      $params['userdata']['balance'] = $set['summary']['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') {
      $tquery = array_diff_key($query, array('fields'=>1,'group'=>1,'limit'=>1,'order'=>1));
      $tquery['fields'] = array("SUM(COALESCE(StatementEntry.amount,0)) AS 'total'");
@@ -253,6 +257,98 @@ class StatementEntriesController extends AppController {
  }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
   * action: incexpbymonth
   *  - Displays income and/or expenses by month
   */
  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' => $accts,
 				   "effective_date >= $datefrom",
 				   "effective_date <= $dateto",
 				   ),
 	     'group' => array('YEAR(effective_date)', 'MONTH(effective_date)', 'Account.id'),
 	     'order' => array('YEAR(effective_date) DESC', 'MONTH(effective_date) DESC', 'Account.type',
 			      'IF(Account.id = '.$this->StatementEntry->Account->rentAccountID().', "---", Account.name)'),
 	     ));
    if ($security_deposits) {
      $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(),
 					   'amount' => 0);
      $month = &$overview['months'][$mname];
      $month['subs'][] = array('name' => $row['Account']['name'],
 			       'amount' => $row[0]['balance']);
      $month['amount'] += $row[0]['balance'];
      $overview['amount'] += $row[0]['balance'];
    }
    // Enable the Reports menu section
    $this->sideMenuAreaActivate('REPORT');
    // Prepare to render.
    $this->set('months', $months);
    $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);
  }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
--- a/site/controllers/transactions_controller.php
+++ b/site/controllers/transactions_controller.php
@@ -54,6 +54,12 @@ class TransactionsController extends AppController {
    $this->gridView('Deposits');
  }
  function gridView($title, $action = null, $element = null) {
    if ($title != 'Deposits')
      $this->set('include', array('Customer'));
    parent::gridView($title, $action, $element);
  }
  /**************************************************************************
   **************************************************************************
@@ -77,6 +83,7 @@ class TransactionsController extends AppController {
    $link = $this->gridDataCountTables($params, $model);
    $link['link']['StatementEntry'] = array('fields' => array());
    $link['link']['DepositTender'] = array('fields' => array());
    $link['link']['Customer'] = array('fields' => array('id', 'name'));
    return $link;
  }
@@ -101,6 +108,7 @@ class TransactionsController extends AppController {
  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
    $links['Transaction'] = array('id', 'action' => ($params['action'] == 'deposit'
 						     ? 'deposit_slip' : 'view'));
    $links['Customer'] = array('name');
    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
  }
@@ -460,7 +468,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
@@ -495,8 +503,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,
--- a/site/controllers/unit_sizes_controller.php
+++ b/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;
  }
@@ -148,6 +148,23 @@ class UnitSizesController extends AppController {
    return $conditions;
  }
  function gridDataOrder(&$params, &$model, $index, $direction) {
    if ($index == 'UnitType.name')
      $index = 'UnitType.code';
    $order = parent::gridDataOrder($params, $model, $index, $direction);
    // After sorting by whatever the user wants, add these
    // defaults into the sort mechanism.  If we're already
    // sorting by one of them, it will only be redundant,
    // and should cause no harm (possible a longer query?)
    $order[] = 'UnitType.code ' . $direction;
    $order[] = 'sqft ' . $direction;
    $order[] = 'UnitSize.rent ' . $direction;
    return $order;
  }
  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
    $links['UnitSize'] = array('name');
    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
--- a/site/controllers/units_controller.php
+++ b/site/controllers/units_controller.php
@@ -225,6 +225,69 @@ class UnitsController extends AppController {
  function unlock($id)  { $this->status($id, 'OCCUPIED'); }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
   * action: overview
   *  - Displays overview information for all units
   */
  function overview() {
    $result = $this->Unit->find
      ('all',
       array('link' => array('UnitSize' => array('fields' => array(), 'UnitType' => array('fields' => array('name')))),
 	     'fields' => array('status', 'COUNT(Unit.id) AS cnt', 'SUM(Unit.rent) AS rents'),
 	     //'conditions' => array('
 	     'group' => array('UnitType.id', 'Unit.status'),
 	     'order' => array('UnitType.name', 'Unit.status')
 	     ));
    $overview = array('types' => array(), 'count' => 0, 'rents' => 0);
    foreach ($result AS $row) {
      $utname = $row['UnitType']['name'];
      if (empty($overview['types'][$utname]))
 	$overview['types'][$utname] = array('name' => $utname,
 					    'subs' => array(),
 					    'count' => 0,
 					    'rents' => 0,
 					    'phys_pct' => 0,
 					    'econ_pct' => 0);
      $type = &$overview['types'][$utname];
      $type['subs'][] = array('name' => $row['Unit']['status'],
 			      'count' => $row[0]['cnt'],
 			      'rents' => $row[0]['rents'],
 			      'phys_subpct' => 0,
 			      'phys_totpct' => 0,
 			      'econ_subpct' => 0,
 			      'econ_totpct' => 0);
      $type['count'] += $row[0]['cnt'];
      $type['rents'] += $row[0]['rents'];
      $overview['count'] += $row[0]['cnt'];
      $overview['rents'] += $row[0]['rents'];
    }
    foreach ($overview['types'] AS &$type) {
      foreach ($type['subs'] AS &$sub) {
 	$sub['phys_subpct'] = $sub['count'] / $type['count'];
 	$sub['econ_subpct'] = $sub['rents'] / $type['rents'];
 	$sub['phys_totpct'] = $sub['count'] / $overview['count'];
 	$sub['econ_totpct'] = $sub['rents'] / $overview['rents'];
      }
      $type['phys_pct'] = $type['count'] / $overview['count'];
      $type['econ_pct'] = $type['rents'] / $overview['rents'];
    }
    // Enable the Reports menu section
    $this->sideMenuAreaActivate('REPORT');
    // Prepare to render.
    $this->set('title', 'Unit Overview');
    $this->set(compact('overview'));
  }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
--- a/site/controllers/util_controller.php
+++ b/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);
  }
--- a/site/models/contact.php
+++ b/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)) {
--- a/site/models/customer.php
+++ b/site/models/customer.php
@@ -20,15 +20,25 @@ class Customer extends AppModel {
 		),
 		'Lease',
 		'StatementEntry',
-		'ContactsCustomer',
+		'ContactsCustomer' => array(
 			// It would be nice to claim a dependency here, which would
 			// simplify deletion of a customer.  However, for this to work
 			// Cake must have a primaryKey as a single field.  This table
 		        // makes use of a complex key, so we're out of luck.
 			/* 'dependent' => true, */
 		),
 		'Transaction',
 		'Tender',
 	);
 	var $hasAndBelongsToMany = array(
-		'Contact',
+		'Contact' => array(
 			'unique' => true,
 		),
 	);
 	//var $default_log_level = 20;
  /**************************************************************************
   **************************************************************************
@@ -192,6 +202,13 @@ class Customer extends AppModel {
    }
    $id = $this->id;
    // Appears that $this->save() "helpfully" choses to add in
    // any missing data fields, populated with default values.
    // So, after saving is complete, the fields 'lease_count',
    // 'past_lease_count', and 'current_lease_count' have all
    // been reset to zero.  Gee, thanks Cake...
    $this->update($id);
    // Remove all associated Customer Contacts, as it ensures
    // any entries deleted by the user actually get deleted
    // in the system.  We'll recreate the needed ones anyway.
@@ -272,6 +289,116 @@ class Customer extends AppModel {
  }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
   * function: merge
   *  - Merges two customers into one
   */
  function merge($dst_id, $src_id, $contacts) {
    $this->prEnter(compact('dst_id', 'src_id', 'contacts'));
    // Get the entire list of destination customer contacts
    $dst_contacts = array();
    $result = $this->find('all',
 			  array('link' => array('ContactsCustomer'),
 			  	'fields' => array('ContactsCustomer.contact_id', 'ContactsCustomer.type'),
 				'conditions' => array(array('id' => $dst_id,
 							    'ContactsCustomer.active' => true))));
    foreach ($result AS $contact) {
      $dst_contacts[$contact['ContactsCustomer']['contact_id']] = $contact['ContactsCustomer'];
    }
    $this->pr(17, compact('dst_contacts'));
    // Get the entire list of source customer contacts
    $src_contacts = array();
    $result = $this->find('all',
 			  array('link' => array('ContactsCustomer'),
 			  	'fields' => array('ContactsCustomer.contact_id', 'ContactsCustomer.type'),
 				'conditions' => array(array('id' => $src_id,
 							    'ContactsCustomer.active' => true))));
    foreach ($result AS $contact) {
      $src_contacts[$contact['ContactsCustomer']['contact_id']] = $contact['ContactsCustomer'];
    }
    $this->pr(17, compact('src_contacts'));
    // Verify the contacts list are all valid source customer contacts
    foreach ($contacts AS $contact_id) {
      if (!array_key_exists($contact_id, $src_contacts))
 	return $this->prReturn(false);
    }
    // Remove any contacts which are already destination customer 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 ($new_contacts AS $contact_id) {
      $CM = new ContactsCustomer();
      if (!$CM->save(array('customer_id' => $dst_id)
 		     + $src_contacts[$contact_id], false)) {
 	$ret = false;
      }
    }
    $this->Lease->updateAll
      (array('Lease.customer_id' => $dst_id),
       array('Lease.customer_id' => $src_id)
       );
    $this->Tender->updateAll
      (array('Tender.customer_id' => $dst_id),
       array('Tender.customer_id' => $src_id)
       );
    $this->StatementEntry->updateAll
      (array('StatementEntry.customer_id' => $dst_id),
       array('StatementEntry.customer_id' => $src_id)
       );
    $this->Transaction->updateAll
      (array('Transaction.customer_id' => $dst_id),
       array('Transaction.customer_id' => $src_id)
       );
    // Make sure our lease counts, etc are correct
    $this->update($dst_id);
    // Delete the old customer
    $this->pr(12, compact('src_id'), "Delete Customer");
    $this->delete($src_id);
    // Delete all the orphaned customers
    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.
      //   On the one hand, they're probably really redundant,
      //   and only clutter up the list of all contacts.  On the
      //   other hand, it destroys data, not only losing the
      //   history, but making it difficult to recover if the
      //   merge is a mistake.  Additionally, we need to do
      //   extra checking to ensure that the contact is not
      //   in use by some other customer.
      //   We need some sort of Contact.deleted field...
      $this->pr(12, compact('contact_id'), "Delete Contact");
      $this->Contact->delete($contact_id);
    }
    // Finally, delete all customer contact relationships
    $this->ContactsCustomer->deleteAll
      (array('customer_id' => $src_id), false);
    // Return the result
    return $this->prReturn($ret);
  }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
--- a/site/models/lease.php
+++ b/site/models/lease.php
@@ -148,9 +148,11 @@ class Lease extends AppModel {
 		   array('class' => 'StatementEntry',
 			 'fields' => array(),
 			 'conditions' => array
-			 ('SEx.effective_date = DATE_ADD(StatementEntry.through_date, INTERVAL 1 day)',
+			 ('SEx.lease_id = StatementEntry.lease_id',
-			  'SEx.lease_id = StatementEntry.lease_id',
+			  'SEx.type' => 'CHARGE',
 			  'SEx.account_id' => $rent_account_id,
 			  'SEx.reverse_transaction_id IS NULL',
 			  'SEx.effective_date = DATE_ADD(StatementEntry.through_date, INTERVAL 1 day)',
 			  ),
 			 ),
 		   ),
@@ -345,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);
@@ -542,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') {
--- a/site/models/statement_entry.php
+++ b/site/models/statement_entry.php
@@ -294,7 +294,7 @@ class StatementEntry extends AppModel {
    }
    return $this->prReturn(array('entries' => $resultset,
-			       'summary' => $this->stats(null, $query)));
+				 'summary' => $this->stats(null, $query)));
  }
@@ -338,6 +338,72 @@ class StatementEntry extends AppModel {
  }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
   * function: outstandingDebits
   *  - Determines all debit types that have not yet been resolved.
   *    The name is a bit dumb, but it means any statement entry type
   *    that a positive customer balance could be used to offset. In
   *    other words, entries that are still in need of matching
   *    disbursements.  Most notably, this means charges but could
   *    also mean things like refunds as well.
   */
  function outstandingDebits($query = null, $customer_id = null,
 			     $lease_id = null, $debit_types = null)
  {
    $this->prEnter(compact('query', 'lease_id',
 			   'customer_id', 'charge_ids',
 			   'debit_types'));
    $this->queryInit($query);
    if (empty($debit_types))
      $debit_types = $this->debitTypes();
    if (!empty($customer_id))
      $query['conditions'][] = array('StatementEntry.customer_id' => $customer_id);
    if (!empty($lease_id))
      $query['conditions'][] = array('StatementEntry.lease_id' => $lease_id);
    /* if (isset($charge_ids)) { */
    /*   // REVISIT <AP> 20100330: */
    /*   // Not using $query here, as this code was extracted from its */
    /*   // original location in assignCredits, and so I'm keeping the */
    /*   // logic consistent.  It does seem, however, that we shouldn't */
    /*   // be ignoring $query if passed in.  I'm sure this won't be */
    /*   // looked at until someone _does_ pass $query in (and it break), */
    /*   // so hopefully at that time, we can understand what needs to */
    /*   // happen in that case (requirements are not clear at present). */
    /*   $lquery = array('contain' => false, */
    /* 		      'conditions' => array('StatementEntry.id' => $charge_ids)); */
    /* } else { */
    /*   $lquery = $query; */
    /*   // If we're working with a specific lease, then limit charges to it */
    /*   if (!empty($lease_id)) */
    /* 	$lquery['conditions'][] = array('StatementEntry.lease_id' => $lease_id); */
    /* } */
    if (empty($query['order']))
      $query['order'] = 'StatementEntry.effective_date ASC';
    $debits = array();
    foreach ($debit_types AS $dtype) {
      $rset = $this->reconciledSet($dtype, $query, true);
      $entries = $rset['entries'];
      $debits = array_merge($debits, $entries);
      $this->pr(18, compact('dtype', 'entries'), "Outstanding Debit Entries");
    }
    return $this->prReturn($debits);
  }
  function outstandingCharges($query = null, $customer_id = null, $lease_id = null) {
    return $this->outstandingDebits($query, $customer_id, $lease_id, array('CHARGE'));
  }
  /**************************************************************************
   **************************************************************************
   **************************************************************************
@@ -359,9 +425,6 @@ class StatementEntry extends AppModel {
 			   'customer_id', 'lease_id'));
    $this->queryInit($query);
    if (!empty($customer_id))
      $query['conditions'][] = array('StatementEntry.customer_id' => $customer_id);
    if (empty($disbursement_type))
      $disbursement_type = 'DISBURSEMENT';
@@ -375,6 +438,9 @@ class StatementEntry extends AppModel {
 	$this->INTERNAL_ERROR("Charge IDs, yet no corresponding receipt");
      $lquery = $query;
      if (!empty($customer_id))
 	$lquery['conditions'][] = array('StatementEntry.customer_id' => $customer_id);
      $lquery['conditions'][] = array('StatementEntry.type' => 'SURPLUS');
      // REVISIT <AP>: 20090804
      //  We need to ensure that we're using surplus credits ONLY from either
@@ -423,23 +489,16 @@ class StatementEntry extends AppModel {
 		"Receipt Credit Added");
    }
-    // Now find all unpaid charges
+    // Now find all unpaid charges, using either the specific set
-    if (isset($charge_ids)) {
+    // of charges given, or all outstanding charges based on the
-      $lquery = array('contain' => false,
+    // query, customer and/or lease
-		      'conditions' => array('StatementEntry.id' => $charge_ids));
+    if (!empty($charge_ids)) {
-    } else {
+      $this->INTERNAL_ERROR("PERHAPS IMPLEMENTED - THOUGH NEVER TESTED");
      $lquery = $query;
-      // If we're working with a specific lease, then limit charges to it
+      $lquery['conditions'][] = array('StatementEntry.id' => $charge_ids);
-      if (!empty($lease_id))
+      $charges = $this->reconciledSet('CHARGE', $query, true);
-	$lquery['conditions'][] = array('StatementEntry.lease_id' => $lease_id);
+    } else {
-    }
+      $charges = $this->outstandingDebits($query, $customer_id, $lease_id);
    $lquery['order'] = 'StatementEntry.effective_date ASC';
    $charges = array();
    foreach ($this->debitTypes() AS $dtype) {
      $rset = $this->reconciledSet($dtype, $lquery, true);
      $entries = $rset['entries'];
      $charges = array_merge($charges, $entries);
      $this->pr(18, compact('dtype', 'entries'), "Outstanding Debit Entries");
    }
    // Work through all unpaid charges, applying disbursements as we go
@@ -483,14 +542,14 @@ class StatementEntry extends AppModel {
 	// Set the disbursement amount to the maximum amount
 	// possible without exceeding the charge or credit balance
-	$disbursement_amount = min($charge['balance'], $credit['balance']);
+	$disbursement_amount = round(min($charge['balance'], $credit['balance']), 2);
 	if (!isset($credit['applied']))
 	  $credit['applied'] = 0;
-	$credit['applied'] += $disbursement_amount;
+	$credit['applied'] = round($credit['applied'] + $disbursement_amount, 2);
-	$credit['balance'] -= $disbursement_amount;
+	$credit['balance'] = round($credit['balance'] - $disbursement_amount, 2);
-	$this->pr(20, compact('credit'),
+	$this->pr(20, compact('credit', 'disbursement_amount'),
 		  ($credit['balance'] > 0 ? 'Utilized' : 'Exhausted') .
 		  (empty($credit['receipt']) ? ' Credit' : ' Receipt'));
@@ -555,12 +614,12 @@ class StatementEntry extends AppModel {
 	}
 	// Adjust the charge balance to reflect the new disbursement
-	$charge['balance'] -= $disbursement_amount;
+	$charge['balance'] = round($charge['balance'] - $disbursement_amount, 2);
 	$this->pr(20, compact('charge', 'disbursement_amount'),
 		  ($charge['balance'] > 0 ? 'Unfinished' : 'Fully Paid') . ' Charge');
 	if ($charge['balance'] < 0)
 	  die("HOW DID WE GET A NEGATIVE CHARGE AMOUNT?");
 	if ($charge['balance'] <= 0)
 	  $this->pr(20, 'Fully Paid Charge');
      }
      // Break the $credit reference to avoid future problems
      unset($credit);
--- a/site/plugins/debug_kit/controllers/components/toolbar.php
+++ b/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);
--- a/site/plugins/debug_kit/views/elements/timer_panel.ctp
+++ b/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;
--- a/site/valley_storage.pmgr.htpasswd
+++ b/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
--- a/site/views/accounts/view.ctp
+++ b/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,
 		      )));
--- a/site/views/contacts/edit.ctp
+++ b/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."),
 	 );
    }
--- a/site/views/customers/edit.ctp
+++ b/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',
--- a/site/views/customers/merge.ctp
+++ b/site/views/customers/merge.ctp
@@ -0,0 +1,176 @@
 <?php /* -*- mode:PHP -*- */ ?>
 <div class="customer merge">
 <?php
 ; // Editor alignment
 /**********************************************************************
 **********************************************************************
 **********************************************************************
 **********************************************************************
 * Javascript
 */
 // Warnings _really_ screw up javascript
 $saved_debug_state = Configure::read('debug');
 Configure::write('debug', '0');
 ?>
 <script type="text/javascript"><!--
 // pre-submit callback 
 function verifyRequest() { 
  if (!$("#src-customer-id").val()) {
    alert("Must select source customer");
    return false;
  }
  rows = $('#<?php echo "contacts-jqGrid"; ?>').getGridParam('selarrrow');
  $('#<?php echo "contact-ids"; ?>').val(serialize(rows));
  // return false to prevent the form from being submitted; 
  // anything other than false will allow submission.
  return true;
 }
 function updateContacts() {
  $('#contacts-jqGrid').clearGridData();
  var filter = new Array();
  filter['ContactsCustomer.customer_id'] = $("#src-customer-id").val();
  var dynamic_post = new Array();
  dynamic_post['filter'] = filter;
  $('#contacts-jqGrid').setPostDataItem('dynamic_post_replace', serialize(dynamic_post));
  $('#contacts-jqGrid')
    .setGridParam({ page: 1 })
    .trigger("reloadGrid");
 }
 function onRowSelect(grid_id, customer_id) {
  //$('#output-debug').append("select: "+grid_id+"; "+customer_id+"<BR>\n");
  // Set the item id that will be returned with the form
  $("#src-customer-id").val(customer_id);
  // Get the item name from the grid
  $("#src-customer-name").html($(grid_id).getCell(customer_id, "Customer-name"));
  updateContacts();
  $("#customers-list .HeaderButton").click();
 }
 function onGridState(grid_id, state) {
  //$('#output-debug').append("state: "+grid_id+"; "+state+"<BR>\n");
  if (state == 'visible') {
    $(".customer-selection-invalid").hide();
    $(".customer-selection-valid").hide();
  }
  else {
    if ($("#src-customer-id").val() > 0) {
      $(".customer-selection-invalid").hide();
      $(".customer-selection-valid").show();
    } else {
      $(".customer-selection-invalid").show();
      $(".customer-selection-valid").hide();
    }
  }
 }
 --></script>
 <?php
 ; // align
 // Re-Enable warnings
 Configure::write('debug', $saved_debug_state);
 echo $form->create(null, array('id' => 'customer-merge-form',
 			       'onsubmit' => 'return verifyRequest();',
 			       'url' => array('controller' => 'customers',
 					      'action' => 'mergeFinal')))."\n";
 echo '<input type="hidden" id="src-customer-id" name="src-id" value="0" />'."\n";
 echo '<input type="hidden" id="dst-customer-id" name="dst-id" value="'.$dst_id.'" />'."\n";
 echo $this->element('customers', array
 		    ('config' => array
 		     ('grid_div_id' => 'customers-list',
 		      'grid_div_class' => 'text-below',
 		      'caption' => ('<A HREF="#" ONCLICK="$(\'#customers-list .HeaderButton\').click();'.
 				    ' return false;">Select Customer</A>'),
 		      'grid_events' => array('onSelectRow' =>
 					     array('ids' =>
 						   'if (ids != null){onRowSelect("#"+$(this).attr("id"), ids);}'),
 					     'onHeaderClick' =>
 					     array('gridstate' =>
 						   'onGridState("#"+$(this).attr("id"), gridstate)'),
 					     ),
 		      'filter' => array('Customer.id !=' => $dst_id),
 		      //'nolinks' => true,
 		      'limit' => 10,
 		      )));
 echo ('<DIV CLASS="customer-merge grid-selection-text">' .
      '<DIV CLASS="customer-selection-valid" style="display:none">' .
      'Destination Customer: <SPAN id="src-customer-name"></SPAN>' .
      '</DIV>' .
      '<DIV CLASS="customer-selection-invalid" style="display:none">' .
      'Please select customer to merge into' .
      '</DIV>' .
      '</DIV>' . "\n");
 echo $this->element('contacts', array
 		    (// Grid configuration
 		     'config' => array
 		     (
 		      'grid_div_id' => 'contacts',
 		      'grid_setup' => array('multiselect' => true),
 		      'caption' => 'Source contacts to keep',
 		      'filter'  => array('ContactsCustomer.customer_id' => 0),
 		      'include' => array('Relationship', 'License', 'Comment'),
 		      ),
 		     ));
 // Add a hidden item to hold the jqGrid selection,
 // which we'll populate prior to form submission.
 echo "\n";
 echo '<input type="hidden" id="contact-ids" name="contact-ids" value="" />'."\n";
 ?>
 <H3>WARNING!</H3>
 The above selected customer is about to be deleted, and all related data (leases, transactions, etc) will be merged into customer #<?php echo $dst_id ?>: <?php echo $dst_name ?>.  This process is NOT reversible, so please ensure the selections are correct before proceeding.<BR>
 <?php
 echo $form->end('Merge Customers') . "\n";
 ?>
 <div id="output-debug" style="display:none"></div>
 <?php
 // Warnings _really_ screw up javascript
 Configure::write('debug', '0');
 ?>
 <script type="text/javascript"><!--
  $(document).ready(function(){
      $("#src-customer-id").val(0);
      $("#src-customer-name").html("INTERNAL ERROR");
      //onGridState(null, 'visible');
      <?php if ($this->params['dev']): ?>
      $('#output-debug').show();
      <?php endif; ?>
  });
 --></script>
 </div>
--- a/site/views/customers/receipt.ctp
+++ b/site/views/customers/receipt.ctp
@@ -130,11 +130,11 @@ function updateCharges(id) {
  $("#receipt-balance").html("Calculating...");
  $("#receipt-charges-caption").html("Please Wait...");
-  var custom = new Array();
+  var filter = new Array();
-  custom['customer_id'] = id;
+  filter['StatementEntry.customer_id'] = id;
  var dynamic_post = new Array();
-  dynamic_post['custom'] = custom;
+  dynamic_post['filter'] = filter;
  $('#charge-entries-jqGrid').setPostDataItem('dynamic_post_replace', serialize(dynamic_post));
  $('#charge-entries-jqGrid')
@@ -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();
@@ -333,7 +336,7 @@ echo $this->element('statement_entries', array
 		      'action' => 'unreconciled',
 		      'exclude' => array('Customer', 'Type', 'Debit', 'Credit'),
 		      'include' => array('Applied', 'Balance'),
-		      'remap' => array('Applied' => 'Paid'),
+		      'remap' => array('Received' => 'Paid'),
 		      'limit' => 8,
 		      ),
 		     ));
--- a/site/views/customers/view.ctp
+++ b/site/views/customers/view.ctp
@@ -53,18 +53,79 @@ echo '<div CLASS="detail supporting">' . "\n";
 /**********************************************************************
- * Contacts
+ * Unpaid Charges
 */
-echo $this->element('contacts', array
+echo $this->element('statement_entries', array
 		    (// Grid configuration
 		     'config' => array
-		     ('caption' => 'Customer Contacts',
+		     ('caption' => 'Outstanding Charges',
-		      'filter' => array('Customer.id' => $customer['Customer']['id']),
+		      'limit'   => 10,
-		      'include' => array('Relationship'),
+		      'action'  => 'unreconciled',
 		      'filter'  => array('StatementEntry.customer_id' => $customer['Customer']['id']),
 		      'exclude' => array('Customer'),
 		      )));
 /**********************************************************************
 * Customer Credits
 */
 echo $this->element('statement_entries', array
 		    (// Grid configuration
 		     'config' => array
 		     ('caption' => 'Oustanding Credits',
 		      'grid_div_id' => 'surplus',
 		      'limit'   => 10,
 		      'filter' => array('Customer.id' => $customer['Customer']['id'],
 					'StatementEntry.type' => 'SURPLUS'),
 		      'exclude' => array('Entry', 'Effective', 'Customer', 'Unit', 'Account', 'Debit', 'Credit'),
 		      'include' => array('Transaction', 'Amount'),
 		      'remap'   => array('Transaction' => 'Receipt'),
 		      )));
 /**********************************************************************
 * Receipt History
 */
 echo $this->element('ledger_entries', array
 		    (// Grid configuration
 		     'config' => array
 		     ('caption' => 'Receipts',
 		      'limit'   => 5,
 		      'filter' => array('Customer.id' => $customer['Customer']['id'],
 					'Transaction.type' => 'RECEIPT',
 					'Tender.id !=' => null,
 					//'Account.id !=' => '-AR-'
 					),
 		      'include' => array('Transaction'),
 		      'exclude' => array('Entry', 'Account', 'Cr/Dr'),
 		      'remap'   => array('Transaction' => 'Receipt'),
 		      )));
 /**********************************************************************
 * 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
 */
@@ -73,13 +134,28 @@ echo $this->element('leases', array
 		    (// Grid configuration
 		     'config' => array
 		     ('caption' => 'Lease History',
-		      'filter' => array('Customer.id' => $customer['Customer']['id']),
+		      'limit'   => 5,
 		      'filter'  => array('Customer.id' => $customer['Customer']['id']),
 		      'exclude' => array('Customer'),
 		      'sort_column' => 'Move-In',
 		      'sort_order'  => 'DESC',
 		      )));
 /**********************************************************************
 * Contacts
 */
 echo $this->element('contacts', array
 		    (// Grid configuration
 		     'config' => array
 		     ('caption' => 'Customer Contacts',
 		      'limit'   => 5,
 		      'filter'  => array('Customer.id' => $customer['Customer']['id']),
 		      'include' => array('Relationship'),
 		      )));
 /**********************************************************************
 * Customer Account History
 */
@@ -90,28 +166,11 @@ echo $this->element('statement_entries', array
 		     ('caption' => 'Customer Statement',
 		      'filter' => array('Customer.id' => $customer['Customer']['id'],
 					'type !=' => 'VOID'),
 		      //'include' => array('Sub-Total'),
 		      'exclude' => array('Customer'),
 		      )));
 /**********************************************************************
 * Receipt History
 */
 echo $this->element('ledger_entries', array
 		    (// Grid configuration
 		     'config' => array
 		     ('caption' => 'Receipts',
 		      'filter' => array('Customer.id' => $customer['Customer']['id'],
 					'Transaction.type' => 'RECEIPT',
 					'Tender.id !=' => null,
 					//'Account.id !=' => '-AR-'
 					),
 		      'include' => array('Transaction'),
 		      'exclude' => array('Entry', 'Account', 'Cr/Dr'),
 		      )));
 /* End "detail supporting" div */
 echo '</div>' . "\n";
--- a/site/views/elements/contacts.ctp
+++ b/site/views/elements/contacts.ctp
@@ -6,6 +6,7 @@ $cols['Relationship'] = array('index' => 'ContactsCustomer.type',   'formatter'
 $cols['Name']         = array('index' => 'Contact.display_name',    'formatter' => 'longname');
 $cols['Last Name']    = array('index' => 'Contact.last_name',       'formatter' => 'name');
 $cols['First Name']   = array('index' => 'Contact.first_name',      'formatter' => 'name');
 $cols['License']      = array('index' => 'Contact.id_local',        'formatter' => 'name');
 $cols['Company']      = array('index' => 'Contact.company_name',    'formatter' => 'longname');
 $cols['Comment']      = array('index' => 'Contact.comment',         'formatter' => 'comment');
@@ -16,4 +17,4 @@ $grid
 ->defaultFields(array('Last Name', 'First Name'))
 ->searchFields(array('Last Name', 'First Name', 'Company'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Relationship', 'Comment')));
+	 array_diff(array_keys($cols), array('Relationship', 'License', 'Comment')));
--- a/site/views/elements/customers.ctp
+++ b/site/views/elements/customers.ctp
@@ -6,7 +6,9 @@ $cols['Relationship']  = array('index' => 'ContactsCustomer.type',      'formatt
 $cols['Name']          = array('index' => 'Customer.name',              'formatter' => 'longname');
 $cols['Last Name']     = array('index' => 'PrimaryContact.last_name',   'formatter' => 'name');
 $cols['First Name']    = array('index' => 'PrimaryContact.first_name',  'formatter' => 'name');
-$cols['Leases']        = array('index' => 'current_lease_count',        'formatter' => 'number');
+$cols['Units']         = array('index' => 'current_lease_count',        'formatter' => 'number');
 $cols['Past Leases']   = array('index' => 'past_lease_count',           'formatter' => 'number');
 $cols['Leases']        = array('index' => 'lease_count',                'formatter' => 'number');
 $cols['Balance']       = array('index' => 'balance',                    'formatter' => 'currency');
 $cols['Comment']       = array('index' => 'Customer.comment',           'formatter' => 'comment');
@@ -17,4 +19,4 @@ $grid
 ->defaultFields(array('Name'))
 ->searchFields(array('Name', 'Last Name', 'First Name'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Relationship', 'Comment')));
+	 array_diff(array_keys($cols), array('Relationship', 'Past Leases', 'Comment')));
--- a/site/views/elements/jqGrid.ctp
+++ b/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);
--- a/site/views/elements/leases.ctp
+++ b/site/views/elements/leases.ctp
@@ -4,6 +4,7 @@
 $cols = array();
 $cols['Lease']     = array('index' => 'Lease.number',        'formatter' => 'id');
 $cols['Unit']      = array('index' => 'Unit.name',           'formatter' => 'shortname',  'align' => 'center');
 $cols['Customer id'] = array('index' => 'Customer.id',       'hidden' => true);
 $cols['Customer']  = array('index' => 'Customer.name',       'formatter' => 'longname');
 $cols['Rent']      = array('index' => 'Lease.rent',          'formatter' => 'currency');
 $cols['Deposit']   = array('index' => 'Lease.deposit',       'formatter' => 'currency');
--- a/site/views/elements/statement_entries.ctp
+++ b/site/views/elements/statement_entries.ctp
@@ -21,7 +21,7 @@ $cols['Debit']          = array('index' => 'charge',              'formatter' =>
 $cols['Credit']         = array('index' => 'disbursement',        'formatter' => 'currency');
 $cols['Amount']         = array('index' => "StatementEntry.amount", 'formatter' => 'currency');
-$cols['Applied']        = array('index' => "applied",             'formatter' => 'currency');
+$cols['Received']       = 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');
@@ -32,6 +32,22 @@ if (isset($subtotal_column))
  $cols['Sub-Total']['index'] =
    'subtotal-' . $cols[$subtotal_column]['index'];
 if ((isset($action) && $action == 'unreconciled') ||
    (isset($config) && isset($config['action']) && $config['action'] == 'unreconciled')) {
  if (isset($config) && !isset($config['grid_div_id']))
    $config['grid_div_id'] = 'unpaid';
  $include_columns = array('Entry', 'Date',
 			   'Effective', 'Customer', 'Unit',
 			   'Account', 'Amount', 'Received', 'Balance');
 }
 else {
  $include_columns =
    array_diff(array_keys($cols),
 	       array('Transaction', 'Through', 'Lease',
 		     'Amount', 'Received', 'Balance', 'Sub-Total',
 		     'Comment'));
 }
 // Include custom data
 $grid->customData(compact('statement_entry_id'));
@@ -41,8 +57,5 @@ $grid
 ->sortField('Date', 'DESC')
 ->defaultFields(array('Entry', 'Date', 'Charge', 'Payment'))
 ->searchFields(array('Customer', 'Unit'))
->render($this, isset($config) ? $config : null,
+->render($this, isset($config) ? $config : null, $include_columns);
 	 array_diff(array_keys($cols), array('Transaction', 'Through', 'Lease',
 					     'Amount', 'Applied', 'Balance', 'Sub-Total',
 					     'Comment')));
--- a/site/views/elements/transactions.ctp
+++ b/site/views/elements/transactions.ctp
@@ -1,13 +1,18 @@
 <?php /* -*- mode:PHP -*- */
 if (isset($include))
  $include = is_array($include) ? $include : array($include);
 else
  $include = array();
 // Define the table columns
 $cols = array();
 $cols['ID']        = array('index' => 'Transaction.id',            'formatter' => 'id');
 $cols['Type']      = array('index' => 'Transaction.type',          'formatter' => 'enum');
-//$cols['Customer']  = array('index' => 'Customer.name',             'formatter' => 'longname');
+$cols['Customer']  = array('index' => 'Customer.name',             'formatter' => 'longname');
 $cols['Timestamp'] = array('index' => 'Transaction.stamp',         'formatter' => 'date');
 $cols['Entries']   = array('index' => 'entries',                   'formatter' => 'number');
 $cols['Amount']    = array('index' => 'Transaction.amount',        'formatter' => 'currency');
 $cols['entries']   = array('index' => 'entries',                   'formatter' => 'number');
 $cols['Comment']   = array('index' => 'Transaction.comment',       'formatter' => 'comment');
 // Render the grid
@@ -17,4 +22,4 @@ $grid
 ->defaultFields(array('ID', 'Timestamp'))
 ->searchFields(array('Type', 'Comment'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Comment')));
+	 array_merge($include, array_diff(array_keys($cols), array('Customer', 'Comment'))));
--- a/site/views/elements/unit_sizes.ctp
+++ b/site/views/elements/unit_sizes.ctp
@@ -3,6 +3,7 @@
 // Define the table columns
 $cols = array();
 $cols['Size']         = array('index' => 'UnitSize.name',     'formatter' => 'shortname');
 $cols['Type']         = array('index' => 'UnitType.name',     'formatter' => 'shortname');
 $cols['Width']        = array('index' => 'UnitSize.width',    'formatter' => 'number');
 $cols['Depth']        = array('index' => 'UnitSize.depth',    'formatter' => 'number');
 $cols['Height']       = array('index' => 'UnitSize.height',   'formatter' => 'number');
@@ -10,8 +11,8 @@ $cols['Area']         = array('index' => 'sqft',              'formatter' => 'nu
 $cols['Volume']       = array('index' => 'cuft',              'formatter' => 'number');
 $cols['Deposit']      = array('index' => 'UnitSize.deposit',  'formatter' => 'currency');
 $cols['Rent']         = array('index' => 'UnitSize.rent',     'formatter' => 'currency');
-$cols['A. Cost']      = array('index' => 'sqcost',            'formatter' => 'currency');
+$cols['Per Foot']     = array('index' => 'sqcost',            'formatter' => 'currency');
-$cols['V. Cost']      = array('index' => 'cucost',            'formatter' => 'currency');
+$cols['Per Cubic Ft'] = array('index' => 'cucost',            'formatter' => 'currency');
 $cols['Unavailable']  = array('index' => 'unavailable',       'formatter' => 'number');
 $cols['Occupied']     = array('index' => 'occupied',          'formatter' => 'number');
 $cols['Available']    = array('index' => 'available',         'formatter' => 'number');
@@ -27,7 +28,13 @@ $grid
 ->defaultFields(array('Size', 'Area'))
 ->searchFields(array('Size', 'Width', 'Depth', 'Area', 'Deposit', 'Rent'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Height', 'Volume',
+	 array_diff(array_keys($cols), array('Width', 'Depth',
-					     'A. Cost', 'V. Cost',
+					     'Deposit',
-					     'Occupied', 'Total', 'Occupancy', 'Vacancy',
+					     'Height', 'Volume',
 					     //'Per Foot',
 					     'Per Cubic Ft',
 					     'Occupied',
 					     //'Total',
 					     'Occupancy',
 					     //'Vacancy',
 					     'Comment')));
--- a/site/views/helpers/format.php
+++ b/site/views/helpers/format.php
@@ -47,6 +47,13 @@ class FormatHelper extends AppHelper {
    return $currency;
  }
  function percent($amount, $precision = 2) {
    if (!isset($amount))
      return '-';
    return self::$number->toPercentage($amount*100, $precision);
  }
  function date($date, $age = false, $class = null, $time = false) {
    if (!$date) return null;
--- a/site/views/helpers/grid.php
+++ b/site/views/helpers/grid.php
@@ -215,6 +215,12 @@ class GridHelper extends AppHelper {
    }
    $this->jqGrid_options['controller'] = $controller;
    // Add in any custom variables requested
    if (isset($config['custom'])) {
      $this->customData($config['custom']);
      unset($config['custom']);
    }
    // Incorporate all other user options
    if (isset($config))
      $this->jqGrid_options = array_merge($this->jqGrid_options, $config);
--- a/site/views/layouts/default.ctp
+++ b/site/views/layouts/default.ctp
@@ -58,10 +58,6 @@
 			$protocol = 'http://';
 		echo $html->meta('icon') . "\n";
 		echo $html->css('cake.generic') . "\n";
 		echo $html->css('layout') . "\n";
 		echo $html->css('print', null, array('media' => 'print')) . "\n";
 		echo $html->css('sidemenu') . "\n";
 		$theme = 'smoothness';
 		$theme = 'base';
@@ -73,9 +69,13 @@
 		if (sandbox())
 			$theme = 'darkness';
 		echo $html->css('cake.generic') . "\n";
 		echo $html->css('themes/'.$theme.'/ui.all') . "\n";
 		echo $html->css('layout') . "\n";
 		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";
--- a/site/views/leases/invoice.ctp
+++ b/site/views/leases/invoice.ctp
@@ -111,13 +111,13 @@ function showResponse(responseText, statusText)  {
    if (!$("#repeat").attr("checked")) {
      window.location.href =
      <?php if (empty($movein)): ?>
-	"<?php echo $html->url(array('controller' => 'leases',
+	"<?php echo $html->url(array('controller' => 'customers',
 		                     'action'     => 'view')); ?>"
-	+ "/" + $("#lease-id").val();
+	+ "/" + $("#customer-id").val();
      <?php else: ?>
 	"<?php echo $html->url(array('controller' => 'customers',
 		                     'action'     => 'receipt')); ?>"
-	+ "/" + "<?php echo $customer['id']; ?>";
+	+ "/" + $("#customer-id").val();
      <?php endif; ?>
      return;
    }
@@ -144,6 +144,7 @@ function resetForm(nocharge) {
 function onRowSelect(grid_id, lease_id) {
  // Set the item id that will be returned with the form
  $("#lease-id").val(lease_id);
  $("#customer-id").val($(grid_id).getCell(lease_id, 'Customer-id'));
  $("#invoice-lease").html($(grid_id).getCell(lease_id, 'Lease-number'));
  $("#invoice-unit").html($(grid_id).getCell(lease_id, 'Unit-name'));
@@ -362,11 +363,10 @@ echo $form->input("Lease.id",
 			'type' => 'hidden',
 			'value' => 0));
-if (!empty($movein))
+echo $form->input("Customer.id",
-  echo $form->input("Customer.id",
+		  array('id' => 'customer-id',
-		    array('id' => 'customer-id',
+			'type' => 'hidden',
-			  'type' => 'hidden',
+			'value' => 0));
 			  'value' => $customer['id']));
 /* echo '<fieldset CLASS="invoice">' . "\n"; */
 /* echo ' <legend>Invoice</legend>' . "\n"; */
@@ -433,6 +433,8 @@ Configure::write('debug', '0');
      <?php if (isset($lease['id'])): ?>
      $("#lease-id").val(<?php echo $lease['id']; ?>);
      $("#customer-id").val(<?php echo $customer['id']; ?>);
      $("#invoice-lease").html("<?php echo '#'.$lease['number']; ?>");
      $("#invoice-unit").html("<?php echo $unit['name']; ?>");
      $("#invoice-customer").html("<?php echo $customer['name']; ?>");
@@ -450,6 +452,7 @@ Configure::write('debug', '0');
      <?php else: ?>
      $("#lease-id").val(0);
      $("#customer-id").val(<?php echo empty($movein) ? 0 : $customer['id']; ?>);
      $("#invoice-lease").html("INTERNAL ERROR");
      $("#invoice-unit").html("INTERNAL ERROR");
      $("#invoice-customer").html("INTERNAL ERROR");
--- a/site/views/leases/overview.ctp
+++ b/site/views/leases/overview.ctp
@@ -0,0 +1,74 @@
 <?php /* -*- mode:PHP -*- */
 echo '<div class="lease overview">' . "\n";
 /**********************************************************************
 **********************************************************************
 **********************************************************************
 **********************************************************************
 * Overview Main Section
 */
 /*
 $rows = array();
 $rows[] = array('',         FormatHelper::currency($overview['']));
 echo $this->element('table',
                    array('class'   => 'item lease detail',
                          'caption' => '',  
                          'rows'    => $rows,
                          'column_class' => array('field', 'value')));
 */
 /**********************************************************************
 **********************************************************************
 **********************************************************************
 **********************************************************************
 * Supporting Elements Section
 */
 echo '<div CLASS="detail supporting">' . "\n";
 $headers = array('', 'Count');
 $row_class = array();
 $rows = array();
 foreach ($overview['months'] AS $month) {
    $row_class[] = 'subheader';
    $rows[] = array($month['name']);
    $odd = 1;
    $row_class[] = array('subitem', $odd ? 'oddrow' : 'evenrow');
    $rows[] = array('Beginning of Month', $month['start']); $odd = !$odd;
    $row_class[] = array('subitem', $odd ? 'oddrow' : 'evenrow');
    $rows[] = array('+ Move-Ins', $month['movein']); $odd = !$odd;
    $row_class[] = array('subitem', $odd ? 'oddrow' : 'evenrow');
    $rows[] = array('- Move-Outs', $month['moveout']); $odd = !$odd;
    $row_class[] = 'grand';
    $rows[] = array('End of ' . $month['name'], $month['finish']);
 }
 echo $this->element('table',
                    array('class'   => 'item lease-overview overview list',
                          'caption' => 'Leased Units By Month',
                          'headers' => $headers,
                          'rows'    => $rows,
                          'row_class' => $row_class,
                          'suppress_alternate_rows' => true
                          ));
 ?>
 <script type="text/javascript"><!--
 jQuery(document).ready(function(){ 
        jQuery('table.overview td.subheader').attr('colSpan', 2);
 });
 --></script>
 <?php
 /* End "detail supporting" div */
 echo '</div>' . "\n";
 /* End page div */
 echo '</div>' . "\n";
--- a/site/views/leases/view.ctp
+++ b/site/views/leases/view.ctp
@@ -78,6 +78,21 @@ echo '</div>' . "\n";
 echo '<div CLASS="detail supporting">' . "\n";
 /**********************************************************************
 * Unpaid Charges
 */
 echo $this->element('statement_entries', array
 		    (// Grid configuration
 		     'config' => array
 		     ('caption' => 'Outstanding Charges',
 		      'limit'   => 10,
 		      'action'  => 'unreconciled',
 		      'filter'  => array('StatementEntry.lease_id' => $lease['id']),
 		      'exclude' => array('Customer', 'Unit'),
 		      )));
 /**********************************************************************
 * Lease Account History
 */
@@ -86,30 +101,12 @@ echo $this->element('statement_entries', array
 		    (// Grid configuration
 		     'config' => array
 		     ('caption' => 'Lease Statement',
-		      'filter' => array('Lease.id' => $lease['id']),
+		      'filter'  => array('Lease.id' => $lease['id']),
 		      'include' => array('Through'),
 		      'exclude' => array('Customer', 'Lease', 'Unit'),
 		      )));
 /**********************************************************************
 * Receipt History
 */
 echo $this->element('ledger_entries', array
 		    (// Grid configuration
 		     'config' => array
 		     ('caption' => 'Customer Receipts',
 		      'filter' => array('Customer.id' => $customer['id'],
 					'Transaction.type' => 'RECEIPT',
 					'Tender.id !=' => null,
 					//'Account.id !=' => '-AR-'
 					),
 		      'include' => array('Transaction'),
 		      'exclude' => array('Entry', 'Account', 'Cr/Dr'),
 		      )));
 /* End "detail supporting" div */
 echo '</div>' . "\n";
--- a/site/views/statement_entries/chargesbymonth.ctp
+++ b/site/views/statement_entries/chargesbymonth.ctp
@@ -0,0 +1,69 @@
 <?php /* -*- mode:PHP -*- */
 echo '<div class="statement_entry overview">' . "\n";
 /**********************************************************************
 **********************************************************************
 **********************************************************************
 **********************************************************************
 * Overview Main Section
 */
 $rows = array();
 $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' => $reptype,
                          'rows'    => $rows,
                          'column_class' => array('field', 'value')));
 /**********************************************************************
 **********************************************************************
 **********************************************************************
 **********************************************************************
 * Supporting Elements Section
 */
 echo '<div CLASS="detail supporting">' . "\n";
 $headers = array('Account', 'Amount');
 $row_class = array();
 $rows = array();
 foreach ($overview['months'] AS $month) {
    $row_class[] = 'subheader';
    $rows[] = array($month['name']);
    $odd = 1;
    foreach ($month['subs'] AS $sub) {
        $row_class[] = array('subitem', $odd ? 'oddrow' : 'evenrow');
        $rows[] = array($sub['name'], FormatHelper::currency($sub['amount']));
        $odd = !$odd;
    }
    $row_class[] = 'grand';
    $rows[] = array('Total for '.$month['name'], FormatHelper::currency($month['amount']));
 }
 echo $this->element('table',
                    array('class'   => 'item statement_entry-overview overview list',
                          'caption' => 'Months',
                          'headers' => $headers,
                          'rows'    => $rows,
                          'row_class' => $row_class,
                          'suppress_alternate_rows' => true
                          ));
 ?>
 <script type="text/javascript"><!--
 jQuery(document).ready(function(){ 
        jQuery('table.overview td.subheader').attr('colSpan', 2);
 });
 --></script>
 <?php
 /* End "detail supporting" div */
 echo '</div>' . "\n";
 /* End page div */
 echo '</div>' . "\n";
--- a/site/views/transactions/deposit_slip.ctp
+++ b/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'));
--- a/site/views/transactions/view.ctp
+++ b/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 */
--- a/site/views/units/overview.ctp
+++ b/site/views/units/overview.ctp
@@ -0,0 +1,128 @@
 <?php /* -*- mode:PHP -*- */
 echo '<div class="unit overview">' . "\n";
 /**********************************************************************
 **********************************************************************
 **********************************************************************
 **********************************************************************
 * Overview Main Section
 */
 $rows = array();
 $rows[] = array('Total Units',           $overview['count']);
 $rows[] = array('Gross Scheduled Rent',  FormatHelper::currency($overview['rents']));
 echo $this->element('table',
                    array('class'   => 'item unit detail',
                          'caption' => 'Unit Overview',  
                          'rows'    => $rows,
                          'column_class' => array('field', 'value')));
 /**********************************************************************
 * Unit Overview Info Box
 echo '<div class="infobox">' . "\n";
 $rows = array();
 $rows[] = array('Security Deposit:',  FormatHelper::currency($outstandingDeposit));
 $rows[] = array('Balance:',           FormatHelper::currency($outstandingBalance));
 echo $this->element('table',
 		    array('class'   => 'summary',
 			  'rows'    => $rows,
 			  'column_class' => array('field', 'value'),
 			  'suppress_alternate_rows' => true,
 			  ));
 echo '</div>' . "\n";
 */
 /**********************************************************************
 **********************************************************************
 **********************************************************************
 **********************************************************************
 * Supporting Elements Section
 */
 echo '<div CLASS="detail supporting">' . "\n";
 /*
 foreach ($overview['types'] AS $type) {
    $headers = array('Status', 'Count', 'Rent',
                     'Physical', 'Economic', 'Physical (Facility)', 'Economic (Facility)');
    $row_class = array();
    $rows = array();
    foreach ($type['subs'] AS $sub) {
        $row_class[] = array();
        $rows[] = array($sub['name'], $sub['count'], FormatHelper::currency($sub['rents']),
                        FormatHelper::percent($sub['phys_subpct'], 1),
                        FormatHelper::percent($sub['econ_subpct'], 1),
                        FormatHelper::percent($sub['phys_totpct'], 1),
                        FormatHelper::percent($sub['econ_totpct'], 1));
    }
    $row_class[] = 'grand';
    $rows[] = array('Total '.$type['name'], $type['count'], FormatHelper::currency($type['rents']),
                    FormatHelper::percent(1, 1),
                    FormatHelper::percent(1, 1),
                    FormatHelper::percent($type['phys_pct'], 1),
                    FormatHelper::percent($type['econ_pct'], 1));
    echo $this->element('table',
                        array('class'   => 'item unit-overview overview list',
                              'caption' => $type['name'],
                              'headers' => $headers,
                              'rows'    => $rows,
                              'row_class' => $row_class
                              ));
 }
 */
 $headers = array('Status', 'Count', 'Rent',
                 'Physical', 'Economic', 'Physical<BR>(Facility)', 'Economic<BR>(Facility)');
 $row_class = array();
 $rows = array();
 foreach ($overview['types'] AS $type) {
    $row_class[] = 'subheader';
    $rows[] = array($type['name']);
    $odd = 1;
    foreach ($type['subs'] AS $sub) {
        $row_class[] = array('subitem', $odd ? 'oddrow' : 'evenrow');
        $rows[] = array($sub['name'], $sub['count'], FormatHelper::currency($sub['rents']),
                        FormatHelper::percent($sub['phys_subpct'], 1),
                        FormatHelper::percent($sub['econ_subpct'], 1),
                        FormatHelper::percent($sub['phys_totpct'], 1),
                        FormatHelper::percent($sub['econ_totpct'], 1));
        $odd = !$odd;
    }
    $row_class[] = 'grand';
    $rows[] = array('Total '.$type['name'], $type['count'], FormatHelper::currency($type['rents']),
                    FormatHelper::percent(1, 1),
                    FormatHelper::percent(1, 1),
                    FormatHelper::percent($type['phys_pct'], 1),
                    FormatHelper::percent($type['econ_pct'], 1));
 }
 echo $this->element('table',
                    array('class'   => 'item unit-overview overview list',
                          'caption' => 'Unit Types',
                          'headers' => $headers,
                          'rows'    => $rows,
                          'row_class' => $row_class,
                          'suppress_alternate_rows' => true
                          ));
 ?>
 <script type="text/javascript"><!--
 jQuery(document).ready(function(){ 
        jQuery('table.overview td.subheader').attr('colSpan', 7);
 });
 --></script>
 <?php
 /* End "detail supporting" div */
 echo '</div>' . "\n";
 /* End page div */
 echo '</div>' . "\n";
--- a/site/views/units/view.ctp
+++ b/site/views/units/view.ctp
@@ -76,26 +76,6 @@ echo $this->element('leases', array
 		      )));
 /**********************************************************************
 * Current Customer Lease Account History
 */
 if (isset($current_lease['id'])) {
    echo $this->element('statement_entries', array
 			(// Grid configuration
 			 'config' => array
 			 (
 			  'caption' =>
 			  ('Current Lease Statement ('
 			   . $current_lease['Customer']['name']
 			   . ')'),
 			  'filter' => array('Lease.id' => $current_lease['id']),
 			  'include' => array('Through'),
 			  'exclude' => array('Customer', 'Lease', 'Unit'),
 			  )));
 }
 /* End "detail supporting" div */
 echo '</div>' . "\n";
--- a/site/webroot/css/layout.css
+++ b/site/webroot/css/layout.css
@@ -19,6 +19,10 @@ td#pagecolumn  { padding-left: 4mm; }
 td#sidecolumn  { width: 1% }
 /* Ignore themes that want to increase font size */
 .ui-widget { font-size : 1.0em }
 /************************************************************
 ************************************************************
 * Panel captions
@@ -266,6 +270,16 @@ form#collected-form input[type=button] { float : left;
 /* NSF items */
 .nsf-tender { text-decoration: line-through; }
 /* Overview lists */
 table.overview td.grand                     { border-top : 4px double #000; }
 table.overview td.subheader                 { padding-top: 1em; padding-left: 0.5em; font-size: 150%; }
 table.overview td:first-child.subitem       { padding-left: 2em; }
 table.overview td:first-child               { text-align: left; }
 table.overview td                           { text-align: right; }
 table.overview td.oddrow                    { background : #f4f4f4; }
 table.statement_entry-overview              { width : 50% }
 table.lease-overview                        { width : 50% }
 /************************************************************
 ************************************************************
--- a/site/webroot/css/ui.jqgrid.css
+++ b/site/webroot/css/ui.jqgrid.css
--- a/site/webroot/index.php
+++ b/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');
 	}
 /**
--- a/site/webroot/js/jqGrid/grid.locale-en.js
+++ b/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);
--- a/site/webroot/js/jqGrid/grid.postext.js
+++ b/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);
--- a/site/webroot/js/jqGrid/jquery.jqGrid.min.js
+++ b/site/webroot/js/jqGrid/jquery.jqGrid.min.js
--- a/site/webroot/js/jquery-1.3.2.min.js
+++ b/site/webroot/js/jquery-1.3.2.min.js
--- a/site/webroot/js/jquery-1.7.2.min.js
+++ b/site/webroot/js/jquery-1.7.2.min.js
--- a/todo.notes
+++ b/todo.notes
@@ -1,234 +0,0 @@
 Change the summary text "Balance Owed" to "Customer Credit"
 or something similar when there is a negative balance owed.
 Shrink the width of the detail view box so that the detail
 and summary both fit on the same page on the Acer Netbook.
 Remove Date from Ledger Entries on the Transaction page
 (presuming that the Date is taken directly from the
 Transaction and that all Ledger dates are all the same)
 Add Deposit Slip # to the title bar when viewing deposit
 Reversing a rent charge is not considered as part of the
 "charged-through" date on the lease.  Consequently, the
 reversal itself ensures the charge is fully "paid", and
 the "paid-through" date is also out of whack.
 Add NSF Fee to the NSF entry page (It's hardcoded right now
 in Transaction to $35).
 NSF of an item with customer credit is broken.
 Sub-Total is broken, since it will only subtotal the current
 page of the grid.  It needs to be implemented in SQL as it
 was in early (VERY early) implementations.  At that time, I
 had to a use temporary variable to keep a running total.  It 
 worked, but was MySQL specific.
 Add a move-out charges field to the move-out page.
 Otherwise, if the balance is zero, the lease will automatically
 be closed and no more charges are possible.  The other option
 would just be a checkbox to say "close lease (no more charges)",
 or let them clear it and have them close the lease manually.
 Allow waiving a complete charge, even if it already has payments
 applied (at the moment, we just can waive the charge balance).
 Get Petty Cash working.  We'll need to add one or more expense
 accounts.  We'll also need to implement purchase order
 functionality, or at least simple an expense page.
 Have a report indicating Needs-to-be-Locked.  Allow manager
 to go through this list and check off the units actually
 locked (which will update the unit status).
 Same as above, except needs-to-be-unlocked.
 Make the default (initial) jqGrid sort order for balance be DESC.
 Change menu to be
 'Reports' (or 'Overview', or 'Summary')
 'Activities'
   - New Receipt
   - New Customer
   - Move-in
 Add dynamic check to see if customer already exists before being
 created.  Ideally, check +/- a few characters to check for
 alternate spellings.  Same for contact.
 Reduce the number of cached items.  Figure out how to get Cake to
 automatically make CONCAT(TenderType.name, ' #', Tender.id) part
 of each returned query.
 Add the opposite of the "collected" report, which provides a set of
 checkboxes for the different incomes, and returns a list of where
 the received monies were disbursed for the selected period.
 MUST reports:
 - Delinquent customers
 - Locked out units / customers
 - To-Lock units
 - Paid up until
 WANT reports:
 - ???
 ----------------------------------------------------------------------
 ----------------------------------------------------------------------
 ----------------------------------------------------------------------
 ----------------------------------------------------------------------
 ----------------------------------------------------------------------
 -- DONE !
 VERIFY THAT OUR NEW BALANCE QUERY WORKS.
 (The one that was added to lease).  It works for
 folks that have ledger entries, but I fear that the
 inner join will prevent customers from showing up
 in the list if they don't yet have any ledger entries
 in account receivable.  To resolve this we'll have to
 go back to LEFT JOIN and check for NULL in our SUM()
 statement.
 Fix sorting on Lease list by Lease Number.  Have it
 reference ID instead.
 Figure out why Brenda Harmon's lease #44, unit #B04, lists
 the security deposit as $150. She's only paid $25, so it must
 be a lease issue.
 Modify LedgerEntry to have through_date, since a single
 invoice could have charges for several months rent.  It's
 not clear whether due_date should also be moved to
 LedgerEntry, since some charges could have different due
 dates.  The problem is that I can't picture an invoice
 having more than one due date.
 Consider adding a from_date to LedgerEntry as well.
 Fix Customers index list.  To replicate, add a brand
 new customer.  Select Customers.  Notice it says
 'Current Customers', but actually includes the new
 one in the list.
 There seems to be a problem with the account ledger for the
 customer.  To replicate, see Mancini's account (#47).  There
 are 4 entries in the Account ledger.  One of them is was from
 5/1/09.  It's a receipt (Transaction #610, Entry #702).  The
 Transaction is for $111.33 as indicated, but the entry is only
 for $16.33.
  -- This was a problem with using notxgroup, the experimental
  -- field that used to be hardcoded to false in ledger_entries.ctp
  -- My rework eliminated that field, and everything was getting
  -- grouped by transaction.
 Figure out how to utilize the security deposit, whether
 as part of move-out only, or as one of the payment options.
 Having a grid of ledger entries grouped by transaction appears
 to work, from the financial aspect, but the count of entries
 is incorrect.  The problem is the grouping only occurs after
 the count, which it has to in order for the count to work.  We
 need to obliterate the group_by_tx parameter, and simply use
 the transanction controller to generate the grid instead of
 ledger_entries.
 Handle a credit, ensuring that it's applied to new charges
 - either automatically;
 - by user opt-in to use credits when invoicing
 - by user opt-in when entering a receipt
 - by manually allowing a receipt of credits
 Reconcile all entries of a ledger to the c/f entry when
 "closing" the ledger and creating a new one.
 Determine when each unit is paid up until.  There is actually
 two things here: invoiced up until, and paid up until.  One or
 both of these should be displayed on the Lease view page.
 20090729: New Ledger doesn't seem to give a balance forward entry.
 Sorting by Customer ID is broken.  It must think it's already
 sorted by ID because the first click shows the arrow as
 DESC even though the sort is ASC.  Subsequent clicks don't
 change anything.  You must sort on a different column first
 then everything works.
  - Not actually fixed in the app, although it's solved by
    using jqGrid 3.5
 Seems like security deposit is suddenly broken.  I believe
 the customer/lease infobox used to report only PAID
 security deposits, but it now seems like it's reporting ALL
 security deposits charged.
 Customer Selection on the Receipt Page is broken.
 (Selecting a row and waiting for the update).
 Automatic assessment of rents, or at least for now, one
 click manual mechanism to assess rents correctly for all
 tenants.
 Automatic assessment of late fees, or at least for now, one
 click manual mechanism to assess late fees correctly for all
 tenants.
 Fix ACH deposits into bank.  Make it happen automatically,
 perhaps after 3 days.  Without this, we cannot NSF an ACH
 transaction.
 Change the menu structure to be $menu['section']['item'], so that
 items don't have to be added in order of section.  Perhaps even
 array(array(name, priority, items => array(name, priority, link)))
 Change New Customer form to have contact 'New' radio pre-checked
 Add explanatory information on the New Customer page
 - Customer name can be omitted and will come from primary tenant.
 - Phone numbers, etc can be added later directly to the contact
 Unit Size has no controller.  Either remove the link from the
 units grid, or implement the controller.
 When performing a move-in, the receipt page is broken
 when trying to enter a concession. javascript complains about
 an invalid value, and the page is not submitted.
 - Allegedly.  I believe Shirley's browser was acting up
   on her, and based on the logs, it seems that indeed
   what ultimately worked just fine for a concession entry
   was really the exact same page that was stuck.  While
   on the phone it was evident that here browser was
   doing a javascript wig-out, and it wasn't related to
   a slow internet connection.
 Add invoice rent helpers
 - monthly proration tool
   - select from/to dates, and hit "prorate"
 - charge through date
   - enter charge through date, and the invoice
     will automatically have charges for each month
     from the current charge-through date to the
     new charge-through date.
 - charge N months
   - enter number of months, and the invoice
     will automatically have charges for each month
     from the current charge-through date for N months
 - next rent
   - same as, or instead of, "charge N months", where
     N is 1
 Invoice
  - Have some sort of rent-proration tool
  - Have Rent automatically populate the Effective/Through
    as well as rent (pro-rating if necessary).  The dates
    should take into account the customer charge through
    date, as well as any other rents on the invoice.
Author	SHA1	Message	Date
Abijah	a3148cc17d	Fixed bug that was using an existing entry, even when the source had been selected as new. git-svn-id: file:///svn-source/pmgr/branches/hosted_migration_20130215@1029 97e9348a-65ac-dc4b-aefc-98561f571b83	2013-05-30 03:38:17 +00:00
Abijah	c709f0bbf5	Prevent redirection when in dev mode, so that we can see the debug output from each page git-svn-id: file:///svn-source/pmgr/branches/hosted_migration_20130215@1028 97e9348a-65ac-dc4b-aefc-98561f571b83	2013-05-30 03:36:38 +00:00
Abijah	8faafe7f4e	Fixed a very long-standing but with a unclosed <div> tag. Also forced autocomplete to OFF for the new items. I wouldn't really care, but this was causing a bug with Chrome where the autocomplete was forcing the radio buttons to be unchecked. git-svn-id: file:///svn-source/pmgr/branches/hosted_migration_20130215@1027 97e9348a-65ac-dc4b-aefc-98561f571b83	2013-05-30 03:35:55 +00:00
Abijah	4319847665	Bug fixes that have been made since going live. git-svn-id: file:///svn-source/pmgr/branches/hosted_migration_20130215@1026 97e9348a-65ac-dc4b-aefc-98561f571b83	2013-05-30 02:04:42 +00:00
Abijah	d22a69b510	Fix for annoying 400 error from apache on lunarpages when the requested url is a top level request without a trailing slash. git-svn-id: file:///svn-source/pmgr/branches/hosted_migration_20130215@1025 97e9348a-65ac-dc4b-aefc-98561f571b83	2013-02-16 00:10:48 +00:00
Abijah	e9028b7558	Fixed the rebuild mechanism to run directly without scripts git-svn-id: file:///svn-source/pmgr/branches/hosted_migration_20130215@1024 97e9348a-65ac-dc4b-aefc-98561f571b83	2013-02-16 00:09:39 +00:00
Abijah	26559f3c59	Bug fixes to work with lunarpages git-svn-id: file:///svn-source/pmgr/branches/hosted_migration_20130215@1023 97e9348a-65ac-dc4b-aefc-98561f571b83	2013-02-15 21:04:41 +00:00
abijah	4d24428a19	First pass at conversion for lunarpages. Untested as of yet, but this checkin will allow an svn export, and I can work on the bugs then. git-svn-id: file:///svn-source/pmgr/branches/hosted_migration_20130215@1022 97e9348a-65ac-dc4b-aefc-98561f571b83	2013-02-15 19:08:29 +00:00
abijah	15fc04e690	Branch to prepare for moving from local server to a hosted machine on the cloud git-svn-id: file:///svn-source/pmgr/branches/hosted_migration_20130215@1021 97e9348a-65ac-dc4b-aefc-98561f571b83	2013-02-15 16:59:27 +00:00
abijah	60254860b4	Releasing fixes, most notably the jqGrid update git-svn-id: file:///svn-source/pmgr/tags/v0.3.2@1020 97e9348a-65ac-dc4b-aefc-98561f571b83	2012-11-17 18:26:03 +00:00
abijah	20284046c3	Fixed bug charging customers again when there is not charge through date. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1019 97e9348a-65ac-dc4b-aefc-98561f571b83	2012-11-17 18:20:48 +00:00
abijah	99a98cbc7d	Added some minor view tweaks git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1018 97e9348a-65ac-dc4b-aefc-98561f571b83	2012-11-17 18:18:36 +00:00
abijah	fc9226594c	Added customer link on the receipts page git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1017 97e9348a-65ac-dc4b-aefc-98561f571b83	2012-08-07 00:14:54 +00:00
abijah	352bdbbf49	Fixed non-backward compatible jqGrid issue caused during upgrade from 3.8.x to 4.0.0 (grid.postext.js module is no longer supported and is now a plugin) git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1016 97e9348a-65ac-dc4b-aefc-98561f571b83	2012-08-07 00:11:03 +00:00
abijah	11fbdf0701	Upgraded to jqGrid 4.4.0 git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1015 97e9348a-65ac-dc4b-aefc-98561f571b83	2012-08-06 17:57:49 +00:00
abijah	2519f4c8a7	Added support for account name and number on the deposit slips git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1014 97e9348a-65ac-dc4b-aefc-98561f571b83	2012-08-06 17:33:21 +00:00
abijah	b6ed57c02c	Checking in changes from some time ago, changing the reports screen to give direct Quickbooks invoice and credits info. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1013 97e9348a-65ac-dc4b-aefc-98561f571b83	2012-06-14 01:32:44 +00:00
abijah	4dffa540a0	Fixed a long standing bug preventing proper display of the customer-contact relationship fields. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1010 97e9348a-65ac-dc4b-aefc-98561f571b83	2011-05-11 19:19:08 +00:00
abijah	3d1c4d2492	Added income / expense reports that produce results suitable for entry into quickbooks as per the current paradigm git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1009 97e9348a-65ac-dc4b-aefc-98561f571b83	2011-03-30 16:57:28 +00:00
abijah	c4f6f76edb	Fixed a bug with 2 digit years git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1003 97e9348a-65ac-dc4b-aefc-98561f571b83	2011-01-08 01:26:04 +00:00
abijah	d95045cb15	Modified the grid search to support standard date formats, with a bit of a kludge by applying it to fields that end with _date or stamp. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1002 97e9348a-65ac-dc4b-aefc-98561f571b83	2011-01-08 00:56:15 +00:00
abijah	0c95431128	Changed lease status to LATE after the customer is actually late, instead of when late charges start to apply. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1001 97e9348a-65ac-dc4b-aefc-98561f571b83	2011-01-08 00:53:40 +00:00
abijah	c76ba261d8	Fixed a bug with customer merge. Common contacts were being deleted when selected as a source contact to keep. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1000 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-07-12 21:48:42 +00:00
abijah	954f0d7968	Removed the debug aid of sub-totaling statement entries. I'll add the right solution someday... git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@998 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-07-02 22:19:55 +00:00
abijah	920dba3a4d	Modified a couple reports to have url control over the period git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@997 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-07-02 22:05:24 +00:00
abijah	fff2e84fb1	Updated to include total leases / past leases git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@996 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-07-02 21:43:34 +00:00
abijah	11aacd5803	Modified customer merge functionality to leave everything from the destination customer in-tact, and simply add on contacts from the source customer, if requested. This simplifies things significantly, and also the paradigm shift of starting the operation from the destination customer allows us to merge multiple customers into one with ease (no need to dig around for each source customer before clicking merge) git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@995 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-07-02 20:52:00 +00:00
abijah	34844760e8	Added the front end code to perform a customer merge. Seems to work, although I don't fully trust it yet. Now that implementation is done, I realize I don't care for the interface. Really, the destination customer should keep its primary contact and all other contacts. The user should only be given the choice of adding zero to all contacts from the source customer. A change in primary contact could always be handled after the merge. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@994 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-07-02 19:36:39 +00:00
abijah	b1113e826f	First pass at a customer merge function. Preliminary tests seem to be successful. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@993 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-07-02 16:29:06 +00:00
abijah	112a128492	Minor change to the display and sort order of unit sizes git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@992 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-07-02 13:38:38 +00:00
abijah	d96145530c	Minor update to support the 'IN' search type, avoid wrapping floating point in CDATA, and to support the grid request for multiple pages. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@991 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-07-02 13:27:35 +00:00
abijah	a602fce3ab	Added override function for counting the results. This is needed because the 'Unpaid Charges' report was returning a crazy large number of entries. Although I know this quick and dirty hack works for that report, I haven't checked or tested to see if this might cause issues in other areas. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@985 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-04-14 04:24:13 +00:00
abijah	6849c2caae	Added possible fix for this problem with sandbox/devbox themes that use a font size so large, it creates usability issues. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@984 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-04-14 03:34:01 +00:00
abijah	b83c870eed	Merge in bugfix from v0.2_work git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@982 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-04-02 13:08:41 +00:00
abijah	11b54588ff	Changed the invoice page to redirect back to the customer view, which is typically more of interest than the lease view git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@980 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-04-02 12:24:34 +00:00
abijah	214aa4d348	Yet another bug from haste... let's hope this one fixes it. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@979 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-31 20:10:21 +00:00
abijah	f281295084	Fixed copy/paste bug introduced at the last minute on the prior checkin. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@978 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-31 20:07:29 +00:00
abijah	68cbca5e28	Added outstanding charges and outstanding credits to the customer page, and reorded fields in order of presumed importance. Removed items from Unit/Lease which really shouldn't have been there. They were added for convenience, but the redundancy was confusing. Added a couple report links to make it easy to see outstanding charges and collected rents. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@977 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-31 19:49:56 +00:00
abijah	4892143c0c	On move-out, redirecting back to the customer instead of the closed lease git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@976 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-31 19:45:45 +00:00
abijah	1be8df7a75	Fixed a sorting issue (depending on point of view). When sorting by date, or effective date, I find it useful to have the next order of sort be entry ID, so they can be viewed in the order actually entered. Ideally, we'll get to a 4 date system: charge-from date, charge-to date, effective date (whatever date the user feels is the right date for the transaction), and _actual_ date, which is the true and correct entry date/time and _not_ user settable. The names of each may need to be different, but that's where we need to head, in which case, we would sort on actual date instead of entry-id. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@975 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-30 16:02:43 +00:00
abijah	285c682b1e	Added ability to see the customer when listing transactions git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@974 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-30 15:57:54 +00:00
abijah	3acdec1458	Merge in from v0.2.3, a housekeeping release git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@970 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-12 04:38:59 +00:00
abijah	e0b41ca4f7	Trivial release for housekeeping only git-svn-id: file:///svn-source/pmgr/tags/v0.2.3@968 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-12 04:27:12 +00:00
abijah	780c614c78	Brought all notes to a top level directory, and got rid of the VSS database sql file. It has moved to its own repository: /svn/vss git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@967 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-12 04:24:38 +00:00
abijah	f49a23b2fd	Brought all notes to a top level directory, and got rid of the VSS database sql file. It has moved to its own repository: /svn/vss git-svn-id: file:///svn-source/pmgr/branches/v0.2_work@967 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-12 04:24:38 +00:00
abijah	07461f4419	Merge in v0.2.2 fixes git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@966 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-12 04:05:00 +00:00
abijah	48631cffee	Fixed a bug that was causing some lease charge_through_date fields to be NULL, which in turn caused additional charges to be added in error when assessing charges. The problem was that we were looking for statement entry charges that were not followed by other statement entries the next month. The intention was to locate rent charges that were not matched by a rent charge the following month, but we were looking for any type of statement entry. The presently visible problem was with a disbursement the next month on Lease #21 , leaving NO last charge, not even just the wrong date. However, the issue could even be as simple as a Cleaning charge the next month, so we now filter not only for charges, but rent charges. git-svn-id: file:///svn-source/pmgr/branches/v0.2_work@963 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-12 03:48:03 +00:00
abijah	68e6dc2d20	Fixed the monthly charges report to only reflect income accounts (not things like security deposits). Also, by restricting to charges, the report was neglecting things like reversals, leaving the totals skewed. Thefore, the 'CHARGES' restriction was removed and replaced with the much more appropriate chargeDisbursementFields() function, which dumps fields that tabulate correctly. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@962 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-12 02:21:57 +00:00
abijah	2f2a4642fb	Changed the monthly charge report to limit itself to 11 months (plus the current month), and to sort in reverse order, keeping the most relevant month at the top. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@961 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-12 02:02:42 +00:00
abijah	2602a6fa7c	Added a lease up report git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@960 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-12 01:51:32 +00:00
abijah	2489b67542	Forgot to add the report views for the last two checkins :-/ git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@959 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-12 01:31:05 +00:00
abijah	821ffc4726	Added Monthly Charges report. Also, added a new area to the menu specifically for reports. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@958 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-12 00:38:34 +00:00
abijah	7770f13bf3	Added a Unit overview action. It's a bit quick and dirty, but it's intended for admins only. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@957 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-11 23:40:47 +00:00
abijah	0a594bb5a9	Merge in db changes from the v0.2.0 release git-svn-id: file:///svn-source/pmgr/branches/v0.2_work@947 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-02 18:44:56 +00:00
abijah	b3d43d754b	Fixed a bug with customer lease counts after editing the customer. git-svn-id: file:///svn-source/pmgr/branches/v0.2_work@946 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-02 18:35:09 +00:00
abijah	a47d5d54b4	Fixed bug which was kicking us out of the dev/sandbox when editing a customer. Actually, seems like more of a workaround for a CakePHP bug, but it's not certain. git-svn-id: file:///svn-source/pmgr/branches/v0.2_work@945 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-02 18:05:37 +00:00
abijah	b6e2b781ef	Renamed the work branch, since it will be used for bugfix revs as well. git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@944 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-02 18:04:47 +00:00
abijah	8f5c3031fc	Renamed the work branch, since it will be used for bugfix revs as well. git-svn-id: file:///svn-source/pmgr/branches/v0.2_work@943 97e9348a-65ac-dc4b-aefc-98561f571b83	2010-03-02 18:03:11 +00:00