abijah
|
90ecbda541
|
Several minor changes including a couple minor bugfixes.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@592 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-17 02:15:02 +00:00 |
|
abijah
|
4afe0bd77b
|
Added logic to prevent a double entry where the credit and debit record in the exact same ledger. There is no known reason why we would need to record such an entry, even though it would not be incorrect to do so.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@591 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 23:41:44 +00:00 |
|
abijah
|
8440a7c833
|
Checkin a support function that is needed by the Transaction model since several checkins ago.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@590 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 22:51:08 +00:00 |
|
abijah
|
00d509f23d
|
Minor formatting issue for the Transaction.type enums
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@589 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 22:48:00 +00:00 |
|
abijah
|
080c82fc10
|
More bug fixes, especially around reversals of charges that have been paid from something other than customer money (such as waivers). I suspect it still will not work correctly for concession, depending on your point of view. Either concession should not count as customer credit, since they never paid that money, or it should since they were told they would get $X off, and upon charge reversal, they no longer get the credit. It seems they would only get the credit when reversing a mistaken charge, in which case, the user can manually provide a new concession.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@588 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 22:35:02 +00:00 |
|
abijah
|
1b02be19f0
|
Adjusted to match the naming in the database
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@587 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 22:31:06 +00:00 |
|
abijah
|
366d59a5e6
|
Added a customer credit account.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@586 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 19:16:42 +00:00 |
|
abijah
|
2634cf824a
|
Another checkin screwup where we accidentally specified ledger.php instead of ledger_entry.php
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@585 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 19:14:37 +00:00 |
|
abijah
|
1429fe720b
|
Added mechanism to lookup the NSF tender from the bounce transaction.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@584 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 19:00:45 +00:00 |
|
abijah
|
754cdb8522
|
Fixed bug with NSF, which was failing to locate the nsf_entry_id. To resolve this, I added the original data into the return structure for each item, instead of just the created IDs. Also, added NsfTender to the Transaction model to locate which Tender an NSF transaction relates to.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@583 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 18:59:16 +00:00 |
|
abijah
|
a1a68f3209
|
Updated SQL scratchpad
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@582 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 16:48:44 +00:00 |
|
abijah
|
8843d24baa
|
Added SQL scratchpad
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@581 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 16:37:54 +00:00 |
|
abijah
|
892618db36
|
I need to check again in the morning, but it seem like this is finally what we need for reversals. Of course, we're still using A/P as a temporary solution. If we do indeed move forward with this sort of solution (dedicated customer credit account), then we'll have to create a new account fairly soon.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@580 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 09:31:19 +00:00 |
|
abijah
|
3decfff33b
|
Fixed is_bool / is_boolean bug
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@579 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 06:12:46 +00:00 |
|
abijah
|
945221d565
|
Changed reversals to create an explicit credit BEFORE assigning credits to outstanding charges. This ensures that charges are paid from the customer surplus account and we don't end up with bizarre disbursements, like having Rent paid from Damage or whatever the reversed charge was.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@578 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 05:17:09 +00:00 |
|
abijah
|
a968d7abe6
|
Changed the explicit receipt amount to be driven from stats instead of the assignCredits return value. This is in anticipation of creating an explicit credit directly, without even calling assignCredits. I'll do that for reversal on the next checkin.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@577 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 04:43:34 +00:00 |
|
abijah
|
8b6b8884f7
|
More good progress on reversals. There is still an issue where after reversing, a disbursement can be applied to a new charge from the old charge account, instead of the surplus account. I'll work on that next.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@576 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 03:56:36 +00:00 |
|
abijah
|
14805190fc
|
Added back in the logic to simply update an existing explicit credit instead of creating an additional one. At the moment, I can't think of a scenario for this other than when reversing charges, which is still broken. So, until I make progress on that, it's not even clear this changes is needed, let alone whether it works.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@575 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 02:22:45 +00:00 |
|
abijah
|
a1bdecfcaa
|
More tweaks to the addTransaction algorithm, working on a solid plan for customer surplus
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@574 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 02:04:13 +00:00 |
|
abijah
|
4896834a96
|
Added the account back into the grid, since an invoice could have charges across several accounts.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@573 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 01:06:14 +00:00 |
|
abijah
|
a9c3c40053
|
Bug fix for matching ledger entry to double entry
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@572 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 00:49:21 +00:00 |
|
abijah
|
4125d7ba16
|
Quick and dirty hack to get double entries to show again.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@571 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-16 00:45:11 +00:00 |
|
abijah
|
26d9b1bc38
|
Modified the charges list on the receipt page to have the query performed directly as part of returning the grid data, instead of an intermediary call to get the unreconciled entries first. This not only ensures consistent data, but is quicker, cleaner, and fixes the customer balance bug that seems to have been introduced as part of the change to how customer surplus is handled (although it could have been resolved using the old technique just as well).
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@570 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-15 23:04:57 +00:00 |
|
abijah
|
f30e536e47
|
Modified to automatically calculate the crdr field, if not specified
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@569 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-15 20:43:00 +00:00 |
|
abijah
|
96a030e340
|
First pass changes for a dedicated customer credit account. This checkin is just refactoring.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@568 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-15 19:50:31 +00:00 |
|
abijah
|
460e9a2e64
|
Branch to experiment with keeping all customer surplus items in a dedicated liability account.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@567 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-15 19:48:30 +00:00 |
|
abijah
|
6e63365604
|
A couple bugfixes and some more tweaks to how reversals are handled.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@566 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-15 16:47:55 +00:00 |
|
abijah
|
4f85dc243e
|
Getting closer on the reversal issue. There is definitely more testing to do, and some tweaks as well, but this may be approximately what we will finally settle on.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@565 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-15 03:11:16 +00:00 |
|
abijah
|
30f755cf42
|
Fixed negative numbers
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@564 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-15 01:22:16 +00:00 |
|
abijah
|
170ba466de
|
Cleaned up several places regarding redirect and rendering during development for debug purposes. Also, added a link to the intended redirect target when we've rendered instead. These changes haven't been tested, hopefully they are benign.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@563 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:49:42 +00:00 |
|
abijah
|
d2d1bb3fc4
|
Change to how reversals are handled. In the process, I've tried to solidify _exactly_ what addTransaction will do, since it was becoming a house of cards of sorts. It was using special logic to decide things like whether to add ledger entries, statement entries, or both, whether to assignCredits afterwards, whether the generated receipt was to be considered a credit, and so on. Consequently, modifications to any calling function (addInvoice, addWaiver, etc) would often require addTransaction modifications, which would turn around and break all of the other calling functions. So, that embedded logic has been removed from addTransaction, and the rules of what addTransaction should do are now defined by the callers. This change is DEFINTELY not complete, as it probably has several bugs, and it DOES NOT YET WORK for reversals. I need a clean baseline to move forward from though, and this checkin approximates where we need to go.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@562 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:31:56 +00:00 |
|
abijah
|
d024d333d2
|
Moved the INTERNAL_ERROR calls to use the class function instead of the global one.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@561 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:21:21 +00:00 |
|
abijah
|
778bb43895
|
Modified INTERNAL_ERROR to support inclusion of the blank layout, since all the javascript is lost otherwise. This should only matter for development. Also, fixed a bug with rendering when redirect is called but headers have already been output.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@560 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:10:16 +00:00 |
|
abijah
|
41321481c7
|
Minor tweak to grid caption and display of the entry id instead of the transaction id.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@559 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:07:50 +00:00 |
|
abijah
|
fe9f6ce949
|
Allow the dollar sign in the input box, since it will get stripped off later anyway.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@558 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:07:02 +00:00 |
|
abijah
|
f81bfdecc2
|
Fixed the currency function to always return in dollar amounts, and never in just cents, as the core currency function does.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@557 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:06:17 +00:00 |
|
abijah
|
8dd6fc957d
|
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@556 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:05:36 +00:00 |
|
abijah
|
d92acf12de
|
Dropped the security level for viewing statement and ledger entries
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@555 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:01:25 +00:00 |
|
abijah
|
43d1d2ccf5
|
Fixed bug with statement entry counts when statement_entry_id is set
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@554 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 21:00:21 +00:00 |
|
abijah
|
c06399cf86
|
Added support for deleting (destroying) a transaction. This is strictly development/super-admin type functionality.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@553 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 20:58:50 +00:00 |
|
abijah
|
d1187f9bdd
|
Added the http request to the internal error box, since it will be necessary to help track down any reported errors.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@552 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 18:13:12 +00:00 |
|
abijah
|
b7a77757f9
|
Fixed a couple URL problems, including redirect, which was previously entirely unable to utilize our AppHelper for the url generation. Added a couple menu items into the Admin section. Changed debug to be OFF for any route other than the 'dev' one.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@551 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-14 18:11:33 +00:00 |
|
abijah
|
5f199d97fe
|
Fixed the datetime bug
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@550 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-13 22:23:45 +00:00 |
|
abijah
|
fc292e3366
|
Moved paid-through from the detail box, which is semi-static information, to the info box, which holds data that changes with time (i.e. the so called pertinent information).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@549 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-13 22:09:27 +00:00 |
|
abijah
|
94e300a129
|
Modified the formatted date/age results to be span encapsulated for later css formatting.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@548 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-13 22:08:43 +00:00 |
|
abijah
|
791b2d8ab1
|
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@547 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-13 20:55:19 +00:00 |
|
abijah
|
091920d80a
|
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@546 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-13 20:07:49 +00:00 |
|
abijah
|
1511986ed0
|
Changed the custom route variables, so that the dev route could set the admin flag and not screw up the routing. The AppController now checks the routing params to set the dev/admin flags.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@545 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-13 16:43:07 +00:00 |
|
abijah
|
1e88e1fce2
|
Added admin and development routes, which should help while in transition to user security.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@544 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-13 16:09:45 +00:00 |
|
abijah
|
a2014a916e
|
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@543 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-13 02:37:37 +00:00 |
|