abijah
|
dd7da1489d
|
Added a paid-through field for leases. Now I just need to add it to the grid query, although it's a change that can wait.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@343 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 09:18:56 +00:00 |
|
abijah
|
e8d12882cc
|
Fixed the total amount collected to reflect the _actual_ total, not just the page total. Now the grid no longer needs to be 500 rows long.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@340 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 07:47:13 +00:00 |
|
abijah
|
8f2b43239d
|
Added a 'Calculating...' message before the grid has rendered.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@339 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 07:45:23 +00:00 |
|
abijah
|
6f4519fe56
|
Layout manipulation to the collected page.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@337 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 07:13:41 +00:00 |
|
abijah
|
69adfd900c
|
Standardized the grid events interface, to ease the burden on the views and ensure that the load functions could be used by the application without wiping out the debug functionality that was built into jqGrid.ctp
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@336 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 06:21:55 +00:00 |
|
abijah
|
33ba912a7e
|
Fixed the balance summary of the collected report, and marked off NSF and collected report requirements.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@335 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 05:42:10 +00:00 |
|
abijah
|
c4942b922b
|
Finally, a working NSF implementation. Ledger Entry tracking stops at the Bank account, since we switch from positive to negative ledger entries. However, we're not going to reconcile debits to credits in the bank account anyway, so I just disabled tracking on the account.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@334 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 03:06:59 +00:00 |
|
abijah
|
3551ad0603
|
Added a ledger entry listing on the monetary source view page.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@327 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-13 09:54:49 +00:00 |
|
abijah
|
4ad4033e4f
|
Fix to the sub-total column, which wasn't working for ledgers that have both debits and credits (and thus need a sub-total of balance, not amount
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@325 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-13 04:40:21 +00:00 |
|
abijah
|
00cff7bb3a
|
A working version of the collected report for accounts. There is still some error checking to do, since we don't want this report for just any account. Also, we may wish to do away with the form to prevent accidental submittal. Finally, it would be nice to do away with the button, and automatically update on date changes.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@324 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-13 02:24:31 +00:00 |
|
abijah
|
3ffa3c81bb
|
Fixed the last bug... I had just forgotten to use ReceiptTransaction for the dates in question. Also, I elminated the collected element, and just added a minor tweak to ledger_entries to make it work. I'll work on added user entered dates & accounts soon (perhaps next).
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@323 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-12 21:00:38 +00:00 |
|
abijah
|
886a63773e
|
Experiment with converting the 'collected' grid results to be a query of the rent ledger entries that resolve out to payments, instead of payment entries that resolve rent entries. It's a subtle difference, but gives a couple benefits. First, rent looks like rent, meaning that if someone paid $30 in rent over 6 days at $5 per day, the collected rent entry shows $30, not 6 entries of $5. Depending on your perspective, that can be a good or bad thing. Since we're looking at collected entries of an account, I think each account entry should only get one line, so this seems like it's a logical fit. The second thing is that I might be able to do away with a collected page altogether, and simply add a 'collected' column to each account/ledger. Not sure on that, especially since we'll be wanting a date range, and probably a selection of which accounts consititute payment (such that the user could simply see rent collected in cash or similar). In any event, this is NOT working at the moment, I seem to be getting invalid data. To figure this out, I'm going to check in now, revert back, and print the results for reference, since it was working before this change, back at r320
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@322 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-12 20:23:46 +00:00 |
|
abijah
|
dc79667dca
|
New generic mechanism for subtotaling columns. This is NOT an ideal solution, as it only subtotals for the current grid page. Hopefully we can get something better into the app controller at some point
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@321 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-12 20:15:56 +00:00 |
|
abijah
|
46417de2b8
|
Implemented a list that checks for collected rents. There is AccountsController::collected, which I'm keeping at the moment, but I decided to move the logic into ledger_entries, since ultimately that's what we want a list of and it doesn't make sense to add a bunch of LedgerEntry logic into the jqGrid query of AccountsController. Of course, right now there is hardcoded calendar functions, and hardcoded exclusion of the Concession Account. I will probably offer up two calendars to provide a range, and a list of checkboxes of each payable account.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@318 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-12 18:01:01 +00:00 |
|
abijah
|
ad3d1c92bf
|
Fixed stupid syntax error
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@305 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 07:24:14 +00:00 |
|
abijah
|
fa17e319e0
|
Fixed a bug causing leder_entry lists to only list one item from each transaction (although the numbers were right, the other ledger_entry fields were not). This was due to the changes I made to ledger_entries.ctp when moving everything to the Grid Helper. Prior to that, the default was to group by transactions, unless notxgroup was defined. Since it was experimental, it was hardcoded to false in the ledger_entries element, so there was no problem. After Grid Helper, it was inadvertantly deleted, hence the bug. I changed the default to be NOT to group by transaction, and also invalidate the ledger_entry fields when we do group that way. So, this bug should be put mostly to rest, although I don't like converting the ledger_entry list into a simple transaction list (we do have another element for that after all). Oh well, works for now.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@304 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 01:52:32 +00:00 |
|
abijah
|
62b27ec255
|
clean up lingering comments.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@302 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 00:46:31 +00:00 |
|
abijah
|
30292bb4f5
|
Final tweaks (for now) to ledger entry view. Hopefully didn't break other summary boxes.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@301 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 00:45:17 +00:00 |
|
abijah
|
0d3403032c
|
More changes to the ledger_entry view
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@300 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 00:34:43 +00:00 |
|
abijah
|
42dda55643
|
No real visible changes, but started work on making ledger entries more clear. I'll do more in a moment, just capturing a snapshot.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@299 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-10 21:21:49 +00:00 |
|
abijah
|
43382f4ab1
|
Implemented bad debt write-off. This was tested about as well as the last checkin for security deposit utilization. Also, both of these need a redirect. I'm thinking redirect will have to be controlled dynamically, since we probably want to have them in a sequence of pages daisy changed at move out. Of course, we also will allow them each to be run on their own individually.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@295 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-10 10:06:56 +00:00 |
|
abijah
|
b79df98d36
|
Forgot to add apply_deposit.ctp to the last checkin.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@294 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-10 09:35:50 +00:00 |
|
abijah
|
99904f22bb
|
Stripped security deposits out of the Receipt page (and bad debt too). Added a dedicated security deposit utilization page. Works, I think, but my eyes are closing and it really needs fresh eyes again in the morning.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@293 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-10 09:28:29 +00:00 |
|
abijah
|
bcbe3767e3
|
Check in the near completed implementation of security deposit utilization. It was on it's way to working well (although it only works for existing payment divs and there is not an obviously easy way for new payment divs to have the security deposit info as well). It feels like we've really gone overboard on the payment screen, pushing too much together. I'm going to strip some of this out on the next checkin, and create a dedicated security deposit utilization screen, perhaps just as part of move-out, or perhaps part of move-out and as an independent operation as well.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@292 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-10 07:25:55 +00:00 |
|
abijah
|
ba82eabcbc
|
Fixed a bug created with each form table when that element was modified to ignore fields set to null. The original intention was that null simply meant 'no special configuration'. However, we needed a way to programatically enable/disable fields, so null was an obvious choice to use. Now that I'm about to check in, I think I should have just made a minor change to use false to skip a field, which would have been backwards compatible (except for the one place using null to exclude the field). However, it's done now, so what the heck.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@290 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 16:07:19 +00:00 |
|
abijah
|
e15f053c5c
|
Changed the list of payment types to be dynamically generated. This works OK, but the list is longer than is probably useful, and more importantly, some of these types need to be associated with a lease, such as a security deposit. Not sure how I'll handle that.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@289 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 09:20:04 +00:00 |
|
abijah
|
0c8035b402
|
Removed monetary_source_type. It was redundant, and it's entirely unclear what purpose it ultimately would or could serve. Our use of different accounts for Check, Cash, etc likely obsoleted any intention we might have had for monetary_source_type
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@288 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 08:28:34 +00:00 |
|
abijah
|
fb29380ac5
|
Added ACH and Concession entry. Like everything else, I haven't tested too robustly, but it does seem to work. I might want to change the monetary source id for Concession. Right now each concession gets its own monetary source, but we could probably use a common one without issue.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@284 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 06:10:00 +00:00 |
|
abijah
|
a45fd6879d
|
Removed the comment from lease move-out, and tweaked the form_table to support it
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@277 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 02:57:29 +00:00 |
|
abijah
|
09090d1b3c
|
Consolidated the move out/in pages. I'm really not happy with this checkin, as it has actually reduced functionality. We used to be able to click move-out on a customer and be presented with a list of units to move out of. This was the intention, but I've gotten frustrated with the fact that I'm working on non-MUST functionality. Things are working good enough at the moment, so I'm checking in and will have to come back to this later.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@276 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 02:19:14 +00:00 |
|
abijah
|
dbd914ff78
|
Changed move_out to use datepicker in the same way as move_in. I'll probably be wiping this out later to have move_out behave more like move_in and present customer and unit selection boxes.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@273 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 00:40:24 +00:00 |
|
abijah
|
222758b20f
|
Modified the datepickerNow() function to return results without the time (just date). Updated the move_in datepicker to use it and added a link for the user.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@272 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 00:31:56 +00:00 |
|
abijah
|
233b08df59
|
Made the same layout changes from H2 to CSS with the move_in page
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@271 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 00:21:48 +00:00 |
|
abijah
|
849077bb9a
|
Made layout changes to invoices and receipts to use CSS instead of simple H2/H3 tags. Also, as a temporary measure, I make the lease/customer numbers hyperlink to the view page. At some point we'll figure out what should happen after entering a receipt or invoice, and this hack should go away.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@270 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 00:00:29 +00:00 |
|
abijah
|
75c44d1b3a
|
Removed the pages controller and view, as well as the default route. I can't believe I let it linger for so long...
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@268 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-08 23:30:13 +00:00 |
|
abijah
|
7e0d8a9da2
|
Modified which columns are displayed for ledger entries
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@263 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-08 20:57:11 +00:00 |
|
abijah
|
4d123b63f0
|
Moved all grid elements onto the grid helper. Basic testing done, but more testing needs to be done.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@262 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-08 20:40:44 +00:00 |
|
abijah
|
a88f5829ce
|
Moved the leases element onto the new grid helper.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@261 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-08 19:22:22 +00:00 |
|
abijah
|
5c29200428
|
Minor tweak to allow more size selections in the drop down list.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@260 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-08 19:19:42 +00:00 |
|
abijah
|
33fa8e732c
|
The grid helper now functions. We may need to tweak it when looking at some of the more complicated elements like ledger_entries.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@259 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-08 19:19:05 +00:00 |
|
abijah
|
6c62d66068
|
Actually, we need to get away from calling things jqGrid except at the lowest point. We don't want to switch vendors and have all these items continuing to be called jqGrid. Just Grid will work.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@258 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-08 17:35:36 +00:00 |
|
abijah
|
4e2b073110
|
Added a helper to jqGrid, since duplicated code is getting spread through each element. The implementation is nowhere near complete, but the basic idea is there.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@257 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-08 17:33:43 +00:00 |
|
abijah
|
abd166cb98
|
Modified effective dates to be part of the ledger entry, not the transaction. This is the logically correct way, as a transaction is simply a collection of entries which might be anywhere from completely aligned to totally disjoint from one another (more likely the former). As a practical example, consider a move-in invoice, with security deposit (effective immediately with no end date), a prorated rent (effective move-in day through the end of the first month), and first full months rent (effective beginning of next month through the end of next month). There is certainly more work to be done on this, and testing was minimal. It does seem to be functioning though, so I'm checking in.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@256 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-08 16:04:53 +00:00 |
|
abijah
|
c455b383f5
|
Updated the balance algorithm for units and customers as was done for leases.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@253 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-08 00:34:03 +00:00 |
|
abijah
|
011c05d098
|
Implemented the balance field of Leases as part of a single query. This not only reduces the number of queries required, it also allows balance to be a sortable column, so that we can determine which customers are overdue.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@251 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-07 16:08:56 +00:00 |
|
abijah
|
aa2e647199
|
Added mechanism for user to know the rent amount on the invoice screen.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@250 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-07 09:00:54 +00:00 |
|
abijah
|
9c65d408fa
|
Added a flag to accounts, indicating whether they can be used for charges and/or payments. Invoice has already switch to this mechanism, but we're keeping receipt the same for now since I have bigger fish to fry.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@247 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-07 07:52:41 +00:00 |
|
abijah
|
ae85ed7907
|
Experiment to provide a fieldset around the transaction details. I didn't care too much for the looks of it, so I commented it out for the moment. Ultimately though, there is going to be confusion over having two comment fields, so if we intend to keep them both, we'll need to clearly distinguish the purpose of each.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@246 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-07 07:21:22 +00:00 |
|
abijah
|
019b97fe53
|
Modified to dynamically determine eligible charge accounts, instead of the two that were hardcoded.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@244 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-07 07:14:18 +00:00 |
|
abijah
|
ae442db01f
|
First pass at having invoice support multiple charges, just like receipt/payment. It works well, but I know we still need a better solution for income accounts, and it hasn't been robustly tested yet.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@243 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-07 04:37:04 +00:00 |
|