From 438e0688929da670bdc37c99baf213f55ef0f8b0 2016-02-13 18:57:40 From: Bradley M. Kuhn Date: 2016-02-13 18:57:40 Subject: [PATCH] Standardize on 'Expenses" in account names We've concluded that the top-of-hierarchy account name for Expenses should be Expenses, not Expense. This change normalizes the tutorial text and examples to Expenses. --- diff --git a/accounts/config/config-accounts.ledger b/accounts/config/config-accounts.ledger index 896c1d5d585a6152cc546ba4f3eac38f2ed25821..3c91227ddd51a6aa0ebc271e0604886d6799d2b9 100644 --- a/accounts/config/config-accounts.ledger +++ b/accounts/config/config-accounts.ledger @@ -51,31 +51,31 @@ account Accrued:Accounts Payable:Main Org define expenseChecker() = (tag("Receipt") !~ /^\s*$/ or tag("Invoice") !~ /^\s*$/ or tag("Statement") !~ /^\s*$/) and tag("Program") !~ /^\s*$/ ; or payee =~ /NEVER CHARGED/ -account Expense:Main Org:Office Supplies +account Expenses:Main Org:Office Supplies assert expenseChecker() or payee =~ /NEVER CHARGED/ note Main Organization's Office Supplies and Sundries -account Expense:Main Org:Payroll:Salary +account Expenses:Main Org:Payroll:Salary assert expenseChecker() or payee =~ /NEVER CHARGED/ note Main Organization's Staff Salaries -account Expense:Main Org:Payroll:Benefits +account Expenses:Main Org:Payroll:Benefits assert expenseChecker() or payee =~ /NEVER CHARGED/ note Main Organization's Staff Benefits -account Expense:Main Org:Phones +account Expenses:Main Org:Phones assert expenseChecker() or payee =~ /NEVER CHARGED/ note Main Organization's Phone Expenses -account Expense:Main Org:Hosting +account Expenses:Main Org:Hosting assert expenseChecker() or payee =~ /NEVER CHARGED/ note Main Organization's Network Hosting Provider services -account Expense:Main Org:Development +account Expenses:Main Org:Development assert expenseChecker() or payee =~ /NEVER CHARGED/ note Main Organization's software development expenses -account Expense:Main Org:Occupancy +account Expenses:Main Org:Occupancy assert expenseChecker() or payee =~ /NEVER CHARGED/ note Main Organization's Occupancy for Office Space and the like diff --git a/accounts/org/main-org.ledger b/accounts/org/main-org.ledger index b0cabf0b69ea05a5bfcdf57c2c1ba1d30272a3f8..60329a2bca7426fae3f6f3c079d1f1ba59d55a9f 100644 --- a/accounts/org/main-org.ledger +++ b/accounts/org/main-org.ledger @@ -5,18 +5,18 @@ 2012-02-05 Office Supply Galore - Online Order ;Receipt: accounts/documentation/org/receipts/2012-02-05_office-supply-galore.txt - Expense:Main Org:Office Supplies $35.00 + Expenses:Main Org:Office Supplies $35.00 ;Program: Main Org:Overhead Liabilities:Credit Card:Visa $-35.00 2011/05/28 My Bad Billing Hosting - NEVER CHARGED Liabilities:Credit Card:Visa $-100.00 - Expense:Main Org:Hosting $100.00 + Expenses:Main Org:Hosting $100.00 ;Program: Main Org:Overhead 2012/01/01 My Bad Billing Hosting - REVERSAL - NEVER CHARGED Liabilities:Credit Card:Visa $100.00 - Expense:Main Org:Hosting $-100.00 + Expenses:Main Org:Hosting $-100.00 ;Program: Main Org:Overhead 2012-05-03 Sir Moneybags @@ -31,7 +31,7 @@ ;Entity: Developer-J ;Invoice: accounts/documentation/org/expenses/developer/2012-07-05_developer-invoice.txt Accrued:Accounts Payable:Main Org $-5,000.00 - Expense:Main Org:Development $5,000.00 + Expenses:Main Org:Development $5,000.00 ;Program: Main Org:Software:Internal ;Statement: accounts/documentation/org/expenses/developer/2012-07-05_developer-report.txt diff --git a/npo-ledger-cli-tutorial.md b/npo-ledger-cli-tutorial.md index 99e44aee4e1ace33d9e52e01adfdf0901349e37f..8d92e98b345b0d408ccdd6b07b68dea8dce55a87 100644 --- a/npo-ledger-cli-tutorial.md +++ b/npo-ledger-cli-tutorial.md @@ -75,7 +75,7 @@ accounts receivable, loans payable and loans receivable. ### Expense Accounts These accounts contain any expense of the organization, and all begin with -`Expense:`. +`Expenses:`. ### Income Accounts @@ -188,7 +188,7 @@ the tag is a relative path name of a file elsewhere in the same repository that documents the specific expense. For example, an entry like this: 2012-02-05 Office Supply Galore - Online Order - Expense:Main Org:Office Supplies $35.00 + Expenses:Main Org:Office Supplies $35.00 ;Receipt: accounts/documentation/org/receipts/2012-02-05_office-supply-galore.txt Liabilities:Credit Card:Visa -$35.00 @@ -360,7 +360,7 @@ The possible values for this field are: #### Program Tag The `Program` tag is used primarily to track program activity for `Income:` -and `Expense:` accounts. This allows for knowing what particular initiative +and `Expenses:` accounts. This allows for knowing what particular initiative initiated the income (e.g., a specific fundraising campaign) and/or what particular program activity an expense is toward (e.g., funding travel to some specific conference). @@ -380,7 +380,7 @@ ledger itself via the configurations found in `config-tags.ledger` and #### Expense Account Documentation -Each `Expense:` account entry must be tagged with the following tags: +Each `Expenses:` account entry must be tagged with the following tags: * One of: [`Invoice:`](#invoice-tag) [`Receipt:`](#receipt-tag), or [`Statement`](#statement-tag). (The only exception to this rule: an entry @@ -458,7 +458,7 @@ the successes of various fundraising programs with a command like this: Meanwhile, using the [`Program`](#program-tag) tag for Expenses can help track what programs are costing with commands like these: - $ ledger -f accounts/books.ledger --group-by 'tag("Program")' reg '/^Expense/' + $ ledger -f accounts/books.ledger --group-by 'tag("Program")' reg '/^Expenses/' FIXME: example output