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

db/schema.sql

@@ -855,8 +855,8 @@ CREATE TABLE `pmgr_accounts` (
   -- normal circumstances, when a debit occurs.
   --  `trackable`            TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
   `deposits`             TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for deposits?
-  `charges`              TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for charges?
-  `payments`             TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for payments?
+  `invoices`             TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for invoices?
+  `receipts`             TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for receipts?
   `refunds`              TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for refunds?
 			   			   
   -- Security Level
@@ -884,7 +884,7 @@ INSERT INTO `pmgr_accounts` (`type`, `name`)
 -- us identify how serious the NSF situation is.
   ('ASSET',      'NSF'                ),
   ('LIABILITY',  'A/P'                );
-INSERT INTO `pmgr_accounts` (`type`, `name`, `payments`, `refunds`)
+INSERT INTO `pmgr_accounts` (`type`, `name`, `receipts`, `refunds`)
   VALUES
   ('ASSET',      'Cash',              1, 1),
   ('ASSET',      'Check',             1, 0),
@@ -898,7 +898,7 @@ INSERT INTO `pmgr_accounts` (`type`, `name`, `refunds`, `deposits`)
 -- REVISIT <AP>: 20090710 : We probably don't really want petty cash depositable.
 --                          This is just for testing our deposit code
   ('ASSET',      'Petty Cash',        1, 1);
-INSERT INTO `pmgr_accounts` (`type`, `name`, `charges`)
+INSERT INTO `pmgr_accounts` (`type`, `name`, `invoices`)
   VALUES
   ('LIABILITY',  'Tax',               1),
   ('LIABILITY',  'Security Deposit',  1),
@@ -963,11 +963,12 @@ CREATE TABLE `pmgr_transactions` (
 
   `type`                 ENUM('INVOICE',
                               'RECEIPT',
-                              'DEPOSIT',
-                              'CLOSE',
+			      'VOUCHER',
+                              'DEPOSIT', -- Probably should use VOUCHER for DEPOSIT
+                              'CLOSE',   -- Essentially an internal (not accounting) transaction
 --                               'CREDIT',
 --                               'REFUND',
-			      'TRANSFER')
+			      'TRANSFER') -- Unsure of TRANSFERs use
                            NOT NULL,
 
   `stamp`                TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -992,10 +993,6 @@ CREATE TABLE `pmgr_transactions` (
   -- (e.g. A/R, Bank, etc)
   `account_id`           INT(10) UNSIGNED DEFAULT NULL,
   `ledger_id`            INT(10) UNSIGNED DEFAULT NULL,
-
-  -- For convenience.  Actually, INVOICE will always set crdr
-  -- to DEBIT, RECEIPT will use CREDIT, and DEPOSIT will use
-  -- DEBIT
   `crdr`                 ENUM('DEBIT',
                               'CREDIT')
                            DEFAULT NULL,
@@ -1024,9 +1021,6 @@ CREATE TABLE `pmgr_ledger_entries` (
   -- The account/ledger of the entry
   `account_id`           INT(10) UNSIGNED NOT NULL,
   `ledger_id`            INT(10) UNSIGNED NOT NULL,
-
-  -- For convenience.  Actually, CHARGE will always set crdr
-  -- to CREDIT and PAYMENT will use DEBIT.
   `crdr`                 ENUM('DEBIT',
                               'CREDIT')
                            NOT NULL,
@@ -1073,7 +1067,8 @@ CREATE TABLE `pmgr_statement_entries` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 
   `type`                 ENUM('CHARGE',
-                              'PAYMENT',
+			      'DISBURSEMENT',
+                              'VOUCHER-PAYMENT', -- REVISIT: Make PAYMENT
                               'SURPLUS',
                               'WAIVER',
 			      -- REVISIT <AP>: 20090730
@@ -1084,7 +1079,7 @@ CREATE TABLE `pmgr_statement_entries` (
 
   `transaction_id`       INT(10) UNSIGNED NOT NULL,
 
-  -- Effective date is when the charge/payment/transfer actually
+  -- Effective date is when the charge/disbursement/transfer actually
   -- takes effect (since it may not be at the time of the transaction).
   -- Through date is used if/when a charge covers a certain time period,
   -- like rent.  A security deposit, for example, would not use the
@@ -1109,7 +1104,7 @@ CREATE TABLE `pmgr_statement_entries` (
   --  in the statement.  Keeping it for now...
   `account_id`           INT(10) UNSIGNED DEFAULT NULL,
 
-  -- Allow the payment to reconcile against the charge
+  -- Allow the disbursement to reconcile against the charge
   `charge_entry_id`      INT(10) UNSIGNED DEFAULT NULL,
 
   `comment`              VARCHAR(255) DEFAULT NULL,