Commit Graph

1462 Commits

Author SHA1 Message Date
abijah
5247139fe8 Changed prints to use the new logging system
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@439 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-31 01:23:27 +00:00
abijah
87db010dc1 Discovered that an earlier implementation of Model::pr is now being overridden by the AppModel. This is probably a good thing, but it does mean that we're getting a ton of Model prints that we don't want. I added a class logging mechanism to allow individual classes to be turned up or down, and set the default for Model to be very low
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@438 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-31 00:00:10 +00:00
abijah
d2a4021d6f Discovered that an earlier implementation of Model::pr is now being overridden by the AppModel. This is probably a good thing, but it does mean that we're getting a ton of Model prints that we don't want. I added a class logging mechanism to allow individual classes to be turned up or down, and set the default for Model to be very low
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@438 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-31 00:00:10 +00:00
abijah
9360ebe661 Added the debug file/line output directly into the AppModel::_pr function, as the builtin pr function simply logs the same file line for every call.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@437 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 23:32:10 +00:00
abijah
b759f29d91 Added the debug file/line output directly into the AppModel::_pr function, as the builtin pr function simply logs the same file line for every call.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@437 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 23:32:10 +00:00
abijah
32c81b7367 Finally added a logging mechanism. Only one file has been converted at the moment. I'll go in pieces, as debugging goes on.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@436 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 23:20:47 +00:00
abijah
c0d26a8e95 Finally added a logging mechanism. Only one file has been converted at the moment. I'll go in pieces, as debugging goes on.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@436 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 23:20:47 +00:00
abijah
0b8d8fe1ac Changed the StatementEntry type enum from CREDIT to SURPLUS. I never liked using the term CREDIT, since its use is confusing along side DEBIT/CREDIT. I couldn't think of another name earlier, which is why I used CREDIT, but I decided anything other than CREDIT is good, so I chose SURPLUS.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@435 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 21:40:38 +00:00
abijah
a1f30804a7 Changed the StatementEntry type enum from CREDIT to SURPLUS. I never liked using the term CREDIT, since its use is confusing along side DEBIT/CREDIT. I couldn't think of another name earlier, which is why I used CREDIT, but I decided anything other than CREDIT is good, so I chose SURPLUS.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@435 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 21:40:38 +00:00
abijah
55b3ec947e Logged a new bug
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@434 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 21:39:07 +00:00
abijah
0cb961925d The conditions were clamped down too tight, as they prevented something like 'Table.field !='
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@433 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 21:34:03 +00:00
abijah
876d9b3d33 The conditions were clamped down too tight, as they prevented something like 'Table.field !='
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@433 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 21:34:03 +00:00
abijah
fbfc973dad Included a possible mechanism for including the nsf ledger entries when viewing a tender
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@432 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 21:06:02 +00:00
abijah
d33bf24958 Included a possible mechanism for including the nsf ledger entries when viewing a tender
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@432 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 21:06:02 +00:00
abijah
24f245c3c8 Tweaked filtering to allow for non-trivial conditions
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@431 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 20:59:33 +00:00
abijah
424cb0ea4f Tweaked filtering to allow for non-trivial conditions
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@431 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 20:59:33 +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
63de30d392 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@430 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 19:45:19 +00:00
abijah
de0cf6467a Moved the filtering split to a virtual function.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@429 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 19:07:21 +00:00
abijah
07232c77d5 Moved the filtering split to a virtual function.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@429 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 19:07:21 +00:00
abijah
48fb7383de Added effective date to each NSF entry, and fixed the account bug with receipts/payments. There is still a bug/question on how to handle nsf credits. It would be nice to simply delete the credit, since the check bounced, but then the original transaction will not add up. Either we decide that it doesn't need to add up, figure out a different type for the credit, or add a void flag to each statement entry and just void out nsf items. Or instead of a void flag, have an nsf_statement_entry_id which will also tie the payment/credit to the nsf payment/credit.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@428 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 18:23:37 +00:00
abijah
1e7557de71 Added effective date to each NSF entry, and fixed the account bug with receipts/payments. There is still a bug/question on how to handle nsf credits. It would be nice to simply delete the credit, since the check bounced, but then the original transaction will not add up. Either we decide that it doesn't need to add up, figure out a different type for the credit, or add a void flag to each statement entry and just void out nsf items. Or instead of a void flag, have an nsf_statement_entry_id which will also tie the payment/credit to the nsf payment/credit.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@428 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 18:23:37 +00:00
abijah
94c0efa881 This is probably what we really want for NSF... two transactions. One for backing out the bank deposit, and the other for adjusting A/R and all the associated statement entries. This is working reasonably well, even seemingly fine for the collected rents report. I do see that there is another bug though, that is causing statement entries to have the opposite account_id than intended (A/R instead of Cash) when entering new receipts. Not sure when I broke that, but it must have been when working on deposits.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@427 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 07:30:50 +00:00
abijah
d91957faed This is probably what we really want for NSF... two transactions. One for backing out the bank deposit, and the other for adjusting A/R and all the associated statement entries. This is working reasonably well, even seemingly fine for the collected rents report. I do see that there is another bug though, that is causing statement entries to have the opposite account_id than intended (A/R instead of Cash) when entering new receipts. Not sure when I broke that, but it must have been when working on deposits.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@427 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 07:30:50 +00:00
abijah
7450d2a98e Preliminary work on NSF. It's far from working, but we're headed in the right direction.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@426 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 06:29:41 +00:00
abijah
56e6aa1f34 Preliminary work on NSF. It's far from working, but we're headed in the right direction.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@426 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 06:29:41 +00:00
abijah
3e715bae9f In the cleanup of r423, some code accidentally got squashed. This checkin undoes that problem
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@425 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 06:09:05 +00:00
abijah
6e759e8589 In the cleanup of r423, some code accidentally got squashed. This checkin undoes that problem
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@425 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 06:09:05 +00:00
abijah
347aa20622 Fixed problem when trying to calculate transaction stats. The current solution is a bit dodgy, but by limiting the queries to LedgerEntry and StatementEntry, it works without too much extra effort.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@424 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 02:47:43 +00:00
abijah
9733226dfd Fixed problem when trying to calculate transaction stats. The current solution is a bit dodgy, but by limiting the queries to LedgerEntry and StatementEntry, it works without too much extra effort.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@424 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 02:47:43 +00:00
abijah
510ca489ec Cleanup of old lingering functions and some comment blocks
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@423 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 02:39:09 +00:00
abijah
be2865b4d7 Cleanup of old lingering functions and some comment blocks
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@423 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 02:39:09 +00:00
abijah
e4426cde55 Fixed the problem with zero dollar balance forward entries when closing a ledger.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@422 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 02:17:49 +00:00
abijah
adddfecada Fixed the problem with zero dollar balance forward entries when closing a ledger.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@422 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 02:17:49 +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
55c5c9e9e6 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@421 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 01:59:10 +00:00
abijah
eb209a455b Disabled submission of tender types that have no items
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@420 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 23:25:26 +00:00
abijah
42677ae2f4 Disabled submission of tender types that have no items
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@420 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 23:25:26 +00:00
abijah
ccf7a5fccd This is the remainder of the previous, invalid, partial checkin.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@419 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 23:25:03 +00:00
abijah
ec8f540107 This is the remainder of the previous, invalid, partial checkin.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@419 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 23:25:03 +00:00
abijah
a8862ea3fd Moved deposit creation to the transactions controller. Added the ability to view prior deposit slips.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@418 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 23:17:00 +00:00
abijah
393c0dbb3f Moved deposit creation to the transactions controller. Added the ability to view prior deposit slips.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@418 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 23:17:00 +00:00
abijah
f6a93af27d Added a minimum age feature to the date formatting. It's not really a perfect solution, but it's working for our needs at the moment.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@417 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 23:16:26 +00:00
abijah
f8413b8784 Added a minimum age feature to the date formatting. It's not really a perfect solution, but it's working for our needs at the moment.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@417 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 23:16:26 +00:00
abijah
e1217cd185 Updated requirements (and unfortunately, had to back some completed items off the list since our latest rework.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@416 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 10:23:08 +00:00
abijah
37d0fe7f3f Removed all the debug comments added to the database by the sitelink script. Noted another defect in the todo list.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@415 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 10:18:13 +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
13f97e5770 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@414 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 10:10:11 +00:00
abijah
438610bdf9 Added customer association to each tender
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@413 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 09:33:29 +00:00
abijah
b789ed62b7 Added customer association to each tender
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@413 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-29 09:33:29 +00:00