Commit Graph

55 Commits

Author SHA1 Message Date
abijah
2e36d46329 Minor tweaks, a shame for checkin r500 :-(
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@500 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-07 03:55:01 +00:00
abijah
cb969ba340 Discovered that the use of the term 'Payment' has been a misnomer. A company uses the term payment to indicate the monies it pays to _others_. Changing this leaves us without a good replacement term, but disbursement really seems to fit the bill. As comfortable as the term payment was, it was odd in many respects and disbursement does seem more appropriate. I'm sure there are several lingering bugs from this massive search/replace exercise, but this is a decent baseline for the change.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@488 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-05 01:00:09 +00:00
abijah
0ff91bf4d8 Even with all the effort put into getting the counts right on the customers grid, it still didn't work right. The root of the problem is the join to CurrentLease, which can result in multiple rows for the same customer. I can revisit this in the future to put some clever solution back in, but in the meantime, it was easiest just to add fields to the customers table, and simply update it whenever the customer lease situation changes. I don't like it... but it just made life much simpler.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@481 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-04 19:25:39 +00:00
abijah
91fdef9997 Must have had a brain freeze to be placing closing monies directly in Equity, since it is a credit account and doing so only ran the account into a negative balance. Transfers out of A/R need to go to an asset account, and so I reverted this back to Closing.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@449 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-31 03:36:11 +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
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
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
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
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
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
abijah
b408d86a98 Added Concession as a form of tender (which clearly isn't legal tender, and might not even be tender... who knows).
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@377 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-24 01:48:58 +00:00
abijah
e739282d17 Modified tenders to use a tender_type_id, not only for the ability to dynamically add types later, but primarily so that a type could be associated with an account, instead of hardcoding it in the application. With this, I changed several of the account field names, but they shouldn't be in too heavy use in the application.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@376 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-24 01:43:41 +00:00
abijah
04bc284a76 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@372 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-23 21:24:49 +00:00
abijah
8cf8f65474 Changed 'payment' to 'tender', since the payment term has been heavily overloaded. Tender represents legal tender, and replaces what used to be monetary source. I'm not terribly fond of the name, especially the plural form. However, for now at least, it can be distinct from other types of 'payment' and we can change it later if we come up with a better name. Also, added a name to ledger, since one was being manually created at runtime in several spots. This should allow us to consolidate the naming convention to a single spot.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@366 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-22 23:35:41 +00:00
abijah
59e6379977 Definitely not perfect, but the database changes seem to be OK, along with the sitelink script. Certainly workable if not yet complete.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@358 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-21 04:16:54 +00:00
abijah
ae5d4763f9 Adjusted formatting only
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@357 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-21 02:55:43 +00:00
abijah
fc30dfa2e8 Another snapshot. I think I'll be taking the CREDIT/DEBIT reconcile functionality out.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@353 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-20 02:17:54 +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
ece7ab25ae Eliminated the need for the Invoice Account. I'm having a bit of a hard time believing that it works, since it sure seems like we needed the Invoice account for some reason. However, it's entirely possible that we really just had it for symmetry with Receipt (another account which we'd love to delete). It needs more testing, but it works good enough to check in.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@308 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-11 08:23:55 +00:00
abijah
de5f4208eb Added petty cash and a couple higher security accounts, Equity and Loan
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@291 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 16:37:16 +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
645458c081 Added some special cases
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@285 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 06:20:59 +00:00
abijah
977b21ed96 Got rid of the massive variable dump to stdout, and so moved all of the STDERR prints back to STDIN. Also hooked up root_transaction_id, although it's not being used yet (and may never be).
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@275 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 01:21:21 +00:00
abijah
e4132237b9 Trimmed down my contact information and fixed the .com / .info typo
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@274 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 00:45:16 +00:00
abijah
d09af4f475 More work to make the db scripts general
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@266 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 21:49:00 +00:00
abijah
686c58afea Modified the sitelink2pmgr script to print debug information about where it's connecting, and to no longer have schema.sql reference the database. This will create an issue if we delete tables from the file, but we'll deal with that as it comes.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@264 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 21:25:07 +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
5f9b9e15cb Fixed bug with security deposits after I did away with sitelinks use of ledger number some time back
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@254 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 00:52:33 +00:00
abijah
e17cf21351 Removed the debug comments for each invoice/receipt/payment/charge/etc
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@240 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-07 04:29:34 +00:00
abijah
6def9cbb02 Finished implementation of contact edit. This is now saving everything to the database. I hope to now leverage it for a new contact. This checkin includes a bit of code in the sitelink2pmgr script that sets the customer display name. It should have been checked in several revisions ago.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@217 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-05 23:43:35 +00:00
abijah
d77dcfca75 Added ability to move an existing customer into a vacant unit. Changed out all of the 'amount' fields with 'rent', since it's much more self-explanatory. We still need the ability to add customers and contacts. I'll consider doing this by using the insert row ability of jqGrid.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@204 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-03 06:53:41 +00:00
abijah
1ae1b6a4f3 Added a closes table to the schema, so that we can keep track of daily closes, deposits, etc. Moved into the model an operation to close a set of ledgers and make a deposit.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@200 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-02 09:19:33 +00:00
abijah
44df78e69f Finally, finally... a working version for payment entry. The current schema is working well, and seems to handle our technical needs. However, it does seem to be very confusing with the extra accounts. Nonetheless, it does work and so I'll keep going down this path. This checkin also includes a mechanism to close the books on an account (by closing the underlying ledger) and start a new ledger. One of the decisions worth revisiting is separating out ledger entries that are really part of the same transaction. Without this change, inspecting a transaction results in the transaction total being off by a factor of two, since all money movement is in their twice (once for the expected reason, and again to hit the invoice/receipt ledger).
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@195 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-01 08:17:31 +00:00
abijah
0b69e065ae Major change to invoice/receipt algorithms. The end result shouldn't be visible, but there were significant problems understanding how to reconcile entries and this cleaned things up significantly. There may be some bugs left, but quick tests show it to be working
git-svn-id: file:///svn-source/pmgr/branches/charge_credit_20090629@190 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-06-30 17:52:43 +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
b9c1a81c3b Experiment to allow payments to trace back to the charge, even if the amount crosses several ledgers. I'd really like to go a different direction.
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@179 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-06-22 23:42:13 +00:00
abijah
9331b0a412 Should have checked this as part of the last commit (r152), since it is the DB schema changes necessary to support the reconciliation work. Also, the sitelink script was modified to match.
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@153 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-06-16 21:47:57 +00:00
abijah
55dd94681a Added a primary contact for each customer, as there must be someone (or some entity) to contact for every customer. This simply makes it explicit, and has the added benefit of being easier to work with when querying.
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@104 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-06-13 04:19:19 +00:00
abijah
190a9259d4 More changes to how accounts/ledgers/transactions are all handled.
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@78 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-06-10 02:27:03 +00:00
abijah
52032180f3 Fixed more ledger mixups
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@76 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-06-08 02:08:04 +00:00
abijah
2a2d11ba0f Fixed bug causing payments to show up on the A/R ledger instead of the customer ledger.
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@74 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-06-07 17:00:08 +00:00
abijah
2e07cb87a5 Probably still have some bugs to flush out, but this major overhaul of the conversion code works well enough to check in.
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@73 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-06-07 16:23:15 +00:00
abijah
f3ffa3c079 I'm still in the middle of moving onto a ledger based system. However, I'm am now changing how transactions and entries relate back to the customer. I'll be using a ledger for each lease (for rent, late charges, security deposits, etc), and a ledger for each customer (for POS, non-specific deposits such as reservations or covering mulitple units, bad debt writeoff, and possibly customer credits, when not obviously lease specific). This coming change might not be in the right direction, so I want to capture the work as is right now. This change set is not fully functional. Many operations do work, but there are obviously transaction problems with units and customers.
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@71 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-06-06 20:18:56 +00:00
abijah
46e3316ce1 Added some changes to try and resolve some accounting problems. However, I may be about to redo the accounting stuff altogether.
git-svn-id: file:///svn-source/pmgr/branches/initial_20090526@67 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-06-04 01:56:09 +00:00
abijah
1db887cf38 Removed the debug comments that were helping me with the sitelink migration, and added in the actual comments that were entered in sitelink.
git-svn-id: file:///svn-source/pmgr/branches/initial_20090526@54 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-06-01 05:44:44 +00:00
abijah
3cc8e95ff4 Added a name for our lone map
git-svn-id: file:///svn-source/pmgr/branches/initial_20090526@31 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-05-28 23:18:20 +00:00