Commit Graph

1462 Commits

Author SHA1 Message Date
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
893fc74c0a A couple bugfixes and some more tweaks to how reversals are handled.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@566 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-15 16:47:55 +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
e76ad897a4 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/site@565 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-15 03:11:16 +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
e9d92494c6 Fixed negative numbers
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@564 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-15 01:22: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
d40f43c617 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/site@563 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 21:49:42 +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
ac6a830d27 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/site@562 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 21:31:56 +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
83e552211f 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/site@561 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 21:21:21 +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
fe1b0626c2 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/site@560 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 21:10:16 +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
68df688f12 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/site@559 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 21:07:50 +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
61a00f475a 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/site@558 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 21:07:02 +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
0c3f4c3e18 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/site@557 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 21:06:17 +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
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
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
4472a124f5 Dropped the security level for viewing statement and ledger entries
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@555 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 21:01:25 +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
09e44995f3 Fixed bug with statement entry counts when statement_entry_id is set
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@554 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 21:00:21 +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
e42c83c585 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/site@553 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 20:58:50 +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
c31c3a3cdc 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/site@552 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 18:13:12 +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
469962dd40 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/site@551 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 18:11:33 +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
4d0108c6f8 Fixed the datetime bug
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@550 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-13 22:23:45 +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
f1d852aea6 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/site@549 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-13 22:09:27 +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
8f6dd40b9a Modified the formatted date/age results to be span encapsulated for later css formatting.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@548 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-13 22:08:43 +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
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
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