abijah
|
36f439ff38
|
Added ability to toggle between one big closing ledger entry, and one per house
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@390 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-25 08:08:47 +00:00 |
|
abijah
|
7a42bee8ef
|
Added transaction stats. Added (possibly unwanted) columns.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@389 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-25 08:06:50 +00:00 |
|
abijah
|
0170dbc310
|
Fixed yet another bug in the merging of actions & options
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@388 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-25 07:57:56 +00:00 |
|
abijah
|
b820929ddc
|
Made progress adapting the receipt code onto the latest db changes.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@387 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 07:43:42 +00:00 |
|
abijah
|
e448519a1e
|
I accidentally tried to cehck in tender.php instead of the intended tender_type.php
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@383 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 03:58:57 +00:00 |
|
abijah
|
991d4d717e
|
Modified the application to reflect the changed field names in the accounts table. For example, payable is now payments.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@380 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 03:22:56 +00:00 |
|
abijah
|
446ba0ce28
|
Added a much more user friendly way to present the data1-4 labels for each type, now that we have a tender_types table. Still not a perfect solution, but definitely good enough for now. Modified the application to recognize the new tender_types table. There may be other modifications necessary, but this gets the most obvious spot.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@378 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 02:07:43 +00:00 |
|
abijah
|
127f7f3eb9
|
Finally resolved the StatementEntries::stats() query issue. It has been lingering in an incomplete state because it wasn't clear what it was supposed to really do. I think it is now performing the task expected of it.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@374 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 23:52:59 +00:00 |
|
abijah
|
5cf40147d9
|
First pass implementation at generating an invoice, which seems to be working. Largely untested, but worth checking in. Next is to get receipts using the same algorithm, and after that will be to work on a reconciling mechanism, creating payments, and matching them to charges. This checkin includes an additional customer_id fields as part of the transactions table. I think it was an oversight not to be there, as we need some way to keep track of monies which have been paid by a customer, yet not applied. If there is a different way to do it (short of actually having each ledger entry hold customer_id), it escapes me at the moment.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@372 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 21:24:49 +00:00 |
|
abijah
|
4a94fc3798
|
More tweaking to all of the grid displays. This was mostly visual, but includes some bug fixes as well (such as a manual filter override in the ledger_entries controller).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@371 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 16:53:33 +00:00 |
|
abijah
|
43b4ef8890
|
Yet another tweak to Linkable for merging fields and conditions of the options and associations variables.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@369 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 16:35:53 +00:00 |
|
abijah
|
25bc1607cc
|
Many, many changes, and yet still much to do. Many things are working, but certainly nothing beyond simply data retrieval (no editing or adding of any data). Also, some work is still required to ensure the grids have the right columns; we can strip out certain columns for some views (such as removing customer from the leases grid of the customer view... completely redundant). And of course, there are still many bugs and lots to clean up.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@368 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 01:49:46 +00:00 |
|
abijah
|
8db607ffc5
|
Of course, the last fix didn't work... I don't know why it looked like it was working. This fix should resolve the issue.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@364 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-22 23:12:04 +00:00 |
|
abijah
|
030617713d
|
Attempted fix for a missing conditions/fields bug. The fix would probably have just been to use empty instead of isset, since apparently the defaults for these items are an empty string instead of null (yuck). However, I already had done a bit of minor logic change and prefer the new form, so that's why more than just the isset call was modified.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@363 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-22 22:54:02 +00:00 |
|
abijah
|
1e359f816c
|
Fixed the Linkable behavior from polluting the query fields when performing a count query.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@362 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-22 22:27:55 +00:00 |
|
abijah
|
f52fba96c1
|
Making progress. Much still to do, but there are hints of functionality finally returning so I'm snapshotting.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@360 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-21 10:23:52 +00:00 |
|
abijah
|
5a16e497ad
|
Customers is working somewhat. I want to see if the grid query logic can be simplified, so I'm checking in first
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@359 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-21 09:40:51 +00:00 |
|
abijah
|
d5bcd9a496
|
Another snapshot
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@356 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-20 23:35:11 +00:00 |
|
abijah
|
bfbf119aca
|
Modified Linkable to be recursive, which is needed to support certain queries that have models joined based on prior joined models. The old way went breadth first, which prevented such a join from working
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@355 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-20 20:22:06 +00:00 |
|
abijah
|
7181bc7f9b
|
Minor logic and formatting changes. Considering making Linkable operate recursively.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@354 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-20 19:00:54 +00:00 |
|
abijah
|
7304a0e889
|
Another snapshot. I think I'll be taking the CREDIT/DEBIT reconcile functionality out.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@353 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-20 02:17:54 +00:00 |
|
abijah
|
3d262fd4db
|
This rework is nowhere near complete, but there are certain things that are falling in place, and worth capturing. I started a branch for just this purpose of being able to check in intermediate work.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@352 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-19 23:35:25 +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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
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
|
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
|
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
|
55413590a2
|
Shouldn't check this garbage in, but I can't bring my self to revert it
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@287 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 07:50:44 +00:00 |
|