abijah
|
af0c10f6a6
|
D:\bin\svnbranch.pl: Branch from /branches/invoice_receipt_20090629 to /branches/yafr_20090716
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@351 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-16 18:52:28 +00:00 |
|
abijah
|
115c82cd21
|
Still trying to figure out what issuing a refund should look like. I switched the entry to be negative, which may (should) make reporting easier.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@350 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-16 07:27:18 +00:00 |
|
abijah
|
331e235e77
|
Added debugging to the serialize function. I don't really want to keep it, but I don't want to lose it either. At least one check in before I clean it up again (if I do).
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@349 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-16 07:12:18 +00:00 |
|
abijah
|
d0dfd8657c
|
Added some starter code to figure out how we handle refunds. This is NOT working, just a snapshot of progress.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@348 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 18:37:51 +00:00 |
|
abijah
|
4d4bebc3d3
|
Added a couple helper functions to Ledger.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@347 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 18:33:30 +00:00 |
|
abijah
|
ae04aafaca
|
Eliminated the LedgerEntry::nsf code, which was replaced with MonetarySource::nsf.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@346 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 18:32:14 +00:00 |
|
abijah
|
fcb23d12a5
|
minor cleanup of the paid through function
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@344 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 09:22:19 +00:00 |
|
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
|
85cc6d7c6a
|
Changed the default collected results to be those collected into any account, not just payable ones.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@342 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 08:01:56 +00:00 |
|
abijah
|
e457f87c42
|
Fixed bug preventing customer links from working
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@341 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 07:55:40 +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
|
51d786ab8b
|
Added generic mechanism to add userdata to the grid results. A 'userdata' callout function would be nice, but in practice, userdata may get added anywhere along the line, which is much easier than trying to figure out when to call such a callout and what parameters it would need to be passed.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@338 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 07:44:51 +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
|
2588fd6a91
|
A final attempt to reconcile the cash in the bank account. It just wasn't designed this way, so I'll strip it out on the next checkin.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@333 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 01:33:06 +00:00 |
|
abijah
|
3baa199fda
|
Multiple e6 entries now ensure that NSF reconciles appropriately to e1 such that the lease is correctly taken into account.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@332 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 01:05:44 +00:00 |
|
abijah
|
68a10e783b
|
getting closer to a workable NSF solution. I don't like it, but it might allow us to move forward in the short term. This solution required a stupid kludge to get CakePHP to work with the necessary query, which sucks but is not too cumbersome. What isn't working at the moment, is for the NSF to show up on the lease account, which is what I'll try to work out next. Also, the monies deposited are not trackable, since I'm not reconciling them (due to the sign flip). Not sure if there is an easily workable solution. Also, to get the collected rent report to show this negative income, it requires the bank account be part of the query, which I accomplish in the short term by setting the 'payable' flag. I may need to fix/kludge this by running the NSF through the receipt account and adding the NSF account to the list on the collected page.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@331 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 00:21:23 +00:00 |
|
abijah
|
34e3251240
|
Just updated the comments, and added e2a and e1 into the query. No functional change yet.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@330 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-14 21:44:19 +00:00 |
|
abijah
|
01aa2d1697
|
The NSF functionality is working good from a strictly general ledger point of view. However, as it's implemented, it's leaving us unable to observe that we've actually experienced negative collected rent. This is a big problem, but I've put a couple notes in place on how I might try to proceed on this next, and am checking in this semi-working version.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@329 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-14 20:48:16 +00:00 |
|
abijah
|
69b3cf3ed3
|
Implementing NSF in MonetarySourcesController. It's nowhere near done, but it seems we're headed in the right direction.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@328 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-13 10:14:38 +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
|
f960349e0f
|
Definitely not yet what we need for reversing charges, but at least the recursive nature seems to be in the right direction.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@326 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-13 04:41:18 +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
|
8039495e18
|
Added a couple more virtual functions for more controller flexibility.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@319 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-12 18:34:24 +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
|
14ab0975ac
|
Eliminated the unnecessary $A Account variable in the actual Account model (duh)
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@316 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 16:50:13 +00:00 |
|
abijah
|
06bf383707
|
Added a file with some javascript date/time routines. I don't think we want it, but at the same time, I can't bring myself to toss it. May as well capture a revision and I can delete it later.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@314 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 15:54:44 +00:00 |
|
abijah
|
e29c2ba927
|
Added flag to allow ledger entry reversals, regardless of the reconciled status. I'm not sure how we really want to handle reversals.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@312 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 15:50:48 +00:00 |
|
abijah
|
cec4fb4fdd
|
Added debug link to create all new ledgers
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@311 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 15:37:52 +00:00 |
|
abijah
|
d5c80a65b3
|
Forgot to check in the model as part of the last change set. Guess that's what happens when you're tired.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@310 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 15:37:17 +00:00 |
|
abijah
|
0c0033d1f5
|
Added mechanism to reverse a ledger entry. For now I've restricted it to those ledger entries that have not already been reconciled in some way. More thought will have to go into this, especially with respect to tenants who have pre-paid and then move out early.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@309 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 09:06:36 +00:00 |
|
abijah
|
d683895413
|
Eliminated the need for the Invoice Account. I'm having a bit of a hard time believing that it works, since it sure seems like we needed the Invoice account for some reason. However, it's entirely possible that we really just had it for symmetry with Receipt (another account which we'd love to delete). It needs more testing, but it works good enough to check in.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@308 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 08:23:55 +00:00 |
|
abijah
|
f7b81ec615
|
Not terribly happy with the solution to the extra transactions problem noted on the last checkin (however, it does seem to be working). I simply keep a record of the split transaction id, pass it back to the caller, and expect it to be passed back in. Works for now, even if it isn't terribly elegant.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@307 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 08:10:23 +00:00 |
|
abijah
|
aa36213698
|
Moved invoice/receipt code into Account. It appears to be broken in that the receipt ledger_entries are all getting a uniqe transaction. I'll have to look at this tomorrow.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@306 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 07:26:17 +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
|
b96a8f01da
|
Fixed the bank deposit, which was not reconciling the income received with the actual deposit. Thus, there was no way to determine when a particular check, for example, was actually deposited in the bank... the trail was broken. This seems to work. I would like to move some of the logic in Transaction to simply use the Account::postLedgerEntry function, but I'll not do it just yet... other fish and all.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@303 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-11 01:44:46 +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
|
b9a67fa8e1
|
Fixed bug with undefined Lease.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@298 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-10 10:51:57 +00:00 |
|
abijah
|
6c89536073
|
Changed security deposits to be returned regardless of where second half of the ledger entry is
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@297 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-10 10:49:19 +00:00 |
|