Commit Graph

145 Commits

Author SHA1 Message Date
abijah
cbdbbdf394 Modified customer merge functionality to leave everything from the destination customer in-tact, and simply add on contacts from the source customer, if requested. This simplifies things significantly, and also the paradigm shift of starting the operation from the destination customer allows us to merge multiple customers into one with ease (no need to dig around for each source customer before clicking merge)
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work/site@995 97e9348a-65ac-dc4b-aefc-98561f571b83
2010-07-02 20:52:00 +00:00
abijah
465d9c0c5f Minor change to the display and sort order of unit sizes
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work/site@992 97e9348a-65ac-dc4b-aefc-98561f571b83
2010-07-02 13:38:38 +00:00
abijah
65b6d582d9 Changed the invoice page to redirect back to the customer view, which is typically more of interest than the lease view
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work/site@980 97e9348a-65ac-dc4b-aefc-98561f571b83
2010-04-02 12:24:34 +00:00
abijah
078497cca8 Added outstanding charges and outstanding credits to the customer page, and reorded fields in order of presumed importance. Removed items from Unit/Lease which really shouldn't have been there. They were added for convenience, but the redundancy was confusing. Added a couple report links to make it easy to see outstanding charges and collected rents.
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work/site@977 97e9348a-65ac-dc4b-aefc-98561f571b83
2010-03-31 19:49:56 +00:00
abijah
e813849c86 Added ability to see the customer when listing transactions
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work/site@974 97e9348a-65ac-dc4b-aefc-98561f571b83
2010-03-30 15:57:54 +00:00
abijah
cf9be800e5 Merge in the v0.2.0 work
git-svn-id: file:///svn-source/pmgr/trunk/site@938 97e9348a-65ac-dc4b-aefc-98561f571b83
2010-03-02 03:25:52 +00:00
abijah
cc12d5ff93 Merge in from pre_0.1 branch
git-svn-id: file:///svn-source/pmgr/trunk/site@847 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-09-15 02:38:28 +00:00
abijah
4d615d8028 More cleanup of lingering jqgrid remnants
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@620 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-18 15:48:59 +00:00
abijah
04dc17409e Upgraded to jqGrid 3.5.2, which has a couple bugfixes. Fixed a bug in our code preventing the grid query from being shown when in development mode.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@619 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-18 15:33:45 +00:00
abijah
7049542e59 Modified the grid such that the account is right next to the dollar amount. It was too distracting for the eyes to have to span columns putting charges and amounts together.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@614 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-18 03:59:51 +00:00
abijah
ff37597b81 Added a grid load error indication, since it was lost when we disabled the debug output.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@606 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-17 18:41:17 +00:00
abijah
a167b8a885 Added code to make jqGrid development aware
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@597 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-17 03:44:09 +00:00
abijah
18d384ecb3 Merge in support for jqGrid 3.5 (plus a change to layout.css after the merge).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@596 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-17 03:39:29 +00:00
abijah
1fee7646b6 Got rid of LATE as a unit status, as it did not represent an physical condition. The logic was moved to Lease, where it is a much better fit. The sitemap still presents LATE units, as it is a useful view, but the underlying logic is driven from Lease, not Unit. This checkin also includes a small feature change to how late charges are assessed, as well as a menu item to kick off the charge assessments (both accidentally wedged in to this changeset).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@547 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-13 20:55:19 +00:00
abijah
97d16bd712 Changed the default of the debug flag when generating grid data. The original intention was to have it debug by default, so that debugging would be on if the url were manually typed in. That has never been needed though, and this change not only results in cleaner logic, it makes sure we have no issues with routing.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@546 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-13 20:07:49 +00:00
abijah
b741bb6b01 Added cached fields for charged_through and paid_through dates of a lease. Also, added the ability to dynamically determine whether a unit is late or not. In reality, we really need this to be part of the lease, not one of the status types for unit. The sitemap, however, is driven from unit information, so it's not clear whether we should move that information or not.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@543 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-13 02:37:37 +00:00
abijah
3696aa011c Removed the Signed column from the leases grid unless requested
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@536 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-11 17:04:21 +00:00
abijah
6e03664f28 More tweaking with grids that need to be reloaded immediately after page load. Fixed a bug with the statement_entry balance field, as there were two of them.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@534 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-11 15:56:40 +00:00
abijah
1b0d752a55 Modified the statement entries grid, as well as the underlying controller, to support a couple new fields, 'applied' and 'balance'.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@532 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-11 07:27:56 +00:00
abijah
fea21b3ea0 Added the close date to the leases grid, to make it clear which customer leases are still open. Perhaps we should exclude the field by default, and just add it into the customer view page.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@515 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-10 19:00:02 +00:00
abijah
bba3af8163 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/site@503 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-07 22:52:01 +00:00
abijah
a5e7366cac 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/site@493 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-06 05:11:58 +00:00
abijah
6a7a784cb6 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/site@488 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-05 01:00:09 +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
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
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
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
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
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
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
9d35ed1aa9 Added the debug class to the debug grid query link, so that it doesn't show on print media.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@405 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 01:43:08 +00:00
abijah
1d6c7436d4 Got the collected reports working again. NSF hasn't been tested yet, because NSF entry is not yet working.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@402 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-28 16:08:15 +00:00
abijah
8e720dbfec Added a rent column to the units list
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@395 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-28 01:17:09 +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
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
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
368b730744 Added automagic filtering capability to the app controller. Also, lumped all items needing serialization into a single 'post' item, instead of continuing to piecemeal each added post item. There will be some changes required to some controllers, since custom post data has changed location, but it should be minor. To make use of the new filtering methods, each view will have to set the 'filter' parameter at the time of grid setup.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@365 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-22 23:31:41 +00:00
abijah
b641dc98ec Renamed jqGridData functions to be just gridData. Restructured the virtual function calls with an anticipated need for gridDataCount to be overridden as a whole, instead of just overriding the individual pieces.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@361 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-22 17:06:44 +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
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
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
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
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
69adfd900c Standardized the grid events interface, to ease the burden on the views and ensure that the load functions could be used by the application without wiping out the debug functionality that was built into jqGrid.ctp
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@336 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-15 06:21:55 +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
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
4ad4033e4f Fix to the sub-total column, which wasn't working for ledgers that have both debits and credits (and thus need a sub-total of balance, not amount
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@325 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-13 04:40:21 +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