abijah
|
90ecbda541
|
Several minor changes including a couple minor bugfixes.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@592 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-17 02:15:02 +00:00 |
|
abijah
|
080c82fc10
|
More bug fixes, especially around reversals of charges that have been paid from something other than customer money (such as waivers). I suspect it still will not work correctly for concession, depending on your point of view. Either concession should not count as customer credit, since they never paid that money, or it should since they were told they would get $X off, and upon charge reversal, they no longer get the credit. It seems they would only get the credit when reversing a mistaken charge, in which case, the user can manually provide a new concession.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@588 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 22:35:02 +00:00 |
|
abijah
|
754cdb8522
|
Fixed bug with NSF, which was failing to locate the nsf_entry_id. To resolve this, I added the original data into the return structure for each item, instead of just the created IDs. Also, added NsfTender to the Transaction model to locate which Tender an NSF transaction relates to.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@583 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 18:59:16 +00:00 |
|
abijah
|
892618db36
|
I need to check again in the morning, but it seem like this is finally what we need for reversals. Of course, we're still using A/P as a temporary solution. If we do indeed move forward with this sort of solution (dedicated customer credit account), then we'll have to create a new account fairly soon.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@580 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 09:31:19 +00:00 |
|
abijah
|
a968d7abe6
|
Changed the explicit receipt amount to be driven from stats instead of the assignCredits return value. This is in anticipation of creating an explicit credit directly, without even calling assignCredits. I'll do that for reversal on the next checkin.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@577 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 04:43:34 +00:00 |
|
abijah
|
8b6b8884f7
|
More good progress on reversals. There is still an issue where after reversing, a disbursement can be applied to a new charge from the old charge account, instead of the surplus account. I'll work on that next.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@576 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 03:56:36 +00:00 |
|
abijah
|
14805190fc
|
Added back in the logic to simply update an existing explicit credit instead of creating an additional one. At the moment, I can't think of a scenario for this other than when reversing charges, which is still broken. So, until I make progress on that, it's not even clear this changes is needed, let alone whether it works.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@575 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 02:22:45 +00:00 |
|
abijah
|
a1bdecfcaa
|
More tweaks to the addTransaction algorithm, working on a solid plan for customer surplus
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@574 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 02:04:13 +00:00 |
|
abijah
|
96a030e340
|
First pass changes for a dedicated customer credit account. This checkin is just refactoring.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@568 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-15 19:50:31 +00:00 |
|
abijah
|
6e63365604
|
A couple bugfixes and some more tweaks to how reversals are handled.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@566 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-15 16:47:55 +00:00 |
|
abijah
|
4f85dc243e
|
Getting closer on the reversal issue. There is definitely more testing to do, and some tweaks as well, but this may be approximately what we will finally settle on.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@565 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-15 03:11:16 +00:00 |
|
abijah
|
d2d1bb3fc4
|
Change to how reversals are handled. In the process, I've tried to solidify _exactly_ what addTransaction will do, since it was becoming a house of cards of sorts. It was using special logic to decide things like whether to add ledger entries, statement entries, or both, whether to assignCredits afterwards, whether the generated receipt was to be considered a credit, and so on. Consequently, modifications to any calling function (addInvoice, addWaiver, etc) would often require addTransaction modifications, which would turn around and break all of the other calling functions. So, that embedded logic has been removed from addTransaction, and the rules of what addTransaction should do are now defined by the callers. This change is DEFINTELY not complete, as it probably has several bugs, and it DOES NOT YET WORK for reversals. I need a clean baseline to move forward from though, and this checkin approximates where we need to go.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@562 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:31:56 +00:00 |
|
abijah
|
d024d333d2
|
Moved the INTERNAL_ERROR calls to use the class function instead of the global one.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@561 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:21:21 +00:00 |
|
abijah
|
c06399cf86
|
Added support for deleting (destroying) a transaction. This is strictly development/super-admin type functionality.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@553 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 20:58:50 +00:00 |
|
abijah
|
1d27b4dcb5
|
Many bug fixes, found while entering real facility data. Most are quite minor, although there was a functionality change to assignCredits, to support concessions without assigning them to anything other than rent. I've found that there is a glaring problem with charge reversals, which don't work correctly with the collected report. Of course, we're deleting prior disbursements, which obviously needs to be rectified.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@540 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-12 09:37:49 +00:00 |
|
abijah
|
fd1a1f43d4
|
Added transaction model writeOff function, and a new statement_entry WRITEOFF type. Not a big deal, but it makes presentation a bit more straightforward.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@508 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-09 15:11:51 +00:00 |
|
abijah
|
654eb0960e
|
Some of the finer detail work, mostly around pre-populating the move-in invoice with useful and correct data, and allowing the lease rent and deposit to be set at movein.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@503 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-07 22:52:01 +00:00 |
|
abijah
|
2e36d46329
|
Minor tweaks, a shame for checkin r500 :-(
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@500 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-07 03:55:01 +00:00 |
|
abijah
|
1dd0b14861
|
More work with security deposits, reversals, and balances. I've tried to work many different corner cases, but know that not everything has been tested. I think the next steps for testing will be to put in some real data.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@499 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-07 00:10:28 +00:00 |
|
abijah
|
e784931fa8
|
Implemented refund, at least for the most part. Minor testing, but looks promising. Because of this change the customer account entries grid appears odd, with a refunds showing up as a 'Charge'. So, I'm toying with the idea of having entries show up as customer 'Debits' and 'Credits'. I don't know if this will cause user confusion, but we'll play with it for a while and see. It actually reminds me a bit (coming full circle) of the earliest implementations, which kept track of a lease on its own account/ledger, in which credit/debit would be the exact correct terms.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@493 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-06 05:11:58 +00:00 |
|
abijah
|
4d62d7da73
|
More work on refund. I'm going to skip the whole voucher/credit_note bit and simply present a page that lets the user enter a date, an account, and the amount to refund, recording 1 payment transaction.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@491 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-06 02:52:45 +00:00 |
|
abijah
|
cca698d437
|
Several changes in an effort to support charge reversals. I can't imagine this is all working flawlessly, as I'm not quite sure how it even _should_ work.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@490 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-05 07:54:57 +00:00 |
|
abijah
|
cb969ba340
|
Discovered that the use of the term 'Payment' has been a misnomer. A company uses the term payment to indicate the monies it pays to _others_. Changing this leaves us without a good replacement term, but disbursement really seems to fit the bill. As comfortable as the term payment was, it was odd in many respects and disbursement does seem more appropriate. I'm sure there are several lingering bugs from this massive search/replace exercise, but this is a decent baseline for the change.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@488 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-05 01:00:09 +00:00 |
|
abijah
|
67280c89e7
|
Fixed bug when marking NSF of a tender that has only been used as a surplus and never applied to any charges. Modified the applyCredits algorithm to try and distinguish between surplus credits of a lease and general customer surplus. I don't know if it works completely, but I do know it creates an issue since a lease surplus can now never be utilized without additional lease charges, a refund (no yet implemented), or moving the surplus to the customer level (not intended to be implemented).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@483 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-04 21:19:20 +00:00 |
|
abijah
|
4d4e96fe1c
|
More work cleaning up and testing the use of charge waivers, as well as security deposit utilizations. Much of this was just around the concept of determining balances, which wasn't / isn't very straightforward. It's not hard to calculate a balance for a particular sitation, but it is difficult to generalize. I think it's reasonable as it now stands, but the StatementEntry::stats algorithm is certainly subject to change. Also, I didn't double check every case which called the stats() function, so I highly suspect we'll find cases where the code is not expecting the new return values, either symantically or logically.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@480 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-04 03:12:09 +00:00 |
|
abijah
|
32a98b4b6e
|
Continued waiver progress. At the moment, it works ok, but I don't like the way that security deposit balances work. It's probably a general issue, not just security deposits, but it's not clear whether stats from StatementEntry should be subtracting waiver totals from the overall charge reconciliation total. It should in some cases, and not in others. I'll tweak on it in later checkins.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@479 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 21:50:21 +00:00 |
|
abijah
|
7d81b9766b
|
Added ability to waive a partial charge.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@472 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 04:14:44 +00:00 |
|
abijah
|
1aa6273ade
|
First pass at a charge waiver implementation. It hasn't been tested but for a tiny bit.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@471 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 03:46:58 +00:00 |
|
abijah
|
44e4477d38
|
Changed the reconciledSet to provide an option for returning partially reconciled results. This keeps the same behavior so as not to break anything (although I can only think of paid rents that might suffer).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@462 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 21:07:00 +00:00 |
|
abijah
|
c4cc3ea812
|
Left a syntax error on the last checkin :-/
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@461 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 19:23:19 +00:00 |
|
abijah
|
1e10fbbf38
|
Fixed a couple small bugs with assignCredits, one of which was causing charges to get paid out of order.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@460 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 19:20:35 +00:00 |
|
abijah
|
f707448b05
|
Renamed prExit to prReturn, to be consitent with the return statement where it should be used. Also, modified the chargePaymentFields to be more explicit on the balance, in anticipation of the new type VOID
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@440 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:31:45 +00:00 |
|
abijah
|
c0d26a8e95
|
Finally added a logging mechanism. Only one file has been converted at the moment. I'll go in pieces, as debugging goes on.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@436 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-30 23:20:47 +00:00 |
|
abijah
|
a1f30804a7
|
Changed the StatementEntry type enum from CREDIT to SURPLUS. I never liked using the term CREDIT, since its use is confusing along side DEBIT/CREDIT. I couldn't think of another name earlier, which is why I used CREDIT, but I decided anything other than CREDIT is good, so I chose SURPLUS.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@435 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-30 21:40:38 +00:00 |
|
abijah
|
1e7557de71
|
Added effective date to each NSF entry, and fixed the account bug with receipts/payments. There is still a bug/question on how to handle nsf credits. It would be nice to simply delete the credit, since the check bounced, but then the original transaction will not add up. Either we decide that it doesn't need to add up, figure out a different type for the credit, or add a void flag to each statement entry and just void out nsf items. Or instead of a void flag, have an nsf_statement_entry_id which will also tie the payment/credit to the nsf payment/credit.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@428 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-30 18:23:37 +00:00 |
|
abijah
|
be2865b4d7
|
Cleanup of old lingering functions and some comment blocks
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@423 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-30 02:39:09 +00:00 |
|
abijah
|
b225775a91
|
Suppressed all the debug print statements from transaction insertion.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@398 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-28 02:40:42 +00:00 |
|
abijah
|
b3389652fd
|
Further tweaked the code to add new transactions, primarily by creating separate verification and addition functions in each underlying model. There are logic changes as well, such as adding in the other half of the missing double entry (as well as the double entry itself). This checkin also introduces the creation of CREDIT statement entries, when the customer has overpayed. It's working fairly well, although undoubtedly will need more tweaking.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@394 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-28 01:16:42 +00:00 |
|
abijah
|
3dc751c863
|
Implemented a mechanism to track customer overpayments (credits). Also implemented a reconciling algorithm, matching payments to charges. Preliminary testing seems to show that it works well. More thorough testing required.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@392 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-27 04:18:38 +00:00 |
|
abijah
|
122dfb10a0
|
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@374 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 23:52:59 +00:00 |
|
abijah
|
708759765f
|
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@371 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 16:53:33 +00:00 |
|
abijah
|
234999b4d2
|
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@368 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 01:49:46 +00:00 |
|
abijah
|
93ebc450fe
|
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@360 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-21 10:23:52 +00:00 |
|