NPO-Accounting/npo-ledger-cli
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Standardize on 'Expenses" in account names

Browse source 
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.
This commit is contained in:
Bradley M. Kuhn 2016-02-13 10:57:40 -08:00
parent 3cc181b24a
commit 438e068892
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
accounts/config/config-accounts.ledger
View file

@ -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*$/ define expenseChecker() = (tag("Receipt") !~ /^\s*$/ or tag("Invoice") !~ /^\s*$/ or tag("Statement") !~ /^\s*$/) and tag("Program") !~ /^\s*$/
; or payee =~ /NEVER CHARGED/ ; or payee =~ /NEVER CHARGED/
account Expense:Main Org:Office Supplies account Expenses:Main Org:Office Supplies
assert expenseChecker() or payee =~ /NEVER CHARGED/ assert expenseChecker() or payee =~ /NEVER CHARGED/
note Main Organization's Office Supplies and Sundries 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/ assert expenseChecker() or payee =~ /NEVER CHARGED/
note Main Organization's Staff Salaries note Main Organization's Staff Salaries
account Expense:Main Org:Payroll:Benefits account Expenses:Main Org:Payroll:Benefits
assert expenseChecker() or payee =~ /NEVER CHARGED/ assert expenseChecker() or payee =~ /NEVER CHARGED/
note Main Organization's Staff Benefits note Main Organization's Staff Benefits
account Expense:Main Org:Phones account Expenses:Main Org:Phones
assert expenseChecker() or payee =~ /NEVER CHARGED/ assert expenseChecker() or payee =~ /NEVER CHARGED/
note Main Organization's Phone Expenses note Main Organization's Phone Expenses
account Expense:Main Org:Hosting account Expenses:Main Org:Hosting
assert expenseChecker() or payee =~ /NEVER CHARGED/ assert expenseChecker() or payee =~ /NEVER CHARGED/
note Main Organization's Network Hosting Provider services note Main Organization's Network Hosting Provider services
account Expense:Main Org:Development account Expenses:Main Org:Development
assert expenseChecker() or payee =~ /NEVER CHARGED/ assert expenseChecker() or payee =~ /NEVER CHARGED/
note Main Organization's software development expenses note Main Organization's software development expenses
account Expense:Main Org:Occupancy account Expenses:Main Org:Occupancy
assert expenseChecker() or payee =~ /NEVER CHARGED/ assert expenseChecker() or payee =~ /NEVER CHARGED/
note Main Organization's Occupancy for Office Space and the like note Main Organization's Occupancy for Office Space and the like

8
accounts/org/main-org.ledger
View file

@ -5,18 +5,18 @@
2012-02-05 Office Supply Galore - Online Order 2012-02-05 Office Supply Galore - Online Order
;Receipt: accounts/documentation/org/receipts/2012-02-05_office-supply-galore.txt ;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 ;Program: Main Org:Overhead
Liabilities:Credit Card:Visa $-35.00 Liabilities:Credit Card:Visa $-35.00
2011/05/28 My Bad Billing Hosting - NEVER CHARGED 2011/05/28 My Bad Billing Hosting - NEVER CHARGED
Liabilities:Credit Card:Visa $-100.00 Liabilities:Credit Card:Visa $-100.00
Expense:Main Org:Hosting $100.00 Expenses:Main Org:Hosting $100.00
;Program: Main Org:Overhead ;Program: Main Org:Overhead
2012/01/01 My Bad Billing Hosting - REVERSAL - NEVER CHARGED 2012/01/01 My Bad Billing Hosting - REVERSAL - NEVER CHARGED
Liabilities:Credit Card:Visa $100.00 Liabilities:Credit Card:Visa $100.00
Expense:Main Org:Hosting $-100.00 Expenses:Main Org:Hosting $-100.00
;Program: Main Org:Overhead ;Program: Main Org:Overhead
2012-05-03 Sir Moneybags 2012-05-03 Sir Moneybags
@ -31,7 +31,7 @@
;Entity: Developer-J ;Entity: Developer-J
;Invoice: accounts/documentation/org/expenses/developer/2012-07-05_developer-invoice.txt ;Invoice: accounts/documentation/org/expenses/developer/2012-07-05_developer-invoice.txt
Accrued:Accounts Payable:Main Org $-5,000.00 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 ;Program: Main Org:Software:Internal
;Statement: accounts/documentation/org/expenses/developer/2012-07-05_developer-report.txt ;Statement: accounts/documentation/org/expenses/developer/2012-07-05_developer-report.txt

10
npo-ledger-cli-tutorial.md
View file

@ -75,7 +75,7 @@ accounts receivable, loans payable and loans receivable.
### Expense Accounts ### Expense Accounts
These accounts contain any expense of the organization, and all begin with These accounts contain any expense of the organization, and all begin with
`Expense:`. `Expenses:`.
### Income Accounts ### 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: that documents the specific expense. For example, an entry like this:
2012-02-05 Office Supply Galore - Online Order 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 ;Receipt: accounts/documentation/org/receipts/2012-02-05_office-supply-galore.txt
Liabilities:Credit Card:Visa -$35.00 Liabilities:Credit Card:Visa -$35.00
@ -360,7 +360,7 @@ The possible values for this field are:
#### Program Tag #### Program Tag
The `Program` tag is used primarily to track program activity for `Income:` 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 initiated the income (e.g., a specific fundraising campaign) and/or what
particular program activity an expense is toward (e.g., funding travel to particular program activity an expense is toward (e.g., funding travel to
some specific conference). some specific conference).
@ -380,7 +380,7 @@ ledger itself via the configurations found in `config-tags.ledger` and
#### Expense Account Documentation #### 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 * One of: [`Invoice:`](#invoice-tag) [`Receipt:`](#receipt-tag), or
[`Statement`](#statement-tag). (The only exception to this rule: an entry [`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 Meanwhile, using the [`Program`](#program-tag) tag for Expenses can help
track what programs are costing with commands like these: 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 FIXME: example output