Johann Klähn
b3b11bed3b
Merge branch 'master' into next
...
Some commits were on the master branch but not yet on the next branch due to a
pull request to master after those two branches diverged. This merge
ensures that next ⊇ master.
2013-01-18 18:26:03 +01:00
John Wiegley
83bd3234d3
Merge pull request #123 from kljohann/bug.788
...
change handling of standard input
2013-01-17 12:36:17 -08:00
Johann Klähn
3fe2ef5956
change handling of standard input
...
For `-f /dev/stdin`, the `pathname` of the parsing context will be empty
as for any other streamed input.
`instance_t::include_directive` did not work as expected for `-f /dev/stdin`
and relative file names. One would expect them to be relative to the current
directory rather than `/dev`.
This will lead to `While parsing file ""` messages. This could be
adjusted to read `While parsing standard input`, but maybe it's not
worth the special cases.
This commit also fixes bug 788: behaviour of source_context for '-f -'
2013-01-17 12:19:23 +01:00
Johann Klähn
ea249423d4
allow -f /dev/stdin in test runner
2013-01-17 12:08:20 +01:00
Johann Klähn
74a1f63efb
fix ctest rules
2013-01-17 09:30:36 +01:00
John Wiegley
9252c5f1f3
Revert "Bug551 fixed, commodities and accounts now sort"
...
This reverts commit 67a598f6ff .
2013-01-16 18:14:34 -06:00
John Wiegley
d1c96190e9
Revert "fix bug 788: behaviour of source_context for '-f -'"
...
This reverts commit 0a1ff03542 .
2013-01-16 18:10:30 -06:00
John Wiegley
24b791ad07
Apply patch to update ldg-reconcile.el
2013-01-16 17:50:31 -06:00
John Wiegley
23483b7973
On the Mac, texi2pdf doesn't have a --tidy option
2013-01-16 17:40:39 -06:00
Johann Klähn
3ed53b7b3c
whitespace cleanup
2013-01-16 23:11:45 +01:00
John Wiegley
6ff7dac73f
Merge pull request #122 from enderw88/Lisp-fixes
...
Fix ledger-add-entry
2013-01-16 12:18:33 -08:00
Craig Earls
855432c4cd
Fixed ledger-add-entry
...
copied ledger-iterate-entries, ledger-set-year and ledger-set-month
from the old ledger.el. Changed ledger-add-entry to use
ledger-exec-ledger vice the old ledger-run-ledger.
2013-01-16 11:44:13 -08:00
Johann Klähn
d922f46595
fix bug 748: option aliases not recognized
2013-01-15 23:30:17 +01:00
Johann Klähn
0a1ff03542
fix bug 788: behaviour of source_context for '-f -'
...
`session_t::read_data` did not set context.pathname to `/dev/stdin`
for the special case `-f -`. I chose to adjust `source_context` too
as there is no sensible context if no file name is provided.
2013-01-15 23:03:39 +01:00
Johann Klähn
a633bc7fce
add unit tests for amount_t→floor/ceil
2013-01-15 21:17:11 +01:00
Johann Klähn
2b1cfd6706
remove superfluous 'break'
2013-01-15 21:17:03 +01:00
Johann Klähn
428490e917
fix for 'store absolute paths internally'
...
`parent_path` was called on unprocessed path
so neither `resolve_path` nor `filesystem::absolute` had any effect.
2013-01-15 21:16:15 +01:00
Craig Earls
856f4b673c
Merge remote-tracking branch 'upstream/next' into next
2013-01-14 21:56:33 -08:00
John Wiegley
d4df36a598
Merge pull request #121 from kljohann/cmake.doxy
...
repair doxygen support
2013-01-14 14:44:54 -08:00
Johann Klähn
b13f0c33c3
repair doxygen support
2013-01-14 23:39:34 +01:00
John Wiegley
3af432d330
Merge pull request #120 from kljohann/cmake.docs
...
fix issue for separate build dir
2013-01-14 14:04:00 -08:00
Johann Klähn
dd105fecd7
fix issue for separate build dir
2013-01-14 22:59:35 +01:00
John Wiegley
bf8b7e47e6
Merge pull request #119 from kljohann/cmake.docs
...
convert doc/Makefile to CMake
2013-01-14 12:44:08 -08:00
Johann Klähn
c88862fd66
convert doc/Makefile to CMake
...
CMake will build the pdf version of the manual if texi2pdf is installed.
It will be installed to DOCDIR/ledger{,3}.pdf, for example
/usr/local/share/ledger/ledger3.pdf.
Also, the man page will be installed to MANDIR/man1/ledger.1
The option BUILD_DOCS is now on by default.
A new option BUILD_WEB_DOCS is used to toggle the generation
of the html version of the manual and the man page (off by default).
All this is added to the 'doc' make target.
2013-01-14 21:35:26 +01:00
Simon Michael
0790920424
Merge branch 'next' of github.com:ledger/ledger into next
2013-01-11 10:12:42 -08:00
Simon Michael
ea09a8d507
escape @ characters properly so they show up
2013-01-11 10:07:58 -08:00
John Wiegley
aba0a5ed2d
Improvement to account alias expansion
...
Aliases are now expanded not only if they occur by themselves, but also
if they occur as the beginning of a multi-part account. Given <alias
Food=Expenses:Food> the account <Food:Tomatos> should now be expanded to
<Expenses:Food:Tomatos>.
2013-01-11 07:08:51 -06:00
John Wiegley
82ac7ef313
Guard against a possible NULL
2013-01-11 00:10:30 -06:00
Craig Earls
67a598f6ff
Bug551 fixed, commodities and accounts now sort
...
Added two compare structs for std::map to use. I tried to override
the < operator got a clean compile but map wasn't picking it up, I
couldn't figure out why so I took the less elegant route.
2013-01-07 20:15:49 -07:00
John Wiegley
63a14fd5e0
Merge pull request #113 from OpenTechStrategies/year-cmd-directive-doc-fix
...
Update obsolete wording in documentation for 'year' command directive.
2012-12-16 14:12:07 -08:00
Karl Fogel
2823c99107
Update obsolete wording in documentation for 'year' command directive.
2012-12-16 15:31:32 -06:00
John Wiegley
edc272b7a0
Merge pull request #110 from bkuhn/update-contrib-non-profit-annual-audit-reports_2012-11-26
...
Update to contrib/non-profit-audit-reports/ scripts.
2012-11-26 10:58:17 -08:00
Bradley M. Kuhn
32e51f65a1
Verify that files are not duplicated in the MANIFEST.
...
Keep a hash so that file output to the MANIFEST file doesn't have
duplicates of the same file name in it.
2012-11-26 13:54:48 -05:00
Bradley M. Kuhn
10d3f55933
Print date in a more friendly format.
...
Includes issue of "ends on" date being correct for mere mortals as opposed
to being right for Ledger only.
2012-11-26 13:54:47 -05:00
Bradley M. Kuhn
df6428f549
Adapted for use with Ledger 3.
...
Includes forcing of -V so all currency is in default.
2012-11-26 13:54:47 -05:00
Bradley M. Kuhn
4f8ea18fec
Support selection of string encoding.
...
Allow command line option that permits specification of string encoding,
passed to Python's unicode() function.
2012-11-26 13:54:47 -05:00
Bradley M. Kuhn
4318c11fd9
Expense report favors Conferences first,
...
then takes Travel as if it were an Other category only after categories
have been handled.
2012-11-26 13:54:47 -05:00
Bradley M. Kuhn
3e634b6d45
Ignore <Adjustments> accounts.
2012-11-26 13:54:47 -05:00
Bradley M. Kuhn
586c4eb3b3
Use -V to normalize currencies in general-ledger report.
2012-11-26 13:54:46 -05:00
Bradley M. Kuhn
c7a798be8e
Fixed output.
2012-11-26 13:54:46 -05:00
Bradley M. Kuhn
d817000b82
Various changes to get the script working.
2012-11-26 13:54:46 -05:00
Bradley M. Kuhn
ca359f0606
First attempt at this cash-receipts-and-disbursments-journals.plx script,
...
based on general-ledger-report.plx
The general-ledger-report.plx was originally found in this repository:
http://gitorious.org/bkuhn/small-hacks/blobs/master/general-ledger-report.plx
And these early commits on cash-receipts-and-disbursments-journals.plx
were fro that repository as well, in:
http://gitorious.org/bkuhn/small-hacks/blobs/master/cash-receipts-and-disbursments-journals.plx
2012-11-26 13:54:46 -05:00
Bradley M. Kuhn
470ed356be
Expenses report completed.
2012-11-26 13:54:46 -05:00
Bradley M. Kuhn
7467917c7b
Generate income report.
2012-11-26 13:54:46 -05:00
Bradley M. Kuhn
13c8a1fb56
Beginnings of income report.
2012-11-26 13:54:46 -05:00
Bradley M. Kuhn
76292d08d9
Calculate dates in a reusable way throughout script.
2012-11-26 13:54:46 -05:00
Bradley M. Kuhn
fe608b12e2
Remove cruft cut-and-pasted from another script.
2012-11-26 13:54:46 -05:00
Bradley M. Kuhn
239df56cfb
Output should include a heading and an ending date.
2012-11-26 13:54:45 -05:00
Bradley M. Kuhn
e0df353ca3
Call a Balance Sheet, a Balance Sheet. :)
2012-11-26 13:54:45 -05:00
Bradley M. Kuhn
23dd0899f2
Allow for one penny margin of error on totals.
2012-11-26 13:54:45 -05:00