slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hledger-equity (#456)

Browse Source 
* extra: hledger-equity: adapt to new BalanceReport

Make it compatible with change from 974b1e3be

* extra: hledger-equity: valid multi-commodity posts
This commit is contained in:
Nikolay Orlyuk 2016-12-31 17:31:01 +02:00 committed by Simon Michael
parent 37632a3283
commit 419f5f2a2a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extra/hledger-equity.hs
View File

@ -25,9 +25,6 @@ the report end date, which you should specify with -e or date: (and
the closing transaction is dated one day earlier). If a report end the closing transaction is dated one day earlier). If a report end
date is not specified, it defaults to today. date is not specified, it defaults to today.
If any matched account directly contains multiple commodities, the
output may not be valid journal syntax, and will need some editing.
Example: Example:
$ hledger equity -f 2015.journal -e 2016/1/1 assets liabilities >>2015.journal $ hledger equity -f 2015.journal -e 2016/1/1 assets liabilities >>2015.journal
move opening balances txn to 2016.journal move opening balances txn to 2016.journal
@ -73,11 +70,11 @@ main = do
let ropts_ = ropts{accountlistmode_=ALFlat} let ropts_ = ropts{accountlistmode_=ALFlat}
q = queryFromOpts today ropts_ q = queryFromOpts today ropts_
(acctbals,_) = balanceReport ropts_ q j (acctbals,_) = balanceReport ropts_ q j
balancingamt = negate $ sum $ map (\((_,_,_),b) -> b) acctbals balancingamt = negate $ sum $ map (\(_,_,_,b) -> b) acctbals
ps = [posting{paccount=a, pamount=b} | ((a,_,_),b) <- acctbals] ps = [posting{paccount=a, pamount=Mixed [b]} | (a,_,_,Mixed bs) <- acctbals, b <- bs]
++ [posting{paccount="equity:opening balances", pamount=balancingamt}] ++ [posting{paccount="equity:opening balances", pamount=balancingamt}]
enddate = fromMaybe today $ queryEndDate (date2_ ropts_) q enddate = fromMaybe today $ queryEndDate (date2_ ropts_) q
nps = [posting{paccount=a, pamount=negate b} | ((a,_,_),b) <- acctbals] nps = [posting{paccount=a, pamount=negate (Mixed [b])} | (a,_,_,Mixed bs) <- acctbals, b <- bs]
++ [posting{paccount="equity:closing balances", pamount=negate balancingamt}] ++ [posting{paccount="equity:closing balances", pamount=negate balancingamt}]
putStr $ showTransaction (nulltransaction{tdate=addDays (-1) enddate, tdescription="closing balances", tpostings=nps}) putStr $ showTransaction (nulltransaction{tdate=addDays (-1) enddate, tdescription="closing balances", tpostings=nps})
putStr $ showTransaction (nulltransaction{tdate=enddate, tdescription="opening balances", tpostings=ps}) putStr $ showTransaction (nulltransaction{tdate=enddate, tdescription="opening balances", tpostings=ps})