abijah
|
7c34c7faff
|
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/site@384 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 04:15:39 +00:00 |
|
abijah
|
e448519a1e
|
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/site@383 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 03:58:57 +00:00 |
|
abijah
|
a4dff8a6ed
|
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/site@382 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 03:58:12 +00:00 |
|
abijah
|
2db0fc12d3
|
Forgot this file on the last checkin, since it was using the trackable field
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@381 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 03:55:54 +00:00 |
|
abijah
|
991d4d717e
|
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/site@380 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 03:22:56 +00:00 |
|
abijah
|
446ba0ce28
|
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/site@378 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-24 02:07:43 +00:00 |
|
abijah
|
4cab2c09c1
|
Fixed some minor display issues and tweaks to compensate for the new stats() algorithm. More are necessary, I'm sure.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@375 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 23:54:40 +00:00 |
|
abijah
|
127f7f3eb9
|
Finally resolved the StatementEntries::stats() query issue. It has been lingering in an incomplete state because it wasn't clear what it was supposed to really do. I think it is now performing the task expected of it.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@374 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 23:52:59 +00:00 |
|
abijah
|
ce23bf5abd
|
Fixed a bug with idlist caused when we moved all the post data into the 'post' field
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@373 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 23:45:04 +00:00 |
|
abijah
|
5cf40147d9
|
First pass implementation at generating an invoice, which seems to be working. Largely untested, but worth checking in. Next is to get receipts using the same algorithm, and after that will be to work on a reconciling mechanism, creating payments, and matching them to charges. This checkin includes an additional customer_id fields as part of the transactions table. I think it was an oversight not to be there, as we need some way to keep track of monies which have been paid by a customer, yet not applied. If there is a different way to do it (short of actually having each ledger entry hold customer_id), it escapes me at the moment.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@372 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 21:24:49 +00:00 |
|
abijah
|
4a94fc3798
|
More tweaking to all of the grid displays. This was mostly visual, but includes some bug fixes as well (such as a manual filter override in the ledger_entries controller).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@371 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 16:53:33 +00:00 |
|
abijah
|
3c22378498
|
Modified Filtering to have a separate virtual function for Tables and Conditions. This was prompted because a derived controller could override the function to return null to prevent adding a filtering table (such as if the table was already added as a non top-level table), and although the app controller would correctly prevent adding the filter table to the set, it would also prevent adding the filter condition as well. So, making two virtual functions, one for table name when defining filter tables, and one for table name when defining filter conditions, allows the derived controller to stop a table from being added to the set, yet still let the condition through (without having to override the entire filter condition logic).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@370 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 16:51:32 +00:00 |
|
abijah
|
43b4ef8890
|
Yet another tweak to Linkable for merging fields and conditions of the options and associations variables.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@369 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 16:35:53 +00:00 |
|
abijah
|
25bc1607cc
|
Many, many changes, and yet still much to do. Many things are working, but certainly nothing beyond simply data retrieval (no editing or adding of any data). Also, some work is still required to ensure the grids have the right columns; we can strip out certain columns for some views (such as removing customer from the leases grid of the customer view... completely redundant). And of course, there are still many bugs and lots to clean up.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@368 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 01:49:46 +00:00 |
|
abijah
|
85edb1c658
|
Changed the default table configuration to be link instead of contain. contain was never really desired, it just got thrown in there since it wasn't clear how link would behave, and we needed the essential effect of recursive=-1.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@367 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-23 01:11:30 +00:00 |
|
abijah
|
368b730744
|
Added automagic filtering capability to the app controller. Also, lumped all items needing serialization into a single 'post' item, instead of continuing to piecemeal each added post item. There will be some changes required to some controllers, since custom post data has changed location, but it should be minor. To make use of the new filtering methods, each view will have to set the 'filter' parameter at the time of grid setup.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@365 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-22 23:31:41 +00:00 |
|
abijah
|
8db607ffc5
|
Of course, the last fix didn't work... I don't know why it looked like it was working. This fix should resolve the issue.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@364 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-22 23:12:04 +00:00 |
|
abijah
|
030617713d
|
Attempted fix for a missing conditions/fields bug. The fix would probably have just been to use empty instead of isset, since apparently the defaults for these items are an empty string instead of null (yuck). However, I already had done a bit of minor logic change and prefer the new form, so that's why more than just the isset call was modified.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@363 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-22 22:54:02 +00:00 |
|
abijah
|
1e359f816c
|
Fixed the Linkable behavior from polluting the query fields when performing a count query.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@362 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-22 22:27:55 +00:00 |
|
abijah
|
b641dc98ec
|
Renamed jqGridData functions to be just gridData. Restructured the virtual function calls with an anticipated need for gridDataCount to be overridden as a whole, instead of just overriding the individual pieces.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@361 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-22 17:06:44 +00:00 |
|
abijah
|
f52fba96c1
|
Making progress. Much still to do, but there are hints of functionality finally returning so I'm snapshotting.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@360 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-21 10:23:52 +00:00 |
|
abijah
|
5a16e497ad
|
Customers is working somewhat. I want to see if the grid query logic can be simplified, so I'm checking in first
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@359 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-21 09:40:51 +00:00 |
|
abijah
|
d5bcd9a496
|
Another snapshot
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@356 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-20 23:35:11 +00:00 |
|
abijah
|
bfbf119aca
|
Modified Linkable to be recursive, which is needed to support certain queries that have models joined based on prior joined models. The old way went breadth first, which prevented such a join from working
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@355 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-20 20:22:06 +00:00 |
|
abijah
|
7181bc7f9b
|
Minor logic and formatting changes. Considering making Linkable operate recursively.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@354 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-20 19:00:54 +00:00 |
|
abijah
|
7304a0e889
|
Another snapshot. I think I'll be taking the CREDIT/DEBIT reconcile functionality out.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@353 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-20 02:17:54 +00:00 |
|
abijah
|
3d262fd4db
|
This rework is nowhere near complete, but there are certain things that are falling in place, and worth capturing. I started a branch for just this purpose of being able to check in intermediate work.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@352 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-19 23:35:25 +00:00 |
|
abijah
|
af0c10f6a6
|
D:\bin\svnbranch.pl: Branch from /branches/invoice_receipt_20090629 to /branches/yafr_20090716
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@351 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-16 18:52:28 +00:00 |
|
abijah
|
115c82cd21
|
Still trying to figure out what issuing a refund should look like. I switched the entry to be negative, which may (should) make reporting easier.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@350 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-16 07:27:18 +00:00 |
|
abijah
|
331e235e77
|
Added debugging to the serialize function. I don't really want to keep it, but I don't want to lose it either. At least one check in before I clean it up again (if I do).
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@349 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-16 07:12:18 +00:00 |
|
abijah
|
d0dfd8657c
|
Added some starter code to figure out how we handle refunds. This is NOT working, just a snapshot of progress.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@348 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 18:37:51 +00:00 |
|
abijah
|
4d4bebc3d3
|
Added a couple helper functions to Ledger.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@347 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 18:33:30 +00:00 |
|
abijah
|
ae04aafaca
|
Eliminated the LedgerEntry::nsf code, which was replaced with MonetarySource::nsf.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@346 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 18:32:14 +00:00 |
|
abijah
|
fcb23d12a5
|
minor cleanup of the paid through function
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@344 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 09:22:19 +00:00 |
|
abijah
|
dd7da1489d
|
Added a paid-through field for leases. Now I just need to add it to the grid query, although it's a change that can wait.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@343 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 09:18:56 +00:00 |
|
abijah
|
85cc6d7c6a
|
Changed the default collected results to be those collected into any account, not just payable ones.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@342 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 08:01:56 +00:00 |
|
abijah
|
e457f87c42
|
Fixed bug preventing customer links from working
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@341 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 07:55:40 +00:00 |
|
abijah
|
e8d12882cc
|
Fixed the total amount collected to reflect the _actual_ total, not just the page total. Now the grid no longer needs to be 500 rows long.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@340 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 07:47:13 +00:00 |
|
abijah
|
8f2b43239d
|
Added a 'Calculating...' message before the grid has rendered.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@339 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 07:45:23 +00:00 |
|
abijah
|
51d786ab8b
|
Added generic mechanism to add userdata to the grid results. A 'userdata' callout function would be nice, but in practice, userdata may get added anywhere along the line, which is much easier than trying to figure out when to call such a callout and what parameters it would need to be passed.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@338 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 07:44:51 +00:00 |
|
abijah
|
6f4519fe56
|
Layout manipulation to the collected page.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@337 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 07:13:41 +00:00 |
|
abijah
|
69adfd900c
|
Standardized the grid events interface, to ease the burden on the views and ensure that the load functions could be used by the application without wiping out the debug functionality that was built into jqGrid.ctp
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@336 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 06:21:55 +00:00 |
|
abijah
|
33ba912a7e
|
Fixed the balance summary of the collected report, and marked off NSF and collected report requirements.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@335 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 05:42:10 +00:00 |
|
abijah
|
c4942b922b
|
Finally, a working NSF implementation. Ledger Entry tracking stops at the Bank account, since we switch from positive to negative ledger entries. However, we're not going to reconcile debits to credits in the bank account anyway, so I just disabled tracking on the account.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@334 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 03:06:59 +00:00 |
|
abijah
|
2588fd6a91
|
A final attempt to reconcile the cash in the bank account. It just wasn't designed this way, so I'll strip it out on the next checkin.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@333 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 01:33:06 +00:00 |
|
abijah
|
3baa199fda
|
Multiple e6 entries now ensure that NSF reconciles appropriately to e1 such that the lease is correctly taken into account.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@332 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 01:05:44 +00:00 |
|
abijah
|
68a10e783b
|
getting closer to a workable NSF solution. I don't like it, but it might allow us to move forward in the short term. This solution required a stupid kludge to get CakePHP to work with the necessary query, which sucks but is not too cumbersome. What isn't working at the moment, is for the NSF to show up on the lease account, which is what I'll try to work out next. Also, the monies deposited are not trackable, since I'm not reconciling them (due to the sign flip). Not sure if there is an easily workable solution. Also, to get the collected rent report to show this negative income, it requires the bank account be part of the query, which I accomplish in the short term by setting the 'payable' flag. I may need to fix/kludge this by running the NSF through the receipt account and adding the NSF account to the list on the collected page.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@331 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-15 00:21:23 +00:00 |
|
abijah
|
34e3251240
|
Just updated the comments, and added e2a and e1 into the query. No functional change yet.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@330 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-14 21:44:19 +00:00 |
|
abijah
|
01aa2d1697
|
The NSF functionality is working good from a strictly general ledger point of view. However, as it's implemented, it's leaving us unable to observe that we've actually experienced negative collected rent. This is a big problem, but I've put a couple notes in place on how I might try to proceed on this next, and am checking in this semi-working version.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@329 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-14 20:48:16 +00:00 |
|
abijah
|
69b3cf3ed3
|
Implementing NSF in MonetarySourcesController. It's nowhere near done, but it seems we're headed in the right direction.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@328 97e9348a-65ac-dc4b-aefc-98561f571b83
|
2009-07-13 10:14:38 +00:00 |
|