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

Merge commit '900af573319c3787854abc5653c8133d37eb013f'

Browse source
This commit is contained in:
Craig Earls 2013-05-23 21:11:59 -07:00
commit a2518fa2a1
5 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -5,7 +5,7 @@ PROJECT(ledger)
set(Ledger_VERSION_MAJOR 3) set(Ledger_VERSION_MAJOR 3)
set(Ledger_VERSION_MINOR 0) set(Ledger_VERSION_MINOR 0)
set(Ledger_VERSION_PATCH 0) set(Ledger_VERSION_PATCH 0)
set(Ledger_VERSION_DATE 20120518) set(Ledger_VERSION_DATE 20130523)
enable_testing() enable_testing()

2
acprep
View file

@ -248,7 +248,7 @@ class PrepareBuild(CommandLineApp):
self.envvars[varname] = os.environ[varname] self.envvars[varname] = os.environ[varname]
if varname.endswith('FLAGS'): if varname.endswith('FLAGS'):
self.__dict__[varname] = string.split(os.environ[varname]) self.__dict__[varname] = str.split(os.environ[varname])
self.envvars[varname] = '' self.envvars[varname] = ''
# If ~/Products/ or build/ exists, use them instead of the source tree # If ~/Products/ or build/ exists, use them instead of the source tree

4
src/account.cc
View file

@ -380,9 +380,7 @@ expr_t::ptr_op_t account_t::lookup(const symbol_t::kind_t kind,
break; break;
case 'd': case 'd':
if (fn_name == "date") if (fn_name == "depth")
return WRAP_FUNCTOR(get_wrapper<&get_latest>);
else if (fn_name == "depth")
return WRAP_FUNCTOR(get_wrapper<&get_depth>); return WRAP_FUNCTOR(get_wrapper<&get_depth>);
else if (fn_name == "depth_spacer") else if (fn_name == "depth_spacer")
return WRAP_FUNCTOR(get_wrapper<&get_depth_spacer>); return WRAP_FUNCTOR(get_wrapper<&get_depth_spacer>);

16
test/input/drewr3.dat
View file

@ -53,8 +53,8 @@
Assets:Savings Assets:Savings
; :nobudget: ; :nobudget:
@tag hastag: true apply tag hastag: true
@tag nestedtag: true apply tag nestedtag: true
2011/01/25 Tom's Used Cars 2011/01/25 Tom's Used Cars
Expenses:Auto $ 5,500.00 Expenses:Auto $ 5,500.00
; :nobudget: ; :nobudget:
@ -63,20 +63,20 @@
2011/01/27 Book Store 2011/01/27 Book Store
Expenses:Books $20.00 Expenses:Books $20.00
Liabilities:MasterCard Liabilities:MasterCard
@end tag nestedtag end tag
2011/12/01 Sale 2011/12/01 Sale
Assets:Checking:Business $ 30.00 Assets:Checking:Business $ 30.00
Income:Sales Income:Sales
@end tag end tag
@account Expenses apply account Expenses
@bucket Assets:Checking bucket Assets:Checking
2011/04/25 Tom's Used Cars 2011/04/25 Tom's Used Cars
Auto $ 5,500.00 Auto $ 5,500.00
; :nobudget: ; :nobudget:
@end account end account
@payee Amazon.com B.*k Store apply payee Amazon.com B.*k Store
2011/04/27 Book Store 2011/04/27 Book Store
Books $20.00 Books $20.00

2
test/regress/647D5DB9.test
View file

@ -11,5 +11,5 @@ P 2009/01/31 02:18:02 AAPL $4
P 3000/01/01 02:18:02 APPL $100 P 3000/01/01 02:18:02 APPL $100
test bal --end 2008/12/31 -JV Equities test bal --end 2008/12/31 -JV Equities
2008-06-30 1500 2008-12-31 1500
end test end test