abijah
|
3e2d219c8d
|
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@448 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 03:29:17 +00:00 |
|
abijah
|
57d593fc38
|
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@447 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 03:07:34 +00:00 |
|
abijah
|
65b7137f21
|
Modified to use the logging mechanism
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@446 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 02:09:45 +00:00 |
|
abijah
|
323519ab75
|
Modified to use the logging mechanism
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@445 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:45:57 +00:00 |
|
abijah
|
a1a9c7800b
|
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@444 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:40:16 +00:00 |
|
abijah
|
fe17f87f7d
|
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@443 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:38:53 +00:00 |
|
abijah
|
6b9279f5b0
|
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@442 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:35:45 +00:00 |
|
abijah
|
2882b1917c
|
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@441 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:34:45 +00:00 |
|
abijah
|
f707448b05
|
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@440 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-31 01:31:45 +00:00 |
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
abijah
|
2ffe04e3e4
|
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@412 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-29 08:55:09 +00:00 |
|
abijah
|
cdba179d79
|
Fixed problem with grid display when part of a form
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@411 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-29 08:50:44 +00:00 |
|
abijah
|
5ba6438b77
|
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@410 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-29 02:43:30 +00:00 |
|
abijah
|
a4459ef0de
|
Added more information to the tender grid, and a new query to return depositable types
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@409 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-29 02:41:50 +00:00 |
|
abijah
|
e7b71e0abb
|
Fixed the pluralization of cash
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@408 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-29 02:39:31 +00:00 |
|
abijah
|
0c06ef6d71
|
Started work on handling NSF, but will deal with deposits first, since we can't get an NSF without a deposit first.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@407 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-29 01:51:34 +00:00 |
|
abijah
|
0f42ad9b07
|
Minor change to the default accounts on the collected screen. Probably will be tweaked again later.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@406 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-29 01:50:33 +00:00 |
|
abijah
|
c20b287c53
|
Added the debug class to the debug grid query link, so that it doesn't show on print media.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@405 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-29 01:43:08 +00:00 |
|
abijah
|
ef4d8d4d30
|
Increased font size for the page number input at the bottom of each jqGrid
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@404 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-29 01:42:16 +00:00 |
|
abijah
|
e7a659a690
|
Added a print media CSS file, and fixed the jqGrid print problem of truncating the table to a single page. Also, used the opportunity to disable printing of the side menu and the debug toolkit, as well as some more jqGrid cleanup.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@403 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-29 01:41:34 +00:00 |
|
abijah
|
f6ee56501d
|
Got the collected reports working again. NSF hasn't been tested yet, because NSF entry is not yet working.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@402 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-28 16:08:15 +00:00 |
|
abijah
|
826eb63da1
|
Modified the grid helper to allow a view to directly specify custom post data without wiping out any custom post data set by the element. It's not been used or tested.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@401 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-28 16:07:34 +00:00 |
|
abijah
|
6cf6dda3f8
|
Fixed a bug that was causing multiple tender types to have a name like 'Check #'
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@400 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-28 16:06:03 +00:00 |
|
abijah
|
5446f6a266
|
Removed Brenda Harmon test code.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@399 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-28 02:41:11 +00:00 |
|