abijah
|
267357a0f7
|
Combined the addNsf and addTransaction functions, which was always intended. There is more that could be done, but not all bugs are flushed out yet. Its close enough though, that I want to capture it as is to help work through the subtle issues.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@464 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-08-01 01:47:11 +00:00 |
|
abijah
|
1c2c2b457c
|
More work on handling security deposit utilizations. This is headed in the right direction, but unfortunately, there is a problem if the security deposits have not been paid. I could just ignore it, because it's a low priority problem, but I think the solution might be to just provide a waiver on the unpaid charges. Since I need to implement fee waivers anyway, I'll just move onto that next, and then finish out the security deposit work.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@463 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 21:11:00 +00:00 |
|
abijah
|
b00944a412
|
Changed the reconciledSet to provide an option for returning partially reconciled results. This keeps the same behavior so as not to break anything (although I can only think of paid rents that might suffer).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@462 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 21:07:00 +00:00 |
|
abijah
|
4ef09080be
|
Left a syntax error on the last checkin :-/
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@461 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 19:23:19 +00:00 |
|
abijah
|
b41ce38526
|
Fixed a couple small bugs with assignCredits, one of which was causing charges to get paid out of order.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@460 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 19:20:35 +00:00 |
|
abijah
|
f210388f6c
|
Added logging
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@459 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 18:35:39 +00:00 |
|
abijah
|
645a3a4797
|
Removed the ability to NSF items like Cash
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@458 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 18:19:20 +00:00 |
|
abijah
|
8f79f0401f
|
Added a way to associate the meaningful part of NSF with the corresponding tender.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@456 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 18:10:48 +00:00 |
|
abijah
|
e40778ddbd
|
Doh! So someone actually _was_ using the gridDataFilterConditionsStatement function. Guess it would have been worth grepping for...
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@455 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 17:57:30 +00:00 |
|
abijah
|
6b7ce60ae3
|
Changed the default log level to 5, since we're using rather high levels anyway.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@454 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 17:43:51 +00:00 |
|
abijah
|
2b09f4054f
|
Added some comments, and changed the nsf action to redirect to viewing the tender after creation.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@453 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 17:15:17 +00:00 |
|
abijah
|
33a677431f
|
Some cleanup from the last checkin
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@452 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 16:48:27 +00:00 |
|
abijah
|
9bd37ba282
|
Added the ability to perform partial deposits. After this checkin, I'll clean up some of the commented out sections of things that we're attempted to get this all working.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@451 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 16:41:56 +00:00 |
|
abijah
|
53a8d8fc60
|
Fixed a bug where the condition is of the form array('field' => null). That's a valid condition, but was being treated the same as array('field'). This resolves it, although it will break anyone using the gridDataFilterConditionsStatement virtual function. I don't think anyone is at the moment, although I didn't check.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@450 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 03:46:59 +00:00 |
|
abijah
|
4c7e3d1f58
|
Removed the comment block, since it's not longer needed and has now been saved.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@448 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 03:29:17 +00:00 |
|
abijah
|
5dc5f087ba
|
Added an automatic $35 nsf charge when marking an item as nsf. This required removing the lease_id requirement when adding a transaction, since the charge is not associated with a lease, just a customer. The requirement was artificial anyway; imagine selling POS items to folks that don't even lease from us...
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@447 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 03:07:34 +00:00 |
|
abijah
|
46744a24d3
|
Modified to use the logging mechanism
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@446 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 02:09:45 +00:00 |
|
abijah
|
b553dbb9c3
|
Modified to use the logging mechanism
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@445 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:45:57 +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
|
777a47a27b
|
Added strikethrough over the tender name in grids when the tender is NSF. This helps really call out the situation with NSF items.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@443 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:38:53 +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
|
393d9c9d77
|
Removed the Tender column from grids where the account does not support payments and so the ledger entries should never have a Tender anyway (except for our special case Closing account, which is fine to ignore).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@441 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:34:45 +00:00 |
|
abijah
|
17cd00c90e
|
Renamed prExit to prReturn, to be consitent with the return statement where it should be used. Also, modified the chargePaymentFields to be more explicit on the balance, in anticipation of the new type VOID
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@440 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:31:45 +00:00 |
|
abijah
|
066acd14f0
|
Changed prints to use the new logging system
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
3128880c4d
|
Fixed problem with grid display when part of a form
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@411 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-29 08:50:44 +00:00 |
|
abijah
|
e23413b4d8
|
Cleaned up some of the old code concerning the deposit action. It's not done, as I'll next be experimenting with having the tenders controller handle deposits.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@410 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-29 02:43:30 +00:00 |
|