abijah
|
e0ea50d142
|
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/site@483 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-04 21:19:20 +00:00 |
|
abijah
|
81b5bfed26
|
Made the link clearer that we'll only be waiving the balance of a charge, not the entire charge.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@482 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-04 20:26:33 +00:00 |
|
abijah
|
2ddcdf9419
|
Even with all the effort put into getting the counts right on the customers grid, it still didn't work right. The root of the problem is the join to CurrentLease, which can result in multiple rows for the same customer. I can revisit this in the future to put some clever solution back in, but in the meantime, it was easiest just to add fields to the customers table, and simply update it whenever the customer lease situation changes. I don't like it... but it just made life much simpler.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@481 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-04 19:25:39 +00:00 |
|
abijah
|
e0d15b7396
|
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/site@480 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-04 03:12:09 +00:00 |
|
abijah
|
aa846de284
|
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/site@479 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 21:50:21 +00:00 |
|
abijah
|
09e650d841
|
Fixed minor bug that was causing the string 'undefined' to be used as the payment index.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@478 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 21:47:24 +00:00 |
|
abijah
|
61e9dad364
|
Fixed cut/paste error causing invalid customer security deposit balance.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@477 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 21:44:36 +00:00 |
|
abijah
|
91f5ad7660
|
Added HR to keep the boundary between two pr blocks clear even when the output is collapsed and the stack trace is not.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@476 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 20:17:14 +00:00 |
|
abijah
|
14d896d1b3
|
Added ability to log items without showing the output. I doubt the mechanism works perfectly in all cases, but it works enough for now and I can tweak it as needed.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@475 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 20:13:48 +00:00 |
|
abijah
|
d2795e8201
|
Added the ability to suppress logging at display time. I'd like to add an additional log level, the first which passes or suppresses the print, and the second which defaultly displays or hides the output. Perhaps next checkin.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@474 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 19:41:49 +00:00 |
|
abijah
|
df91125e96
|
Added stack tracing to each model::pr print
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@473 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 18:38:35 +00:00 |
|
abijah
|
7fda78f820
|
Added ability to waive a partial charge.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@472 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 04:14:44 +00:00 |
|
abijah
|
a59d93ebee
|
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/site@471 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 03:46:58 +00:00 |
|
abijah
|
fe66241ca1
|
Work around for the fact that our implementation has issues with receipts of more than one tender. See the branch statement_ledger_entry_tie_20090802 for more information.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@470 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 03:45:51 +00:00 |
|
abijah
|
4c8e3b380e
|
Left r466 with syntax error... fixed that
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@469 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-03 02:30:29 +00:00 |
|
abijah
|
6b357fc285
|
Added a new statement entry type, 'WAIVE', and added the beginnings of a function to add a new waiver transaction. Haven't even started the work yet though...
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@466 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-02 22:44:55 +00:00 |
|
abijah
|
a9ef3a75ae
|
Added a check to ensure we're not adding a close with no accounts. This check should probably be in the model, but that can be done later.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@465 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-01 01:48:07 +00:00 |
|
abijah
|
267357a0f7
|
Combined the addNsf and addTransaction functions, which was always intended. There is more that could be done, but not all bugs are flushed out yet. Its close enough though, that I want to capture it as is to help work through the subtle issues.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@464 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-01 01:47:11 +00:00 |
|
abijah
|
1c2c2b457c
|
More work on handling security deposit utilizations. This is headed in the right direction, but unfortunately, there is a problem if the security deposits have not been paid. I could just ignore it, because it's a low priority problem, but I think the solution might be to just provide a waiver on the unpaid charges. Since I need to implement fee waivers anyway, I'll just move onto that next, and then finish out the security deposit work.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@463 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 21:11:00 +00:00 |
|
abijah
|
b00944a412
|
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/site@462 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 21:07:00 +00:00 |
|
abijah
|
4ef09080be
|
Left a syntax error on the last checkin :-/
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@461 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 19:23:19 +00:00 |
|
abijah
|
b41ce38526
|
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/site@460 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 19:20:35 +00:00 |
|
abijah
|
f210388f6c
|
Added logging
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@459 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 18:35:39 +00:00 |
|
abijah
|
645a3a4797
|
Removed the ability to NSF items like Cash
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@458 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 18:19:20 +00:00 |
|
abijah
|
8f79f0401f
|
Added a way to associate the meaningful part of NSF with the corresponding tender.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@456 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 18:10:48 +00:00 |
|
abijah
|
e40778ddbd
|
Doh! So someone actually _was_ using the gridDataFilterConditionsStatement function. Guess it would have been worth grepping for...
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@455 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 17:57:30 +00:00 |
|
abijah
|
6b7ce60ae3
|
Changed the default log level to 5, since we're using rather high levels anyway.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@454 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 17:43:51 +00:00 |
|
abijah
|
2b09f4054f
|
Added some comments, and changed the nsf action to redirect to viewing the tender after creation.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@453 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 17:15:17 +00:00 |
|
abijah
|
33a677431f
|
Some cleanup from the last checkin
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@452 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 16:48:27 +00:00 |
|
abijah
|
9bd37ba282
|
Added the ability to perform partial deposits. After this checkin, I'll clean up some of the commented out sections of things that we're attempted to get this all working.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@451 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 16:41:56 +00:00 |
|
abijah
|
53a8d8fc60
|
Fixed a bug where the condition is of the form array('field' => null). That's a valid condition, but was being treated the same as array('field'). This resolves it, although it will break anyone using the gridDataFilterConditionsStatement virtual function. I don't think anyone is at the moment, although I didn't check.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@450 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 03:46:59 +00:00 |
|
abijah
|
4c7e3d1f58
|
Removed the comment block, since it's not longer needed and has now been saved.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@448 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 03:29:17 +00:00 |
|
abijah
|
5dc5f087ba
|
Added an automatic $35 nsf charge when marking an item as nsf. This required removing the lease_id requirement when adding a transaction, since the charge is not associated with a lease, just a customer. The requirement was artificial anyway; imagine selling POS items to folks that don't even lease from us...
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@447 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 03:07:34 +00:00 |
|
abijah
|
46744a24d3
|
Modified to use the logging mechanism
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@446 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 02:09:45 +00:00 |
|
abijah
|
b553dbb9c3
|
Modified to use the logging mechanism
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@445 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:45:57 +00:00 |
|
abijah
|
3c390d940f
|
Modified how NSF customer surplus items are handled. Instead of creating a negative surplus (which was dumb, but a decent first pass), we just void out the surplus. This drops the surplus off the radar, and in fact may cause confusion since the transaction no longer has enough statement entries to total up correctly. However, it doesn't appear too confusing, especially as tender item names are now decorated with strikethrough when they're NSF (the previous checkin).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@444 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:40:16 +00:00 |
|
abijah
|
777a47a27b
|
Added strikethrough over the tender name in grids when the tender is NSF. This helps really call out the situation with NSF items.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@443 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:38:53 +00:00 |
|
abijah
|
237b0a901f
|
Shrunk the comment column in half, since it's usually empty. All we really need is an easy way to spot that there is a comment, and the user can hover or widen the column as needed.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@442 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:35:45 +00:00 |
|
abijah
|
393d9c9d77
|
Removed the Tender column from grids where the account does not support payments and so the ledger entries should never have a Tender anyway (except for our special case Closing account, which is fine to ignore).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@441 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:34:45 +00:00 |
|
abijah
|
17cd00c90e
|
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/site@440 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:31:45 +00:00 |
|
abijah
|
066acd14f0
|
Changed prints to use the new logging system
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@439 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:23:27 +00:00 |
|
abijah
|
87db010dc1
|
Discovered that an earlier implementation of Model::pr is now being overridden by the AppModel. This is probably a good thing, but it does mean that we're getting a ton of Model prints that we don't want. I added a class logging mechanism to allow individual classes to be turned up or down, and set the default for Model to be very low
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@438 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 00:00:10 +00:00 |
|
abijah
|
9360ebe661
|
Added the debug file/line output directly into the AppModel::_pr function, as the builtin pr function simply logs the same file line for every call.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@437 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-30 23:32:10 +00:00 |
|
abijah
|
32c81b7367
|
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/site@436 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-30 23:20:47 +00:00 |
|
abijah
|
0b8d8fe1ac
|
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/site@435 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-30 21:40:38 +00:00 |
|
abijah
|
0cb961925d
|
The conditions were clamped down too tight, as they prevented something like 'Table.field !='
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@433 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-30 21:34:03 +00:00 |
|
abijah
|
fbfc973dad
|
Included a possible mechanism for including the nsf ledger entries when viewing a tender
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@432 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-30 21:06:02 +00:00 |
|
abijah
|
24f245c3c8
|
Tweaked filtering to allow for non-trivial conditions
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@431 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-30 20:59:33 +00:00 |
|
abijah
|
e7e3dbc559
|
Modified the filtering behavior; A filter specified as 'Table.field' results in the obvious split (Table, field); 'Table' results in (Table, id); 'field' results in (ModelTable, field). Fixed a bug in the app controller which was allowing 'fields' to leak into the top level of 'link'
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@430 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-30 19:45:19 +00:00 |
|
abijah
|
de0cf6467a
|
Moved the filtering split to a virtual function.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@429 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-30 19:07:21 +00:00 |
|