sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into next

Browse source 
[ci skip]
This commit is contained in:
Alexis Hildebrandt 2015-01-10 14:02:20 +01:00
commit b9e34707d3
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/DEVELOP.md
View file

@ -14,7 +14,7 @@ used by *./python/server.py*.
from source code. It uses the *CMakeLists.txt* files. from source code. It uses the *CMakeLists.txt* files.
[**DOxygen**](http://doxygen.org): generates programming documentation from [**DOxygen**](http://doxygen.org): generates programming documentation from
source code files. Primarly used on C++ sources, but works on all. Uses source code files. Primarily used on C++ sources, but works on all. Uses
the *doc/Doxyfile.in* file. the *doc/Doxyfile.in* file.
[**GCC**](http://gcc.gnu.org): Gnu Compiler Collection, which includes the [**GCC**](http://gcc.gnu.org): Gnu Compiler Collection, which includes the
@ -58,7 +58,7 @@ orientation:
for more information. for more information.
**./README.md**: user readme file in markdown format, also used as the project **./README.md**: user readme file in markdown format, also used as the project
discription on GitHub. description on GitHub.
**./contrib/**: contributed scripts of random quality and completion. They **./contrib/**: contributed scripts of random quality and completion. They
usually require editing to run. usually require editing to run.

0
doc/DEVELOP.md.new Normal file
View file

2
doc/GLOSSARY.md
View file

@ -33,7 +33,7 @@ ACCOUNTING GLOSSARY
This data of where money goes can be collated into reports. This used to be This data of where money goes can be collated into reports. This used to be
done with a physical book, called a ledger, where each account was on one done with a physical book, called a ledger, where each account was on one
page. Each debit or credit in the journal was transferred to the page. Each debit or credit in the journal was transferred to the
appropriate account page and the pages were totalled to produce reports. appropriate account page and the pages were totaled to produce reports.
This process is now done with the Ledger software which creates reports from This process is now done with the Ledger software which creates reports from
the journal. A journal is sometimes called a register. the journal. A journal is sometimes called a register.

6
doc/NEWS
View file

@ -6,7 +6,7 @@
when a gain or loss is made (if you bought 1 AAA for $10 and then sold when a gain or loss is made (if you bought 1 AAA for $10 and then sold
it for $12, ledger would previously take $12 as the cost; the original it for $12, ledger would previously take $12 as the cost; the original
cost of $10 is preserved as the cost basis now, which addresses strange cost of $10 is preserved as the cost basis now, which addresses strange
behaviour with -B after a capital gain or loss is made). behavior with -B after a capital gain or loss is made).
- Incorrect automatic Equity:Capital Gains and Equity:Capital Loss entries - Incorrect automatic Equity:Capital Gains and Equity:Capital Loss entries
are no longer generated when a commodity is sold for loss or profit. are no longer generated when a commodity is sold for loss or profit.
@ -339,7 +339,7 @@ features, please see the manual.
This flag limits computation to *only transactions whose amount This flag limits computation to *only transactions whose amount
is greater than 100 of a given commodity*. It means that if you is greater than 100 of a given commodity*. It means that if you
scan your dining expenses, for example, only individual bills scan your dining expenses, for example, only individual bills
greater than $100 would be caculated by the report. greater than $100 would be calculated by the report.
--only "a>100" --only "a>100"
@ -581,7 +581,7 @@ features, please see the manual.
* 2.4.1 * 2.4.1
- Corrected an issue that had inadvertantly disabled Gnucash support. - Corrected an issue that had inadvertently disabled Gnucash support.
* 2.4 * 2.4

2
doc/ledger.1
View file

@ -439,7 +439,7 @@ statement will print balances only for account with
two levels, i.e. two levels, i.e.
.Nm Expenses:Entertainment .Nm Expenses:Entertainment
but not but not
.Nm Expenses:entertainemnt:Dining . .Nm Expenses:entertainment:Dining .
This is a display predicate, which This is a display predicate, which
means it only affects display, not the total calculations. means it only affects display, not the total calculations.
.It Fl \-deviation Pq Fl D .It Fl \-deviation Pq Fl D