Trivial release for housekeeping only

git-svn-id: file:///svn-source/pmgr/tags/v0.2.3@968 97e9348a-65ac-dc4b-aefc-98561f571b83

build.cmd

@@ -1,3 +0,0 @@
-@echo off
-mysql --user=pmgr --password=pmgruser < %~dp0\db\property_manager.sql
-echo Done!

db/scratch.sql

@@ -1,578 +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.type = 'INVOICE' AND Tamt <> T.amount) 
-      OR      
-    (T.type <> 'INVOICE' AND Oamt <> T.amount)    
-      OR      
-    (Tamt * -1 <> Oamt)
-
-
--- Verify that statement entries all have the correct type
-SELECT SE.id, SE.type, T.id, T.type
- FROM pmgr_statement_entries SE
- LEFT JOIN pmgr_transactions T ON T.id = SE.transaction_id 
-WHERE
- ((T.type = 'RECEIPT' OR T.type = 'CREDIT_NOTE') AND
-  SE.type NOT IN ('DISBURSEMENT', 'WAIVER', 'REVERSAL', 'WRITEOFF', 'SURPLUS')
- ) 
- OR
- ((T.type = 'INVOICE' OR T.type = 'PAYMENT') AND
-  SE.type NOT IN ('CHARGE', 'PAYMENT', 'REFUND')
- )  
- -- catch other types not considered in this query
- OR T.type NOT IN ('RECEIPT', 'CREDIT_NOTE', 'INVOICE', 'PAYMENT')
-
-
-
-
--- #################################################################
--- #################################################################
--- #################################################################
--- #################################################################
--- #################################################################
--- #################################################################
--- #################################################################
--- #################################################################
--- #################################################################
--- ## 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
-;

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
- ? - 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.

site/app_controller.php

@@ -220,10 +220,6 @@ class AppController extends Controller {
     $this->addSideMenuLink('Stmt Entries',
 			   array('controller' => 'statement_entries', 'action' => 'index'), null,
 			   'SITE', $this->admin_area);
-    $this->addSideMenuLink('Assess Charges',
-			   array('controller' => 'leases', 'action' => 'assess_all'), null,
-			   'SITE', $this->admin_area);
-
 
     $this->addSideMenuLink('Un-Nuke',
 			   '#', array('htmlAttributes' =>
@@ -250,6 +246,10 @@ class AppController extends Controller {
     $this->addSideMenuLink('New Deposit',
 			   array('controller' => 'tenders', 'action' => 'deposit'), null,
 			   'SITE', $this->op_area);
+    if (!empty($this->params['admin']))
+      $this->addSideMenuLink('Assess Charges',
+			     array('controller' => 'leases', 'action' => 'assess_all'), null,
+			     'SITE', $this->op_area);
 
     $url_components = array('plugin', 'controller', 'action', 'named');
     if (devbox()) {

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))

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));
 
 ?>

site/controllers/customers_controller.php

@@ -2,6 +2,12 @@
 
 class CustomersController extends AppController {
 
+  // DEBUG FUNCTION ONLY!
+  // Call without id to update ALL customers
+  function force_update($id = null) {
+    $this->Customer->update($id);
+    $this->redirect(array('action'=>'index'));
+  }
 
   /**************************************************************************
    **************************************************************************

site/controllers/leases_controller.php

@@ -394,6 +394,10 @@ class LeasesController extends AppController {
     $this->set(compact('default_late'));
 
     if ($type === 'move-in') {
+      // Make sure we have a valid lease that we're moving in
+      if (empty($lease))
+	$this->redirect(array('action' => 'index'));
+
       $movein = array();
       $movein['time'] = strtotime($lease['Lease']['movein_date']);
       $movein['effective_time'] = strtotime($lease['Lease']['movein_date']);

site/controllers/statement_entries_controller.php

@@ -47,7 +47,17 @@ class StatementEntriesController extends AppController {
 
     if (!empty($params['post']['custom']['statement_entry_id'])) {
       $link['ChargeEntry']        = array();
-      $link['DisbursementEntry']  = array();
+      // This query actually represents a union...
+      // Unpaid Charge/Surplus:  ChargeID -  NULL;   DisbursementID -  NULL
+      // Paid Charge/Refund:     ChargeID -  NULL;   DisbursementID - !NULL
+      // Disbursement/Reversal:  ChargeID - !NULL;   DisbursementID -  NULL
+      // <EMPTY SET>:            ChargeID - !NULL;   DisbursementID - !NULL
+      //
+      // The query is really slow unless we add the `id` condition to the join.
+      // A cleaner query would be nice, but we must work within the Cake framework.
+      $link['DisbursementEntry']  = array('conditions' =>
+					  '`DisbursementEntry`.`id` = '
+					  . $params['post']['custom']['statement_entry_id']);
     }
 
     return array('link' => $link);

site/controllers/transactions_controller.php

@@ -112,7 +112,7 @@ class TransactionsController extends AppController {
    *  - handles the creation of a charge invoice
    */
 
-  function postInvoice() {
+  function postInvoice($redirect = true) {
     if (!$this->RequestHandler->isPost()) {
       echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
       return;
@@ -127,6 +127,17 @@ class TransactionsController extends AppController {
       die("<H1>INVOICE FAILED</H1>");
     }
 
+    if ($redirect) {
+      if (!empty($this->data['Customer']['id']))
+	$this->redirect(array('controller' => 'customers',
+			      'action'     => 'receipt',
+			      $this->data['Customer']['id']));
+      else
+	$this->redirect(array('controller' => 'leases',
+			      'action'     => 'view',
+			      $this->data['Lease']['id']));
+    }
+
     $this->layout = null;
     $this->autoLayout = false;
     $this->autoRender = false; 
@@ -140,7 +151,7 @@ class TransactionsController extends AppController {
    *  - handles the creation of a receipt
    */
 
-  function postReceipt() {
+  function postReceipt($redirect = true) {
     if (!$this->RequestHandler->isPost()) {
       echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
       return;
@@ -164,6 +175,11 @@ class TransactionsController extends AppController {
       die("<H1>RECEIPT FAILED</H1>");
     }
 
+    if ($redirect)
+      $this->redirect(array('controller' => 'customers',
+			    'action'     => 'view',
+			    $this->data['Customer']['id']));
+
     $this->layout = null;
     $this->autoLayout = false;
     $this->autoRender = false; 
@@ -377,9 +393,11 @@ class TransactionsController extends AppController {
    *    irreversibly destroys the data.  It is not for normal use.
    */
 
-  function destroy($id = null) {
+  function destroy($id) {
+    $this->Transaction->id = $id;
+    $customer_id = $this->Transaction->field('customer_id');
     $this->Transaction->destroy($id);
-    //$this->redirect(array('action' => 'index'));
+    $this->redirect(array('controller' => 'customers', 'action' => 'view', $customer_id));
   }
 
 
@@ -423,7 +441,7 @@ class TransactionsController extends AppController {
 				 "This may leave the database in an unstable state." .
 				 " Do NOT do this unless you know what you're doing." .
 				 " Proceed anyway?"),
-			   'ACTION', $this->dev_area);
+			   'ACTION', $this->admin_area);
 
     // OK, prepare to render.
     $title = 'Transaction #' . $transaction['Transaction']['id'];

site/controllers/util_controller.php

@@ -62,4 +62,15 @@ class UtilController extends AppController {
   function rebuild_sandbox() { $this->rebuild_box('sand'); }
   function rebuild_devbox()  { $this->rebuild_box('dev'); }
 
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: logmsg
+   *  - action to allow posting log message data
+   */
+
+  function logmsg() {
+  }
+  
 }

site/models/customer.php

@@ -192,6 +192,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.
@@ -247,10 +254,10 @@ class Customer extends AppModel {
       return;
     }
 
-    // REVISIT <AP>: 20090812
+    // updateLeaseCount is typically handled directly when needed.
-    //  updateLeaseCount is handled directly when needed.
+    // However, this function is used to _ensure_ customer info is
-    //  Should we simplify by just doing it anyway?
+    // current, so we're obligated to call it anyway.
-    //$this->updateLeaseCount($id);
+    $this->updateLeaseCount($id);
 
     $current_leases =
       $this->find('all',

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)',
 			  ),
 			 ),
 		   ),

site/views/customers/receipt.ctp

@@ -25,12 +25,12 @@ Configure::write('debug', '0');
       beforeSubmit:  verifyRequest,  // pre-submit callback 
       success:       showResponse,  // post-submit callback 
  
-      url: "<?php echo $html->url(array('controller' => 'transactions',
-					'action' => 'postReceipt', 0)); ?>",
- 
       // other available options: 
       //clearForm: true,        // clear all form fields after successful submit 
       //resetForm: true,        // reset the form after successful submit 
+
+      url: "<?php echo $html->url(array('controller' => 'transactions',
+					'action' => 'postReceipt', 0)); ?>"
       }; 
 
     // bind form using 'ajaxForm' 
@@ -48,24 +48,32 @@ function verifyRequest(formData, jqForm, options) {
     if (formData[i]['name'] == "data[Customer][id]" &&
 	!(formData[i]['value'] > 0)) {
       //$("#debug").append('<P>Missing Customer ID');
-      alert("Must select a customer first");
+      alert("Please select a customer first.");
       return false;
     }
 
     if (formData[i]['name'] == "data[Transaction][stamp]" &&
 	formData[i]['value'] == '') {
       //$("#debug").append('<P>Bad Stamp');
-      alert("Must enter a valid date stamp");
+      if (formData[i]['value'] != '')
+	alert(formData[i]['value'] + " is not valid date stamp.  Please correct it.");
+      else
+	alert("Please enter a valid date stamp first.");
       return false;
     }
 
     // Terrible way to accomplish this...
     for (var j = 0; j < 20; ++j) {
-      if (formData[i]['name'] == "data[Entry]["+j+"][amount]" &&
+      if (formData[i]['name'] == "data[Entry]["+j+"][amount]") {
-	  !(formData[i]['value'] > 0)) {
+	var val = formData[i]['value'].replace(/\$/,'');
 	//$("#debug").append('<P>Bad Amount');
-	alert("Must enter a valid amount");
+	if (!(val > 0)) {
-	return false;
+	  if (formData[i]['value'] == '')
+	    alert("Please enter an amount first.");
+	  else
+	    alert('"'+formData[i]['value']+'"' + " is not valid amount.  Please correct it.");
+	  return false;
+	}
       }
     }
 

site/views/elements/leases.ctp

@@ -11,6 +11,7 @@ $cols['Signed']    = array('index' => 'Lease.lease_date',    'formatter' => 'dat
 $cols['Move-In']   = array('index' => 'Lease.movein_date',   'formatter' => 'date');
 $cols['Move-Out']  = array('index' => 'Lease.moveout_date',  'formatter' => 'date');
 $cols['Closed']    = array('index' => 'Lease.close_date',    'formatter' => 'date');
+$cols['Charge-Thru'] = array('index' => 'Lease.charge_through_date', 'formatter' => 'date');
 $cols['Paid-Thru'] = array('index' => 'Lease.paid_through_date', 'formatter' => 'date');
 $cols['Status']    = array('index' => 'status',              'formatter' => 'longenum');
 $cols['Balance']   = array('index' => 'balance',             'formatter' => 'currency');
@@ -18,7 +19,7 @@ $cols['Comment']   = array('index' => 'Lease.comment',       'formatter' => 'com
 
 if (!empty($this->params['action'])) {
   if ($this->params['action'] === 'closed')
-    $grid->invalidFields(array('Paid-Thru', 'Status'));
+    $grid->invalidFields(array('Charge-Thru', 'Paid-Thru', 'Status'));
   elseif ($this->params['action'] === 'active')
     $grid->invalidFields(array('Closed'));
   elseif ($this->params['action'] === 'delinquent')
@@ -32,4 +33,4 @@ $grid
 ->defaultFields(array('Lease'))
 ->searchFields(array('Customer', 'Unit'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Signed', 'Status', 'Comment')));
+	 array_diff(array_keys($cols), array('Signed', 'Charge-Thru', 'Status', 'Comment')));

site/views/elements/sidemenu.ctp

@@ -74,9 +74,9 @@ jQuery(document).ready(function(){
       jQuery("#sidemenu").accordion
 	({  fillSpace : true,
 	    event : "click hoverintent",
-	    animated : "bounceslide",
+	    animated : "bounceslide"
 JSCB
-. (isset($active_section) ? "\tactive : $active_section,\n" : '') .
+. (isset($active_section) ? ",\n\t    active : $active_section\n" : '') .
 <<<JSCB
 	});
     }

site/views/layouts/default.ctp

@@ -86,6 +86,18 @@
 		echo $javascript->link('pmgr') . "\n";
 		echo $scripts_for_layout . "\n";
 	?>
+
+	<?php if ($this->params['action'] !== 'INTERNAL_ERROR'): ?>
+	<script type="text/javascript"><!--
+	if (typeof(jQuery) == 'undefined') {
+		window.location.href =
+			"<?php echo $html->url(array('controller' => 'util',
+			                   'action'     => 'INTERNAL_ERROR',
+	                                   'jQuery NOT LOADED!')); ?>";
+	}
+	--></script>
+	<?php endif; ?>
+
 </head>
 <body>
 

site/views/leases/invoice.ctp

@@ -10,6 +10,7 @@ $customer = $lease['Customer'];
 if (isset($lease['Lease']))
   $lease = $lease['Lease'];
 
+//pr(compact('unit', 'customer', 'lease', 'movein'));
 
 /**********************************************************************
  **********************************************************************
@@ -25,35 +26,28 @@ Configure::write('debug', '0');
 
 <script type="text/javascript"><!--
 
+  var lease_charge_through;
+
   // prepare the form when the DOM is ready 
   $(document).ready(function() { 
-      $("#debug").append('doc ready1' + '<BR>');
+    var options = { 
-      var options = { 
       target:        '#output-debug',   // target element(s) to be updated with server response 
       beforeSubmit:  verifyRequest,  // pre-submit callback 
       success:       showResponse,  // post-submit callback 
 
-      url: "<?php echo $html->url(array('controller' => 'transactions',
-					'action' => 'postInvoice', 0)); ?>",
- 
       // other available options: 
       //clearForm: true,        // clear all form fields after successful submit 
       //resetForm: true,        // reset the form after successful submit 
+
+      url: "<?php echo $html->url(array('controller' => 'transactions',
+					'action' => 'postInvoice', 0)); ?>"
       };
 
-      if ($('#invoice-form').ajaxForm != null) 
+    // bind form using 'ajaxForm' 
-	$("#debug").append('ajax present' + '<BR>');
+    if ($('#invoice-form').ajaxForm != null)
-      else
+      $('#invoice-form').ajaxForm(options); 
-	$("#debug").append('ajax not present' + '<BR>');
+    else
-
+      $('#repeat, label[for=repeat]').remove();
-      // bind form using 'ajaxForm' 
-      if ($('#invoice-form').ajaxForm != null) {
-	$("#debug").append('go ajax' + '<BR>');
-	$('#invoice-form').ajaxForm(options); 
-	$("#debug").append('ajax set' + '<BR>');
-      }
-      else
-	$('#repeat, label[for=repeat]').remove();
     });
  
 // pre-submit callback 
@@ -71,19 +65,27 @@ function verifyRequest(formData, jqForm, options) {
     if (formData[i]['name'] == "data[Transaction][stamp]" &&
 	formData[i]['value'] == '') {
       //$("#debug").append('<P>Bad Stamp');
-      alert("Must enter a valid date stamp");
+      if (formData[i]['value'] != '')
+	alert(formData[i]['value'] + " is not valid date stamp.  Please correct it.");
+      else
+	alert("Please enter a valid date stamp first.");
       return false;
     }
 
     // Terrible way to accomplish this...
-/*     for (var j = 0; j < 20; ++j) { */
+    for (var j = 0; j < 20; ++j) {
-/*       if (formData[i]['name'] == "data[Entry]["+j+"][amount]" && */
+      if (formData[i]['name'] == "data[Entry]["+j+"][amount]") {
-/* 	  !(formData[i]['value'] > 0)) { */
+	var val = formData[i]['value'].replace(/\$/,'');
-/* 	//$("#debug").append('<P>Bad Amount'); */
+	//$("#debug").append('<P>Bad Amount');
-/* 	alert("Must enter a valid amount"); */
+	if (!(val > 0)) {
-/* 	return false; */
+	  if (formData[i]['value'] == '')
-/*       } */
+	    alert("Please enter an amount for Charge #"+j+", or remove the Charge completely.");
-/*     } */
+	  else
+	    alert('"'+formData[i]['value']+'"' + " is not a valid amount for Charge #"+j+".  Please correct it.");
+	  return false;
+	}
+      }
+    }
   }
 
   //$("#debug").append('OK');
@@ -131,13 +133,11 @@ function showResponse(responseText, statusText)  {
 
 // Reset the form
 function resetForm(nocharge) {
-  $("#debug").append('reset form: ' + nocharge + '<BR>');
   $('#charge-entry-id').val(1);
   $('#charges').html('');
 
   if (!nocharge)
     addChargeSource(false);
-  $("#debug").append('reset form done' + '<BR>');
 }
 
 
@@ -153,6 +153,7 @@ function onRowSelect(grid_id, lease_id) {
   $("#invoice-deposit").html($(grid_id).getCell(lease_id, 'Lease-deposit')
 			     ? $(grid_id).getCell(lease_id, 'Lease-deposit')
 			     : '-');
+  lease_charge_through = $(grid_id).getCell(lease_id, 'Lease-charge_through_date')
 
   // Hide the "no lease" message and show the current lease
   $(".lease-selection-invalid").hide();
@@ -163,7 +164,6 @@ function onRowSelect(grid_id, lease_id) {
 }
 
 function onGridState(grid_id, state) {
-  $("#debug").append('on grid state: ' + grid_id + '; ' + state + '<BR>');
   if (state == 'visible') {
     $(".lease-selection-invalid").hide();
     $(".lease-selection-valid").hide();
@@ -177,11 +177,81 @@ function onGridState(grid_id, state) {
       $(".lease-selection-invalid").show();
     }
   }
-  $("#debug").append('on grid state done' + '<BR>');
+}
+
+function setNextRent(id) {
+  var chg_thru;
+  $('.ChargeForm').each( function(i) {
+      if ($('.ChargeFormThroughDate', this).attr('id') == 'Entry'+id+'ThroughDate')
+	return;
+
+      if ($('.ChargeFormAccount option:selected', this).val() == <?php echo $rentAccount ?>
+	  && $('.ChargeFormThroughDate', this).val()) {
+	var dt = new Date($('.ChargeFormThroughDate', this).val());
+	//$('#debug').append('Rent in ' + i + '; date ' + dt + '<BR>');
+	if (chg_thru == null || dt > chg_thru)
+	  chg_thru = dt;
+      }
+    });
+
+  if (!chg_thru)
+    chg_thru = new Date(lease_charge_through);
+
+  if (chg_thru < dateEOM(chg_thru)) {
+    // Add a charge to finish out the month
+    datepickerSet('Entry'+id+'EffectiveDate', dateTomorrow(chg_thru));
+    datepickerSet('Entry'+id+'ThroughDate',   dateEOM(chg_thru));
+  } else {
+    // Add a whole month's charge for next month
+    datepickerSet('Entry'+id+'EffectiveDate', dateNextBOM(chg_thru));
+    datepickerSet('Entry'+id+'ThroughDate',   dateNextEOM(chg_thru));
+  }
+
+  // Now add in the amount owed based on the calculated
+  // effective and through dates.
+  prorate(id);
+}
+
+function prorate(id) {
+  var edt = datepickerGet('Entry'+id+'EffectiveDate');
+  var tdt = datepickerGet('Entry'+id+'ThroughDate');
+  var rent = $('#invoice-rent').html().replace(/\$/,'');
+
+  // Reset the comment.  It might wipe out a user comment,
+  // but it's probably low risk/concern
+  $('#Entry'+id+'Comment').val('');
+
+  if (edt == null || tdt == null) {
+    alert('Can only prorate with both effective and through dates');
+    rent = 0;
+  }
+  else if (edt > tdt) {
+    alert('Effective date is later than the Through date');
+    rent = 0;
+  }
+  else if (tdt.getMonth() == edt.getMonth() + 1 && 
+	   edt.getDate()   == tdt.getDate()  + 1) {
+    // appears to be anniversary billing, one full cycle
+  }
+  else if (edt.getTime() == dateBOM(edt).getTime() &&
+	   tdt.getTime() == dateEOM(edt).getTime()) {
+    // appears to be one full month
+  }
+  else {
+    var one_day=1000*60*60*24;
+    var days = Math.ceil((tdt.getTime()-edt.getTime()+1)/(one_day));
+    var dim = 
+      ((edt.getMonth() == tdt.getMonth())
+       ? dateEOM(edt).getDate() // prorated within the month.
+       : 30); // prorated across months.
+    rent *= days / dim;
+    $('#Entry'+id+'Comment').val('Rent proration: '+days+'/'+dim+' days');
+  }
+
+  $('#Entry'+id+'Amount').val(fmtCurrency(rent));
 }
 
 function addChargeSource(flash) {
-  $("#debug").append('add charge source' + '<BR>');
   var id = $("#charge-entry-id").val();
   addDiv('charge-entry-id', 'charge', 'charges', flash,
 	 // HTML section
@@ -192,40 +262,42 @@ function addChargeSource(flash) {
 	 echo FormatHelper::phpVarToJavascript
 	 ($this->element('form_table',
 			 array('id' => 'Entry%{id}Form',
-			       'class'  => "item invoice ledger-entry entry",
+			       'class'  => "ChargeForm item invoice ledger-entry entry",
 			       //'with_name_after' => ':',
 			       'field_prefix' => 'Entry.%{id}',
 			       'fields' => array
 			       ("account_id"  => array('name' => 'Account',
 						       'opts' =>
-						       array('options' => $chargeAccounts,
+						       array('class' => 'ChargeFormAccount',
+							     'options' => $chargeAccounts,
 							     'value' => $defaultAccount,
 							     ),
+						       'between' => '<A HREF="#" ONCLICK="setNextRent(\'%{id}\'); return false;">Rent</A>',
 						       ),
 				"effective_date" => array('opts' =>
-							  array('type' => 'text'),
+							  array('class' => 'ChargeFormEffectiveDate',
+								'type' => 'text'),
 							  'between' => '<A HREF="#" ONCLICK="datepickerBOM(\'TransactionStamp\',\'Entry%{id}EffectiveDate\'); return false;">BOM</A>',
 							),
 				"through_date" => array('opts' =>
-							array('type' => 'text'),
+							array('class' => 'ChargeFormThroughDate',
+							      'type' => 'text'),
 							'between' => '<A HREF="#" ONCLICK="datepickerEOM(\'Entry%{id}EffectiveDate\',\'Entry%{id}ThroughDate\'); return false;">EOM</A>',
 							),
-				"amount"       => array('opts' => array('class' => 'invoice amount')),
+				"amount"       => array('opts' => array('class' => 'ChargeFormAmount invoice amount'),
-				"comment"      => array('opts' => array('size' => 50)),
+							'between' => '<A HREF="#" ONCLICK="prorate(\'%{id}\'); return false;">Prorate</A>',
+							),
+				"comment"      => array('opts' => array('class' => 'ChargeFormComment', 'size' => 50)),
 				),
 			       ))) . "+\n";
 	 ?>
 
 	 '</FIELDSET>'
 	 );
-  $("#debug").append('add div complete' + '<BR>');
 
-  $("#debug").append('add datepicker1' + '<BR>');
   datepicker("Entry"+id+"EffectiveDate");
-  $("#debug").append('add datepicker2' + '<BR>');
   datepicker("Entry"+id+"ThroughDate");
 
-  $("#debug").append('add charge source complete' + '<BR>');
   return id;
   }
 
@@ -251,7 +323,8 @@ if (empty($movein))
 					       array('gridstate' =>
 						     'onGridState("#"+$(this).attr("id"), gridstate)'),
 					       ),
-			'exclude' => array('Closed'),
+			'include' => array('Charge-Thru'),
+			'exclude' => array('Closed', 'Paid-Thru'),
 			'action' => 'active',
 			'nolinks' => true,
 			'limit' => 10,
@@ -348,90 +421,16 @@ Configure::write('debug', '0');
     $('tr td:nth-child('+col+'), tr th:nth-child('+col+')', this).remove();
   };
 
+  function addHidden(id, fld, name) {
+    $('#Entry'+id+fld).after
+      ('<input type="hidden"' +
+       ' name="data[Entry]['+id+']['+name+']"' +
+       ' value="' + $('#Entry'+id+fld).val() + '">');
+  }
+
   $(document).ready(function(){
-      $("#debug").append('doc ready2' + '<BR>');
       datepicker('TransactionStamp');
 
-      $("#lease-id").val(0);
-      $("#invoice-lease").html("INTERNAL ERROR");
-      $("#invoice-unit").html("INTERNAL ERROR");
-      $("#invoice-customer").html("INTERNAL ERROR");
-      $("#invoice-rent").html("INTERNAL ERROR");
-      $("#invoice-late").html("INTERNAL ERROR");
-      $("#invoice-deposit").html("INTERNAL ERROR");
-
-      <?php if (empty($movein)): ?>
-
-      $("#debug").append('movein empty' + '<BR>');
-      resetForm();
-      datepickerNow('TransactionStamp');
-
-      <?php else: ?>
-
-      $("#debug").append('movein not empty' + '<BR>');
-      var id;
-      resetForm(true);
-
-      $("#TransactionStamp").attr('disabled', true);
-      $("#TransactionStamp").val("<?php echo date('m/d/Y', $movein['time']); ?>");
-      $('#TransactionStamp').after
-	('<input type="hidden"' +
-	 ' name="data[Transaction][stamp]"' +
-	 ' value="<?php echo date('m/d/Y', $movein['time']); ?>">');
-      $("#TransactionComment").val('Move-In Charges');
-
-      <?php if ($movein['deposit'] != 0): ?>
-      id = addChargeSource(false);
-      $('#Entry'+id+'Form').removeCol(2);
-      $('#Entry'+id+'Form input, #Entry'+id+'Form select').attr('disabled', true);
-      $('#Entry'+id+'EffectiveDate').val("<?php echo date('m/d/Y', $movein['effective_time']); ?>");
-      $('#Entry'+id+'EffectiveDate').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][effective_date]"' +
-	 ' value="<?php echo date('m/d/Y', $movein['effective_time']); ?>">');
-      $('#Entry'+id+'AccountId').val(<?php echo $securityDepositAccount; ?>);
-      $('#Entry'+id+'AccountId').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][account_id]"' +
-	 ' value="<?php echo $securityDepositAccount; ?>">');
-      $('#Entry'+id+'Amount').val("<?php echo FormatHelper::currency($movein['deposit']); ?>");
-      $('#Entry'+id+'Amount').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][amount]"' +
-	 ' value="<?php echo FormatHelper::currency($movein['deposit']); ?>">');
-      //$('#Entry'+id+'Comment').val('Move-In Security Deposit');
-      $('#Entry'+id+'Comment').removeAttr('disabled');
-      <?php endif; ?>
-
-      id = addChargeSource(false);
-      $('#Entry'+id+'Form').removeCol(2);
-      $('#Entry'+id+'Form input, #Entry'+id+'Form select').attr('disabled', true);
-      $('#Entry'+id+'EffectiveDate').val("<?php echo date('m/d/Y', $movein['effective_time']); ?>");
-      $('#Entry'+id+'EffectiveDate').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][effective_date]"' +
-	 ' value="<?php echo date('m/d/Y', $movein['effective_time']); ?>">');
-      $('#Entry'+id+'ThroughDate').val("<?php echo date('m/d/Y', $movein['through_time']); ?>");
-      $('#Entry'+id+'ThroughDate').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][through_date]"' +
-	 ' value="<?php echo date('m/d/Y', $movein['through_time']); ?>">');
-      $('#Entry'+id+'AccountId').val(<?php echo $rentAccount; ?>);
-      $('#Entry'+id+'AccountId').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][account_id]"' +
-	 ' value="<?php echo $rentAccount; ?>">');
-      $('#Entry'+id+'Amount').val("<?php echo FormatHelper::currency($movein['prorated_rent']); ?>");
-      $('#Entry'+id+'Amount').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][amount]"' +
-	 ' value="<?php echo FormatHelper::currency($movein['prorated_rent']); ?>">');
-      $('#Entry'+id+'Comment').val("<?php echo($movein['prorated'] ? 'Move-In Rent (Prorated)' : ''); ?>");
-      $('#Entry'+id+'Comment').removeAttr('disabled');
-
-      <?php endif; ?>
-
-
       <?php if (isset($lease['id'])): ?>
       $("#lease-id").val(<?php echo $lease['id']; ?>);
       $("#invoice-lease").html("<?php echo '#'.$lease['number']; ?>");
@@ -440,6 +439,71 @@ Configure::write('debug', '0');
       $("#invoice-rent").html("<?php echo FormatHelper::currency($lease['rent']); ?>");
       $("#invoice-late").html("<?php echo FormatHelper::currency($defaultLate); ?>");
       $("#invoice-deposit").html("<?php echo FormatHelper::currency($lease['deposit']); ?>");
+      lease_charge_through = <?php
+	if ($lease['charge_through_date'])
+	  echo 'new Date("'.date('m/d/Y', strtotime($lease['charge_through_date'])).'")';
+	elseif ($lease['paid_through_date'])
+	  echo 'new Date("'.date('m/d/Y', strtotime($lease['paid_through_date'])).'")';
+	else
+	  echo 'dateYesterday("'.date('m/d/Y', strtotime($lease['movein_date'])).'")';
+      ?>;
+
+      <?php else: ?>
+      $("#lease-id").val(0);
+      $("#invoice-lease").html("INTERNAL ERROR");
+      $("#invoice-unit").html("INTERNAL ERROR");
+      $("#invoice-customer").html("INTERNAL ERROR");
+      $("#invoice-rent").html("INTERNAL ERROR");
+      $("#invoice-late").html("INTERNAL ERROR");
+      $("#invoice-deposit").html("INTERNAL ERROR");
+      <?php endif; ?>
+
+
+      <?php if (empty($movein)): ?>
+
+      resetForm();
+      datepickerNow('TransactionStamp');
+
+      <?php else: ?>
+
+      var id;
+      resetForm(true);
+
+      $("#TransactionStamp").attr('disabled', true);
+      $("#TransactionStamp").val("<?php echo date('m/d/Y', $movein['time']); ?>");
+      $('#TransactionStamp').after
+	('<input type="hidden"' +
+	 ' name="data[Transaction][stamp]"' +
+	 ' value="' + $("#TransactionStamp").val() + '">');
+      $("#TransactionComment").val('Move-In Charges');
+
+      <?php if ($movein['deposit'] != 0): ?>
+      id = addChargeSource(false);
+      $('#Entry'+id+'Form').removeCol(2);
+      $('#Entry'+id+'Form input, #Entry'+id+'Form select').attr('disabled', true);
+      $('#Entry'+id+'EffectiveDate').val("<?php echo date('m/d/Y', $movein['effective_time']); ?>");
+      addHidden(id, 'EffectiveDate', 'effective_date');
+      $('#Entry'+id+'AccountId').val(<?php echo $securityDepositAccount; ?>);
+      addHidden(id, 'AccountId', 'account_id');
+      $('#Entry'+id+'Amount').val("<?php echo FormatHelper::currency($movein['deposit']); ?>");
+      addHidden(id, 'Amount', 'amount');
+      $('#Entry'+id+'Comment').removeAttr('disabled');
+      <?php endif; ?>
+
+      id = addChargeSource(false);
+      $('#Entry'+id+'Form').removeCol(2);
+      $('#Entry'+id+'Form input, #Entry'+id+'Form select').attr('disabled', true);
+      setNextRent(id);
+      addHidden(id, 'EffectiveDate', 'effective_date');
+      addHidden(id, 'ThroughDate', 'through_date');
+      addHidden(id, 'AccountId', 'account_id');
+      addHidden(id, 'Amount', 'amount');
+      $('#Entry'+id+'Comment').removeAttr('disabled');
+
+      <?php endif; ?>
+
+
+      <?php if (isset($lease['id'])): ?>
       onGridState(null, 'hidden');
       <?php else: ?>
       onGridState(null, 'visible');

site/views/maps/view.ctp

@@ -6,6 +6,19 @@
  {// for indentation purposes
    // Go through each unit, adding a clickable region for the unit
    foreach ($info['units'] AS $unit){
+     $title = ('Unit #' .
+	       $unit['name'] .
+	       (empty($unit['data']['CurrentLease']['id'])
+		? ''
+		: ('; ' .
+		   /* 	      'Lease #' . */
+		   /* 	      $unit['data']['CurrentLease']['id'] . */
+		   /* 	      '; ' . */
+		   $unit['data']['Customer']['name'] .
+		   '; Paid Through ' .
+		   $unit['data']['CurrentLease']['paid_through_date'])
+		));
+
      echo('    <area shape="rect"' .
 	  ' coords="' .
 	  $unit['left']   . ',' .
@@ -16,20 +29,8 @@
 	  $html->url(array('controller' => 'units',
 			   'action'     => 'view',
 			   $unit['id'])) .
-	  '" alt="Unit #' .
+	  '" alt="' . $title .
-	  $unit['name'] .
+	  '" title="' . $title .
-	  '" title="Unit #' .
-	  $unit['name'] .
-	  (empty($unit['data']['CurrentLease']['id'])
-	   ? ''
-	   : ('; ' .
-/* 	      'Lease #' . */
-/* 	      $unit['data']['CurrentLease']['id'] . */
-/* 	      '; ' . */
-	      $unit['data']['Customer']['name'] .
-	      '; Paid Through ' .
-	      $unit['data']['CurrentLease']['paid_through_date'])
-	   ) .
 	  '">' . "\n");
    }
  }// for indentation purposes

site/views/tenders/view.ctp

@@ -33,11 +33,13 @@ for ($i=1; $i<=4; ++$i)
   if (!empty($ttype["data{$i}_name"]))
     $rows[] = array($ttype["data{$i}_name"], $tender["data{$i}"]);
 
-if (!empty($tender['deposit_transaction_id']))
+$rows[] = array('Deposit',
-  $rows[] = array('Deposit',     $html->link('#'.$tender['deposit_transaction_id'],
+		empty($tender['deposit_transaction_id'])
-					     array('controller' => 'transactions',
+		? "-"
-						   'action'     => 'deposit_slip',
+		: $html->link('#'.$tender['deposit_transaction_id'],
-						   $tender['deposit_transaction_id'])));
+			      array('controller' => 'transactions',
+				    'action'     => 'deposit_slip',
+				    $tender['deposit_transaction_id'])));
 
 if (!empty($tender['nsf_transaction_id']))
   $rows[] = array('NSF',         $html->link('#'.$tender['nsf_transaction_id'],

site/webroot/css/print.css

@@ -16,6 +16,14 @@ div#debug-kit-toolbar
  { display: none; }
 
 
+/************************************************************
+ * Form inputs
+ */
+
+/* The "page N / M" input box... make it look like normal text */
+input[type='button'], input[type='submit'], input[type='reset']
+ { display: none; }
+
 /************************************************************
  * Grid display
  */

site/webroot/js/pmgr.js

@@ -67,7 +67,17 @@ function dump(element, limit, depth) {
     if (props.length == 0)
 	return '';
 
-    return pad + '<ol><li>' + props.join("</li>\n" + pad + pad1 + "<li>") + "</li>\n" + pad + "</ol>";
+    if (typeof dump.dumpid == 'undefined')
+        dump.dumpid = 0;
+
+    ++dump.dumpid;
+    return (pad
+	    + '<A HREF="#" ONCLICK="$(\'#dumpid-'+dump.dumpid+'\').toggle(); return false;">(hide members)</A><BR>'
+	    + '<ol id="dumpid-'+dump.dumpid+'" STYLE="padding-top:0; margin-top:0;">'
+	    + '<li>'
+	    + props.join("</li>\n" + pad + pad1 + '<li id="dumpid-'+dump.dumpid+'">')
+	    + "</li>\n"
+	    + pad + "</ol>");
 }
 
 function dump_window(element, limit) {
@@ -158,70 +168,103 @@ function datepicker(id) {
     }
 }
 
-
+function datepickerGet(id) {
-function datepickerNow(id, usetime) {
+  if (id == null)
-  var now = new Date();
-  if ($("#"+id).datepicker != null) {
-      // datepicker seems to squash the time portion,
-      // so we have to pass in a copy of now instead.
-      $("#"+id).datepicker('setDate', new Date(now));
-  }
-  else {
-      $("#"+id).val(((now.getMonth()+1) < 10 ? '0' : '')
-		    + (now.getMonth()+1) + '/'
-		    + (now.getDate() < 10 ? '0' : '')
-		    + now.getDate() + '/'
-		    + now.getFullYear());
-  }
-
-  if (usetime == null)
-      usetime = true;
-
-  $("#"+id).val($("#"+id).val() +
-		(usetime
-		 ? (' '
-		    + (now.getHours() < 10 ? '0' : '')
-		    + now.getHours() + ':'
-		    + (now.getMinutes() < 10 ? '0' : '')
-		    + now.getMinutes())
-		 : ''));
-}
-
-function datepickerSet(fromid, id, a, b) {
-  var dt;
-  if (fromid == null)
     dt = new Date();
   else {
-      if ($("#"+id).datepicker != null)
+    if ($("#"+id).datepicker != null && $("#"+id).datepicker('getDate') != null)
-	  dt = new Date($("#"+fromid).datepicker('getDate'));
+      dt = new Date($("#"+id).datepicker('getDate'));
-      else
+    else if ($("#"+id).val())
-	  dt = new Date($("#"+fromid).val());
+      dt = new Date($("#"+id).val());
+    else
+      dt = null;
   }
 
-  if (a != null)
+  return dt;
-    dt.setDate(a);
+}
-  if (b != null)
-    dt.setDate(b);
 
-  if ($("#"+id).datepicker != null)
+function datepickerStr(id) {
-      $("#"+id).datepicker('setDate', dt);
+  return dateStr(datepickerGet(id));
+}
+
+function datepickerSet(id, dt_or_str, usetime) {
+  if ($("#"+id).datepicker != null && $("#"+id).datepicker('getDate') != null) {
+      // datepicker seems to squash the time portion,
+      // so we have to pass in a copy of dt instead.
+      $("#"+id).datepicker('setDate', new Date(dt_or_str));
+      if (usetime)
+	  $("#"+id).val($("#"+id).val() + ' ' + timeStr(dt_or_str));
+  }
   else {
-      $("#"+id).val(((dt.getMonth()+1) < 10 ? '0' : '')
+      $("#"+id).val(dateStr(dt_or_str), usetime);
-		    + (dt.getMonth()+1) + '/'
-		    + (dt.getDate() < 10 ? '0' : '')
-		    + dt.getDate() + '/'
-		    + dt.getFullYear());
   }
 }
 
-function datepickerBOM(fromid, id) {
+function datepickerNow(id, usetime) {
-  datepickerSet(fromid, id, 1);
+  datepickerSet(id, new Date(), usetime == null ? true : usetime);
 }
 
-function datepickerEOM(fromid, id) {
+function dateStr(dt_or_str, usetime) {
-  datepickerSet(fromid, id, 32, 0);
+  var dt = new Date(dt_or_str);
+
+  return (((dt.getMonth()+1) < 10 ? '0' : '')
+	  + (dt.getMonth()+1) + '/'
+	  + (dt.getDate() < 10 ? '0' : '')
+	  + dt.getDate() + '/'
+	  + dt.getFullYear()
+	  + (usetime ? ' ' + timeStr(dt) : ''));
 }
 
+function timeStr(dt_or_str) {
+  var dt = new Date(dt_or_str);
+
+  return ((dt.getHours() < 10 ? '0' : '')
+	  + dt.getHours() + ':'
+	  + (dt.getMinutes() < 10 ? '0' : '')
+	  + dt.getMinutes());
+}
+
+function dateAdd(dt_or_str, a, b, m, d) {
+  var dt = new Date(dt_or_str);
+  if (m != null) {
+    dt.setDate(1);
+    dt.setMonth(dt.getMonth() + m);
+    //$('#debug').append('set month ('+m+') ' + (dt.getMonth() + m) + '= ' + dt + '<BR>');
+  }
+  if (d != null) {
+    dt.setDate(dt.getDate() + d);
+    //$('#debug').append('set day ('+d+') ' + (dt.getDate() + d) + '= ' + dt + '<BR>');
+  }
+  if (a != null) {
+    dt.setDate(a);
+    //$('#debug').append('set date ('+a+') = ' + dt + '<BR>');
+  }
+  if (b != null) {
+    dt.setDate(b);
+    //$('#debug').append('set date ('+b+') = ' + dt + '<BR>');
+  }
+  return dt;
+}
+
+function dateYesterday(dt) { return dateAdd(dt,null,null,null,-1); }
+function dateTomorrow(dt)  { return dateAdd(dt,null,null,null,1); }
+function dateBOM(dt)       { return dateAdd(dt,1);        }
+function dateNextBOM(dt)   { return dateAdd(dt,1,null,1); }
+function dateEOM(dt)       { return dateAdd(dt,32,0);     }
+function dateNextEOM(dt)   { return dateAdd(dt,32,0,1);   }
+
+function datepickerBOM(fromid, id)
+{ datepickerSet(id, dateBOM(datepickerGet(fromid))); }
+
+function datepickerEOM(fromid, id)
+{ datepickerSet(id, dateEOM(datepickerGet(fromid))); }
+
+function datepickerNextBOM(fromid, id)
+{ datepickerSet(id, dateNextBOM(datepickerGet(fromid))); }
+
+function datepickerNextEOM(fromid, id)
+{ datepickerSet(id, dateNextEOM(datepickerGet(fromid))); }
+
 
 // REVISIT <AP>: 20090617
 //  I would rather use XML to pass from JS to PHP, but at the

todo.notes

@@ -1,195 +0,0 @@
-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.
-
-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.
-
-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.
-
-Implement, as part of the User model, a function to return the
-security level.  Have it be a static function, so that we don't
-need to instantiate it, and right now, return a level based on
-the route.
-
-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.
-
-