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 |
|
abijah
|
b225775a91
|
Suppressed all the debug print statements from transaction insertion.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@398 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-28 02:40:42 +00:00 |
|
abijah
|
a5565546d1
|
Half-kludgy fix to a filtering bug when a table is already specified using the simple notation, e.g. array('Table'), instead of the more complete form array('Table' => array(...))
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@397 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-28 02:39:44 +00:00 |
|
abijah
|
f0b65dcf74
|
Bug fixes to get lease security deposit and balance information working.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@396 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-28 01:18:02 +00:00 |
|
abijah
|
ad1758a5dc
|
Added a rent column to the units list
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@395 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-28 01:17:09 +00:00 |
|
abijah
|
b3389652fd
|
Further tweaked the code to add new transactions, primarily by creating separate verification and addition functions in each underlying model. There are logic changes as well, such as adding in the other half of the missing double entry (as well as the double entry itself). This checkin also introduces the creation of CREDIT statement entries, when the customer has overpayed. It's working fairly well, although undoubtedly will need more tweaking.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@394 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-28 01:16:42 +00:00 |
|
abijah
|
ba62eed027
|
Added a debug dump function to print out a model without getting stuck on the recursive inclusion of other models.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@393 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-28 01:11:27 +00:00 |
|
abijah
|
3dc751c863
|
Implemented a mechanism to track customer overpayments (credits). Also implemented a reconciling algorithm, matching payments to charges. Preliminary testing seems to show that it works well. More thorough testing required.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@392 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-27 04:18:38 +00:00 |
|
abijah
|
68fe787209
|
Playing with different means for determining stats. Nothing decided yet.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@391 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-26 23:23:19 +00:00 |
|
abijah
|
d4292a85a0
|
Added ability to toggle between one big closing ledger entry, and one per house
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@390 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-25 08:08:47 +00:00 |
|
abijah
|
f9635419dd
|
Added transaction stats. Added (possibly unwanted) columns.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@389 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-25 08:06:50 +00:00 |
|
abijah
|
d8f10bfd13
|
Fixed yet another bug in the merging of actions & options
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@388 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-25 07:57:56 +00:00 |
|
abijah
|
25b7da57f3
|
Made progress adapting the receipt code onto the latest db changes.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@387 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 07:43:42 +00:00 |
|
abijah
|
29fe265daa
|
Made changes to get field alignment on receipt entry. I can get the text on the left by floating the label, but actually, I think I prefer the boxes on the left.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@386 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 05:01:29 +00:00 |
|
abijah
|
769c02a5f1
|
Reverted back to r383.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@385 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 04:16:33 +00:00 |
|
abijah
|
476a179e7b
|
I tried using a table for the receipt entry, which seems like it should work, but really doesn't. I'll check it in for future reference, but I'll be reverting just afterwards
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@384 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 04:15:39 +00:00 |
|
abijah
|
df8ebe45ef
|
I accidentally tried to cehck in tender.php instead of the intended tender_type.php
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@383 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 03:58:57 +00:00 |
|
abijah
|
0bf458f243
|
Begin the move from having receipts generated based on 'collectable' account, to being based on what the database considers to be a form of tender. This has the excellent benefit of removing all those hardcoded data1/2 fields for each different tender type. That's all database driven now. There is more to do, but this is a good step forward.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@382 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 03:58:12 +00:00 |
|
abijah
|
18c4f5ea48
|
Forgot this file on the last checkin, since it was using the trackable field
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@381 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 03:55:54 +00:00 |
|
abijah
|
a0f33054cb
|
Modified the application to reflect the changed field names in the accounts table. For example, payable is now payments.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@380 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 03:22:56 +00:00 |
|
abijah
|
0f00b42d1f
|
Modified the closing sum to be a single receipt, and a single debit/credit to the ledger of choice (presently Equity). This was mostly a test to check the logic of multiple payments having only a single accounting transaction. It seems to work, but I suspect we'll have trouble when we start to figure out customer account balances, since the receipt has NULL for the customer_id (since it is a receipt for many customers). Depending on the customer balance / reconciliation logic, this may or may not fly.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@379 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 03:12:18 +00:00 |
|
abijah
|
1e0b96953e
|
Added a much more user friendly way to present the data1-4 labels for each type, now that we have a tender_types table. Still not a perfect solution, but definitely good enough for now. Modified the application to recognize the new tender_types table. There may be other modifications necessary, but this gets the most obvious spot.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@378 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 02:07:43 +00:00 |
|