abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
928 Commits 31 Branches 9 Tags
main
Commit Graph

51 Commits

Author SHA1 Message Date
abijah
a3b376544c Replaced the hardcoded 'level' checks, and incorporated (as a first pass) the new permission mechanism 
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@802 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-08-28 07:11:14 +00:00
abijah
f545502162 Changed how sidemenu links work, so that order of execution doesn't have to control ordering of the list. 
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@734 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-08-22 22:47:41 +00:00
abijah
73c5a20158 Eliminated (at least temporarily) the single ledger entry view, redirecting to the double entry view instead. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@601 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-08-17 06:30:01 +00:00
abijah
a9c3c40053 Bug fix for matching ledger entry to double entry 
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@572 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-08-16 00:49:21 +00:00
abijah
4125d7ba16 Quick and dirty hack to get double entries to show again. 
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@571 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-08-16 00:45:11 +00:00
abijah
d92acf12de Dropped the security level for viewing statement and ledger entries 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@555 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-08-14 21:01:25 +00:00
abijah
9c55a047a8 Implemented very crude attempt at security privleges. This is not really intended to be security, just a quick and dirty mechanism to avoid prying eyes. More robust security is left to future implementation. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@538 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-08-11 18:22:21 +00:00
abijah
1dd0b14861 More work with security deposits, reversals, and balances. I've tried to work many different corner cases, but know that not everything has been tested. I think the next steps for testing will be to put in some real data. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@499 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-08-07 00:10:28 +00:00
abijah
e09fb7d258 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@455 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-31 17:57:30 +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
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
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
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
708759765f 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@371 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-23 16:53:33 +00:00
abijah
234999b4d2 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@368 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-23 01:49:46 +00:00
abijah
7aa026f4e0 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@361 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-22 17:06:44 +00:00
abijah
93ebc450fe 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@360 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-21 10:23:52 +00:00
abijah
6ac0204baf 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@352 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-19 23:35:25 +00:00
abijah
3313a18407 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@350 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-16 07:27:18 +00:00
abijah
405e20f37f 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@342 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-15 08:01:56 +00:00
abijah
75ff8a2a40 Fixed bug preventing customer links from working 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@341 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-15 07:55:40 +00:00
abijah
20c1284788 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@340 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-15 07:47:13 +00:00
abijah
0649329dde 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@335 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-15 05:42:10 +00:00
abijah
50c4ee225f 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@334 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-15 03:06:59 +00:00
abijah
8b7c27b5db Added a ledger entry listing on the monetary source view page. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@327 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-13 09:54:49 +00:00
abijah
8a3c6ae21b A working version of the collected report for accounts. There is still some error checking to do, since we don't want this report for just any account. Also, we may wish to do away with the form to prevent accidental submittal. Finally, it would be nice to do away with the button, and automatically update on date changes. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@324 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-13 02:24:31 +00:00
abijah
03af4e731f Fixed the last bug... I had just forgotten to use ReceiptTransaction for the dates in question. Also, I elminated the collected element, and just added a minor tweak to ledger_entries to make it work. I'll work on added user entered dates & accounts soon (perhaps next). 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@323 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-12 21:00:38 +00:00
abijah
2cd73ed9e8 Experiment with converting the 'collected' grid results to be a query of the rent ledger entries that resolve out to payments, instead of payment entries that resolve rent entries. It's a subtle difference, but gives a couple benefits. First, rent looks like rent, meaning that if someone paid $30 in rent over 6 days at $5 per day, the collected rent entry shows $30, not 6 entries of $5. Depending on your perspective, that can be a good or bad thing. Since we're looking at collected entries of an account, I think each account entry should only get one line, so this seems like it's a logical fit. The second thing is that I might be able to do away with a collected page altogether, and simply add a 'collected' column to each account/ledger. Not sure on that, especially since we'll be wanting a date range, and probably a selection of which accounts consititute payment (such that the user could simply see rent collected in cash or similar). In any event, this is NOT working at the moment, I seem to be getting invalid data. To figure this out, I'm going to check in now, revert back, and print the results for reference, since it was working before this change, back at r320 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@322 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-12 20:23:46 +00:00
abijah
6e1c684a06 Implemented a list that checks for collected rents. There is AccountsController::collected, which I'm keeping at the moment, but I decided to move the logic into ledger_entries, since ultimately that's what we want a list of and it doesn't make sense to add a bunch of LedgerEntry logic into the jqGrid query of AccountsController. Of course, right now there is hardcoded calendar functions, and hardcoded exclusion of the Concession Account. I will probably offer up two calendars to provide a range, and a list of checkboxes of each payable account. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@318 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-12 18:01:01 +00:00
abijah
ccf0138eee Added flag to allow ledger entry reversals, regardless of the reconciled status. I'm not sure how we really want to handle reversals. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@312 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-11 15:50:48 +00:00
abijah
b8fd17efcf Added mechanism to reverse a ledger entry. For now I've restricted it to those ledger entries that have not already been reconciled in some way. More thought will have to go into this, especially with respect to tenants who have pre-paid and then move out early. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@309 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-11 09:06:36 +00:00
abijah
4b43433d2d Fixed a bug causing leder_entry lists to only list one item from each transaction (although the numbers were right, the other ledger_entry fields were not). This was due to the changes I made to ledger_entries.ctp when moving everything to the Grid Helper. Prior to that, the default was to group by transactions, unless notxgroup was defined. Since it was experimental, it was hardcoded to false in the ledger_entries element, so there was no problem. After Grid Helper, it was inadvertantly deleted, hence the bug. I changed the default to be NOT to group by transaction, and also invalidate the ledger_entry fields when we do group that way. So, this bug should be put mostly to rest, although I don't like converting the ledger_entry list into a simple transaction list (we do have another element for that after all). Oh well, works for now. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@304 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-11 01:52:32 +00:00
abijah
8d2a544042 More changes to the ledger_entry view 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@300 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-11 00:34:43 +00:00
abijah
d9297d89ab No real visible changes, but started work on making ledger entries more clear. I'll do more in a moment, just capturing a snapshot. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@299 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-10 21:21:49 +00:00
abijah
7a31f5cbd2 Removed monetary_source_type. It was redundant, and it's entirely unclear what purpose it ultimately would or could serve. Our use of different accounts for Check, Cash, etc likely obsoleted any intention we might have had for monetary_source_type 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@288 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-09 08:28:34 +00:00
abijah
014fa0feb9 Modified effective dates to be part of the ledger entry, not the transaction. This is the logically correct way, as a transaction is simply a collection of entries which might be anywhere from completely aligned to totally disjoint from one another (more likely the former). As a practical example, consider a move-in invoice, with security deposit (effective immediately with no end date), a prorated rent (effective move-in day through the end of the first month), and first full months rent (effective beginning of next month through the end of next month). There is certainly more work to be done on this, and testing was minimal. It does seem to be functioning though, so I'm checking in. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@256 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-08 16:04:53 +00:00
abijah
1c8cc70a28 Moving back to the Invoice/Receipt mechanism. Seems to work fairly well, even if it's non-standard. 
git-svn-id: file:///svn-source/pmgr/branches/charge_credit_20090629@189 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-30 04:47:18 +00:00
abijah
ce4fa4131a More changes. I just can't seem to come up with a solution that works that I like. The problem now, without invoice/receipt, is that one check cannot cleanly pay for two units. 
git-svn-id: file:///svn-source/pmgr/branches/single_AR_20090622@182 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-24 00:33:39 +00:00
abijah
80f8bd36d5 Nowhere near done yet, but checking in a snapshot of semi-working code. There is some simultaneous support for both with and without use of the Invoice/Receipt account. I want to do away with them completely, but will need to change how sitelink payments are mapped (right now, they split a payment into multiple parts to match the charge). 
git-svn-id: file:///svn-source/pmgr/branches/single_AR_20090622@181 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-23 19:04:41 +00:00
abijah
20b8908a00 Experiment to group ledger entries by their transaction ID instead of their entry ID. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@177 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-22 19:03:08 +00:00
abijah
3e5ac64108 Although I'm not too happy with the modifications, I do have a working version that minimizes the columns need to display ledger entries. The logic feels screwy to me, but I've beat my head on it long enough. I'll move on to something else and come back to it when my head clears. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@166 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-18 03:57:43 +00:00
abijah
fae90c3fa9 Added initial support for ledger entry reconciliation (e.g. matching payments to charges). 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@152 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-16 21:40:46 +00:00
abijah
fe7d7c6b0f Removed another instance of using Ledger.name 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@145 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-16 04:48:17 +00:00
abijah
388dbc0540 Added accounts to the ledger entry grids, since it's tough to figure out what's going on without them. This exposed a problem with the controller name automatically being determined in the Links function, so it now looks for an optional controller parameter. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@141 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 23:22:38 +00:00
abijah
1495bb3373 Added monetary source into the ledger entry lists. This may be more information than is needed on the listing, but I'll take it out later if so. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@139 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 21:52:38 +00:00
abijah
543e2daa43 Moved the ledger_entries controller/view to jqGrid. 
Changed the app controller jqGrid virtual functions for getting the tables for both count and the full query.  The ExtraTables bit was too confusing, and was only intended to allow the user to specify a subset for count and augment it for full query.  This is easily accomplished by having DataTables just call DataCountTables first... one line solution ends the confusion.

Modified linkable behavior to support a %{MODEL_ALIAS} tag, which is replaced in the relationship conditions at runtime with the actual model alias.  This is experimental at best, and certainly will create a problem for any model that ends up using the conditions in 'contain' instead of 'link'.

Broke the LedgerEntry->findInLedgerContext function out into multiple pieces, so those same pieces could be used in the LedgerEntries controller to populate jqGrid.

Changed the ledger_entries element, as a special case, to also allow listing control from ledger_id and account_type, instead of idlist as a mechanism for populating the grid.

Changed the infobox summary css, which will break several pages until I rework them.

Some next steps include fixing the broken infoboxes, and changing the transactions view to use the ledger_entries element.  This also means the ledger_entries element will need to add support for idlist, or if we have any credit/debit issues, perhaps another custom transaction_id instead.



git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@134 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 19:41:20 +00:00
abijah
3911b3303f Removed the useless pagination code from ledger_entries 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@133 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 06:46:05 +00:00
abijah
18b928411b Added the Containable behavior back into the AppModel, since it's obviously getting used in every controller. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@91 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-10 21:09:23 +00:00
abijah
f8eb45a0b9 Added lease and ledger_entry controllers/views. Minor bugfixes as well. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@85 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-10 08:53:22 +00:00
abijah
55b896a9f0 Primarly a cleanup checkin, although a couple minor bugfixes were included as well. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@82 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-10 05:14:08 +00:00