abijah
|
d8dfa0ca25
|
Removed the debug aid of sub-totaling statement entries. I'll add the right solution someday...
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work/site@998 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2010-07-02 22:19:55 +00:00 |
|
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
|
d83b72b2a3
|
Added the front end code to perform a customer merge. Seems to work, although I don't fully trust it yet. Now that implementation is done, I realize I don't care for the interface. Really, the destination customer should keep its primary contact and all other contacts. The user should only be given the choice of adding zero to all contacts from the source customer. A change in primary contact could always be handled after the merge.
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work/site@994 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2010-07-02 19:36:39 +00:00 |
|
abijah
|
45ed9bd7a3
|
Yet another bug from haste... let's hope this one fixes it.
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work/site@979 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2010-03-31 20:10:21 +00:00 |
|
abijah
|
9adb37a8e2
|
Fixed copy/paste bug introduced at the last minute on the prior checkin.
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work/site@978 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2010-03-31 20:07:29 +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
|
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
|
3ba1e8b97a
|
Fixed a bug when transitioning to a move-in receipt, and changed the invoice/receipt grids to only contain current customers / active leases. A non-current customer or closed lease can still have a receipt/invoice, the user will just have to go directly to the customer / lease first. OK, so I just checked and that's not true. Perhaps it should be...
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@605 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-17 17:23:50 +00:00 |
|
abijah
|
23cdd0e497
|
Merge in from surplus_account_20090815 r592
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@593 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-17 02:22:54 +00:00 |
|
abijah
|
90bf9bac0a
|
Fixed url generation since it was not propogating the admin/dev routing items. Also modified the invoice at move in to exclude the customer list, and to transition directly to the receipt page afterwards.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@556 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:05:36 +00:00 |
|
abijah
|
f9ff27cad4
|
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/site@540 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-12 09:37:49 +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
|
aa307150c8
|
Whitespace only change
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@524 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-11 01:07:20 +00:00 |
|
abijah
|
666df07a7c
|
Removed the debug portions of receipt entry, and added a checkbox to allow the user to either keep entering receipts, or have the page automatically transition to the customer page.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@521 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-10 23:57:20 +00:00 |
|
abijah
|
35f17ed1de
|
Added customer since/until fields. Changed the ledger entry grid on the customers page into a receipts grid, and added it to the lease page as well, even though it is for the customer in general, and may include receipts for leases other than the one being viewed. I may put more effort into this later, but for now it solves the problem of getting the receipt tenders visible when viewing the lease.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@509 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-10 00:56:41 +00:00 |
|
abijah
|
c3e60a65c1
|
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/site@499 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-07 00:10:28 +00:00 |
|
abijah
|
0de0c7d5d7
|
Fixed the button text for new customers
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@497 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-06 18:08:55 +00:00 |
|
abijah
|
a2aa612a5e
|
Fixed the customer selection update for receipts, and added a mechanism to automatically update the oustanding charges grid after entering the receipt.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@496 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-06 18:08:21 +00:00 |
|
abijah
|
6904320e4e
|
Modified lease and customer views to have the statement & ledger entries sorted in descending date order by default. May not prefer this in the end, but we'll give it a go for a while.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@485 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-04 22:12:32 +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
|
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
|
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
|
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
|
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
|
743ff52e59
|
Made changes to get field alignment on receipt entry. I can get the text on the left by floating the label, but actually, I think I prefer the boxes on the left.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@386 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 05:01:29 +00:00 |
|
abijah
|
efb4655786
|
Reverted back to r383.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@385 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 04:16:33 +00:00 |
|
abijah
|
7c34c7faff
|
I tried using a table for the receipt entry, which seems like it should work, but really doesn't. I'll check it in for future reference, but I'll be reverting just afterwards
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@384 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 04:15:39 +00:00 |
|
abijah
|
a4dff8a6ed
|
Begin the move from having receipts generated based on 'collectable' account, to being based on what the database considers to be a form of tender. This has the excellent benefit of removing all those hardcoded data1/2 fields for each different tender type. That's all database driven now. There is more to do, but this is a good step forward.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@382 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 03:58:12 +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
|
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
|
5a16e497ad
|
Customers is working somewhat. I want to see if the grid query logic can be simplified, so I'm checking in first
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@359 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-21 09:40:51 +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
|
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
|
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
|
ba82eabcbc
|
Fixed a bug created with each form table when that element was modified to ignore fields set to null. The original intention was that null simply meant 'no special configuration'. However, we needed a way to programatically enable/disable fields, so null was an obvious choice to use. Now that I'm about to check in, I think I should have just made a minor change to use false to skip a field, which would have been backwards compatible (except for the one place using null to exclude the field). However, it's done now, so what the heck.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@290 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 16:07:19 +00:00 |
|
abijah
|
e15f053c5c
|
Changed the list of payment types to be dynamically generated. This works OK, but the list is longer than is probably useful, and more importantly, some of these types need to be associated with a lease, such as a security deposit. Not sure how I'll handle that.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@289 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 09:20:04 +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
|
fb29380ac5
|
Added ACH and Concession entry. Like everything else, I haven't tested too robustly, but it does seem to work. I might want to change the monetary source id for Concession. Right now each concession gets its own monetary source, but we could probably use a common one without issue.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@284 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 06:10:00 +00:00 |
|
abijah
|
849077bb9a
|
Made layout changes to invoices and receipts to use CSS instead of simple H2/H3 tags. Also, as a temporary measure, I make the lease/customer numbers hyperlink to the view page. At some point we'll figure out what should happen after entering a receipt or invoice, and this hack should go away.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@270 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-09 00:00:29 +00:00 |
|
abijah
|
4d123b63f0
|
Moved all grid elements onto the grid helper. Basic testing done, but more testing needs to be done.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@262 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-08 20:40:44 +00:00 |
|
abijah
|
a88f5829ce
|
Moved the leases element onto the new grid helper.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@261 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-08 19:22:22 +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
|
d4ceca3aeb
|
The only functional change was to start payment numbers at 1 instead of zero. All other changes are just white space and code movement.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@241 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-07 04:33:06 +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
|
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 |
|
abijah
|
826874b2a5
|
Changed layout to enlarge the detail table on the edit page. Changed edit action to redirect to the view page.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@221 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-06 03:09:54 +00:00 |
|