abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
415 Commits 31 Branches 9 Tags
e0d15b7396c5fcabaeee10525673be898cfb3354
Commit Graph

163 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
48fb7383de 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/site@428 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-30 18:23:37 +00:00
abijah
94c0efa881 This is probably what we really want for NSF... two transactions. One for backing out the bank deposit, and the other for adjusting A/R and all the associated statement entries. This is working reasonably well, even seemingly fine for the collected rents report. I do see that there is another bug though, that is causing statement entries to have the opposite account_id than intended (A/R instead of Cash) when entering new receipts. Not sure when I broke that, but it must have been when working on deposits. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@427 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-30 07:30:50 +00:00
abijah
7450d2a98e Preliminary work on NSF. It's far from working, but we're headed in the right direction. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@426 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-30 06:29:41 +00:00
abijah
3e715bae9f In the cleanup of r423, some code accidentally got squashed. This checkin undoes that problem 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@425 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-30 06:09:05 +00:00
abijah
347aa20622 Fixed problem when trying to calculate transaction stats. The current solution is a bit dodgy, but by limiting the queries to LedgerEntry and StatementEntry, it works without too much extra effort. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@424 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-30 02:47:43 +00:00
abijah
510ca489ec Cleanup of old lingering functions and some comment blocks 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@423 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-30 02:39:09 +00:00
abijah
e4426cde55 Fixed the problem with zero dollar balance forward entries when closing a ledger. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@422 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-30 02:17:49 +00:00
abijah
25e3c87213 Got the ledger closings to work again. This seems to work ok, although I notice closing the ledger after deposit results in a balance forward entry of $0.00 . I'll work on it next 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@421 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-30 01:59:10 +00:00
abijah
ccf7a5fccd This is the remainder of the previous, invalid, partial checkin. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@419 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-29 23:25:03 +00:00
abijah
362226183e Changed the deposit to use a grouped double entry instead of individual ones for each tender deposited 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@414 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-29 10:10:11 +00:00
abijah
438610bdf9 Added customer association to each tender 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@413 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-29 09:33:29 +00:00
abijah
cdf6ce86e3 Re-implemented the deposit functionality. This is mostly working, although I'd like to get customer added to the tenders table, and probably change to a single deposit ledger entry for each tender type. A single entry would require that all tender types have been recorded to the same account, something that isn't mandated at the present, but is likely to be true most of the time. Perhaps they could just be grouped by account id, which should work in all cases and yet align with tender type 99% of the time. I'll have to think about it. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@412 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-29 08:55:09 +00:00
abijah
3a6964c4bf Added more information to the tender grid, and a new query to return depositable types 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@409 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-29 02:41:50 +00:00
abijah
bfa71375e8 Started work on handling NSF, but will deal with deposits first, since we can't get an NSF without a deposit first. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@407 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-29 01:51:34 +00:00
abijah
d8fe7f9264 Suppressed all the debug print statements from transaction insertion. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@398 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-28 02:40:42 +00:00
abijah
cb5b017c7e Bug fixes to get lease security deposit and balance information working. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@396 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-28 01:18:02 +00:00
abijah
24ccb56e50 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/site@394 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-28 01:16:42 +00:00
abijah
24bca2c8e9 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/site@392 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-27 04:18:38 +00:00
abijah
2cc58255c3 Playing with different means for determining stats. Nothing decided yet. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@391 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-26 23:23:19 +00:00
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