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

140 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
abijah
99a787bba6 Initial work to determine whether or not a lease has charge gaps, and when the lease has been charged through. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@286 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-09 07:22:38 +00:00
abijah
7483f6ed2c Implemented more around lease closings. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@278 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-09 02:57:43 +00:00
abijah
09090d1b3c Consolidated the move out/in pages. I'm really not happy with this checkin, as it has actually reduced functionality. We used to be able to click move-out on a customer and be presented with a list of units to move out of. This was the intention, but I've gotten frustrated with the fact that I'm working on non-MUST functionality. Things are working good enough at the moment, so I'm checking in and will have to come back to this later. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@276 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-09 02:19:14 +00:00
abijah
c01c67161e Fixed bug for receipt linking to lease ID instead of customer ID 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@269 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-08 23:55:22 +00:00
abijah
75c44d1b3a Removed the pages controller and view, as well as the default route. I can't believe I let it linger for so long... 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@268 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-08 23:30:13 +00:00
abijah
2aeb069297 Fixed bug where the customer list would display 'Current Tenants', but the list would reflect all customers. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@267 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-08 21:53:30 +00:00
abijah
abd166cb98 Modified effective dates to be part of the ledger entry, not the transaction. This is the logically correct way, as a transaction is simply a collection of entries which might be anywhere from completely aligned to totally disjoint from one another (more likely the former). As a practical example, consider a move-in invoice, with security deposit (effective immediately with no end date), a prorated rent (effective move-in day through the end of the first month), and first full months rent (effective beginning of next month through the end of next month). There is certainly more work to be done on this, and testing was minimal. It does seem to be functioning though, so I'm checking in. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@256 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-08 16:04:53 +00:00
abijah
c455b383f5 Updated the balance algorithm for units and customers as was done for leases. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@253 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-08 00:34:03 +00:00
abijah
ba36729485 Fixed a couple sort order issues, and modified the balance results to always return a number (zero) instead of null. A Lease should always have a balance, unlike Units where it's appropriate to have an null balance on a vacant unit. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@252 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-08 00:32:22 +00:00
abijah
011c05d098 Implemented the balance field of Leases as part of a single query. This not only reduces the number of queries required, it also allows balance to be a sortable column, so that we can determine which customers are overdue. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@251 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-07 16:08:56 +00:00
abijah
aa2e647199 Added mechanism for user to know the rent amount on the invoice screen. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@250 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-07 09:00:54 +00:00
abijah
472d2d7166 Modified the page redirects to flow 'new customer' => 'move-in' => 'invoice'. What's missing here is the addition of contacts, but I'll ignore for now. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@249 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-07 08:09:51 +00:00
abijah
9c65d408fa Added a flag to accounts, indicating whether they can be used for charges and/or payments. Invoice has already switch to this mechanism, but we're keeping receipt the same for now since I have bigger fish to fry. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@247 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-07 07:52:41 +00:00
abijah
019b97fe53 Modified to dynamically determine eligible charge accounts, instead of the two that were hardcoded. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@244 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-07 07:14:18 +00:00
abijah
ae442db01f First pass at having invoice support multiple charges, just like receipt/payment. It works well, but I know we still need a better solution for income accounts, and it hasn't been robustly tested yet. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@243 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-07 04:37:04 +00:00
abijah
4ea8f1ae42 Took some of the new learnings from invoice generation and put into receipt generations. Also moved some shared functions to pmgr.js, and renamed things for consistency. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@239 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-07 02:55:55 +00:00
abijah
c1b402bd72 Moved the Invoice/Receipt logic into the transactions model. Adding an invoice will likely need to be tweaked to expect customer credits, and apply either automatically, or with user discretion. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@238 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-07 01:29:03 +00:00
abijah
ca0ddcbc29 Fixed late charge cut/paste error 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@237 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-07 01:28:03 +00:00
abijah
5f8ae73049 Charge/Invoice assessment is working fairly well. Still need to accept multiple charges on a single invoice, have client side validation, and post through ajax to allow posting repeated invoices. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@236 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-07 00:43:41 +00:00
abijah
58d3cbf66b First pass at entering charges for a lease. This works, but does not have the ability to add multiple charges, and does not mirror the payment method, which is ajax based. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@231 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-06 18:34:44 +00:00
abijah
850d15eb50 Moved the contact save logic into the model and out of the controller. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@230 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-06 17:25:05 +00:00
abijah
50e7f58d35 Changed the logic a little bit in the customer model saveCustomer function, such that we can provide a default customer name if otherwise unspecified. Changed the page titles to reflect Customer vs Contact, since they can easily have the same names. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@228 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-06 16:57:23 +00:00
abijah
47104919f2 Moved the customer save logic into the model 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@227 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-06 15:45:49 +00:00
abijah
87f0d3217a Changed the lease 'payment' action to just point to the customer payment instead. Makes my life easier at the moment... 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@223 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-06 03:35:09 +00:00
abijah
fbd43fbbb2 Cleaned up and got rid of the word Tenant in most places. The original thought was to minimize confusion in our specific case (since we don't sell POS items) by simply refering to customers as tenants. However, I don't think customers is a very confusing term and so I decided to clear up the inconsistency. I did leave it in a couple places, where the customers in questions are clearly tenants 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@222 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-06 03:34:33 +00:00