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

Merge pull request #310 from tbm/712-713-costs

Browse source 
Change the definition of cost
This commit is contained in:
Martin Michlmayr 2014-07-14 21:09:57 -04:00
commit 3f9fc276d3
19 changed files with 925 additions and 1975 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/post.h
View file

@ -68,6 +68,7 @@ public:
amount_t amount; // can be null until finalization amount_t amount; // can be null until finalization
optional<expr_t> amount_expr; optional<expr_t> amount_expr;
optional<amount_t> cost; optional<amount_t> cost;
optional<amount_t> given_cost;
optional<amount_t> assigned_amount; optional<amount_t> assigned_amount;
optional<datetime_t> checkin; optional<datetime_t> checkin;
optional<datetime_t> checkout; optional<datetime_t> checkout;

6
src/print.cc
View file

@ -243,7 +243,7 @@ namespace {
amtbuf << string(2 - (slip + amt_slip), ' '); amtbuf << string(2 - (slip + amt_slip), ' ');
amtbuf << amt; amtbuf << amt;
if (post->cost && if (post->given_cost &&
! post->has_flags(POST_CALCULATED | POST_COST_CALCULATED)) { ! post->has_flags(POST_CALCULATED | POST_COST_CALCULATED)) {
std::string cost_op; std::string cost_op;
if (post->has_flags(POST_COST_IN_FULL)) if (post->has_flags(POST_COST_IN_FULL))
@ -254,10 +254,10 @@ namespace {
cost_op = "(" + cost_op + ")"; cost_op = "(" + cost_op + ")";
if (post->has_flags(POST_COST_IN_FULL)) if (post->has_flags(POST_COST_IN_FULL))
amtbuf << " " << cost_op << " " << post->cost->abs(); amtbuf << " " << cost_op << " " << post->given_cost->abs();
else else
amtbuf << " " << cost_op << " " amtbuf << " " << cost_op << " "
<< (*post->cost / post->amount).abs(); << (*post->given_cost / post->amount).abs();
} }
if (post->assigned_amount) if (post->assigned_amount)

2
src/textual.cc
View file

@ -1578,6 +1578,8 @@ post_t * instance_t::parse_post(char * line,
if (fixed_cost) if (fixed_cost)
post->add_flags(POST_COST_FIXATED); post->add_flags(POST_COST_FIXATED);
post->given_cost = post->cost;
DEBUG("textual.parse", "line " << context.linenum << ": " DEBUG("textual.parse", "line " << context.linenum << ": "
<< "Total cost is " << *post->cost); << "Total cost is " << *post->cost);
DEBUG("textual.parse", "line " << context.linenum << ": " DEBUG("textual.parse", "line " << context.linenum << ": "

6
src/xact.cc
View file

@ -304,10 +304,9 @@ bool xact_base_t::finalize()
DEBUG("xact.finalize", "gain_loss = " << gain_loss); DEBUG("xact.finalize", "gain_loss = " << gain_loss);
gain_loss.in_place_round(); gain_loss.in_place_round();
DEBUG("xact.finalize", "gain_loss rounds to = " << gain_loss); DEBUG("xact.finalize", "gain_loss rounds to = " << gain_loss);
if (post->must_balance()) if (post->must_balance())
add_or_set_value(balance, gain_loss.reduced()); add_or_set_value(balance, gain_loss.reduced());
#if 0
account_t * account; account_t * account;
if (gain_loss.sign() > 0) if (gain_loss.sign() > 0)
account = journal->find_account(_("Equity:Capital Gains")); account = journal->find_account(_("Equity:Capital Gains"));
@ -321,6 +320,9 @@ bool xact_base_t::finalize()
p->add_flags(post->flags() & (POST_VIRTUAL | POST_MUST_BALANCE)); p->add_flags(post->flags() & (POST_VIRTUAL | POST_MUST_BALANCE));
} }
add_post(p); add_post(p);
#else
*post->cost += gain_loss;
#endif
DEBUG("xact.finalize", "added gain_loss, balance = " << balance); DEBUG("xact.finalize", "added gain_loss, balance = " << balance);
} else { } else {
DEBUG("xact.finalize", "gain_loss would have displayed as zero"); DEBUG("xact.finalize", "gain_loss would have displayed as zero");

3
test/baseline/opt-base.test
View file

@ -16,12 +16,11 @@ test bal --base
7200s A 7200s A
$8,000.00 Assets:Receivable $8,000.00 Assets:Receivable
7200s B 7200s B
$3,200.00 Equity:Capital Gains
$-3,200.00 $-3,200.00
-288000s Income -288000s Income
-288000s Contracts -288000s Contracts
$-3,200.00 Gains $-3,200.00 Gains
-------------------- --------------------
$8,000.00 $4,800.00
-273600s -273600s
end test end test

60
test/baseline/opt-historical.test
View file

@ -50,11 +50,11 @@ test reg stocks -O
end test end test
test reg stocks -B test reg stocks -B
12-Jan-01 Broker Assets:Stocks $100 $100 12-Jan-01 Broker Assets:Stocks $10 $10
12-Feb-02 Broker Assets:Stocks $200 $300 12-Feb-02 Broker Assets:Stocks $20 $30
12-Mar-03 Broker Assets:Stocks $300 $600 12-Mar-03 Broker Assets:Stocks $30 $60
12-Apr-04 Broker Assets:Stocks $400 $1000 12-Apr-04 Broker Assets:Stocks $40 $100
12-May-05 Broker Assets:Stocks $500 $1500 12-May-05 Broker Assets:Stocks $50 $150
end test end test
test reg stocks -I test reg stocks -I
@ -98,11 +98,11 @@ test reg stocks -O -V --now=2012/05/10
end test end test
test reg stocks -B -V test reg stocks -B -V
12-Jan-01 Broker Assets:Stocks $100 $100 12-Jan-01 Broker Assets:Stocks $10 $10
12-Feb-02 Broker Assets:Stocks $200 $300 12-Feb-02 Broker Assets:Stocks $20 $30
12-Mar-03 Broker Assets:Stocks $300 $600 12-Mar-03 Broker Assets:Stocks $30 $60
12-Apr-04 Broker Assets:Stocks $400 $1000 12-Apr-04 Broker Assets:Stocks $40 $100
12-May-05 Broker Assets:Stocks $500 $1500 12-May-05 Broker Assets:Stocks $50 $150
end test end test
test reg stocks -I -V test reg stocks -I -V
@ -138,11 +138,11 @@ test reg stocks -O -X EUR --now=2012/05/10
end test end test
test reg stocks -B -X EUR test reg stocks -B -X EUR
12-Jan-01 Broker Assets:Stocks EUR 200,00 EUR 200,00 12-Jan-01 Broker Assets:Stocks EUR 20,00 EUR 20,00
12-Feb-02 Broker Assets:Stocks EUR 400,00 EUR 600,00 12-Feb-02 Broker Assets:Stocks EUR 40,00 EUR 60,00
12-Mar-03 Broker Assets:Stocks EUR 600,00 EUR 1.200,00 12-Mar-03 Broker Assets:Stocks EUR 60,00 EUR 120,00
12-Apr-04 Broker Assets:Stocks EUR 800,00 EUR 2.000,00 12-Apr-04 Broker Assets:Stocks EUR 80,00 EUR 200,00
12-May-05 Broker Assets:Stocks EUR 1.000,00 EUR 3.000,00 12-May-05 Broker Assets:Stocks EUR 100,00 EUR 300,00
end test end test
test reg stocks -I -X EUR test reg stocks -I -X EUR
@ -170,11 +170,11 @@ test reg stocks -O -H
end test end test
test reg stocks -B -H test reg stocks -B -H
12-Jan-01 Broker Assets:Stocks $100 $100 12-Jan-01 Broker Assets:Stocks $10 $10
12-Feb-02 Broker Assets:Stocks $200 $300 12-Feb-02 Broker Assets:Stocks $20 $30
12-Mar-03 Broker Assets:Stocks $300 $600 12-Mar-03 Broker Assets:Stocks $30 $60
12-Apr-04 Broker Assets:Stocks $400 $1000 12-Apr-04 Broker Assets:Stocks $40 $100
12-May-05 Broker Assets:Stocks $500 $1500 12-May-05 Broker Assets:Stocks $50 $150
end test end test
test reg stocks -I -H test reg stocks -I -H
@ -202,11 +202,11 @@ test reg stocks -O -H -V
end test end test
test reg stocks -B -H -V test reg stocks -B -H -V
12-Jan-01 Broker Assets:Stocks $100 $100 12-Jan-01 Broker Assets:Stocks $10 $10
12-Feb-02 Broker Assets:Stocks $200 $300 12-Feb-02 Broker Assets:Stocks $20 $30
12-Mar-03 Broker Assets:Stocks $300 $600 12-Mar-03 Broker Assets:Stocks $30 $60
12-Apr-04 Broker Assets:Stocks $400 $1000 12-Apr-04 Broker Assets:Stocks $40 $100
12-May-05 Broker Assets:Stocks $500 $1500 12-May-05 Broker Assets:Stocks $50 $150
end test end test
test reg stocks -I -H -V test reg stocks -I -H -V
@ -234,11 +234,11 @@ test reg stocks -O -H -X EUR
end test end test
test reg stocks -B -H -X EUR test reg stocks -B -H -X EUR
12-Jan-01 Broker Assets:Stocks EUR 200,00 EUR 200,00 12-Jan-01 Broker Assets:Stocks EUR 20,00 EUR 20,00
12-Feb-02 Broker Assets:Stocks EUR 400,00 EUR 600,00 12-Feb-02 Broker Assets:Stocks EUR 40,00 EUR 60,00
12-Mar-03 Broker Assets:Stocks EUR 600,00 EUR 1.200,00 12-Mar-03 Broker Assets:Stocks EUR 60,00 EUR 120,00
12-Apr-04 Broker Assets:Stocks EUR 800,00 EUR 2.000,00 12-Apr-04 Broker Assets:Stocks EUR 80,00 EUR 200,00
12-May-05 Broker Assets:Stocks EUR 1.000,00 EUR 3.000,00 12-May-05 Broker Assets:Stocks EUR 100,00 EUR 300,00
end test end test
test reg stocks -I -H -X EUR test reg stocks -I -H -X EUR

909
test/baseline/opt-lot-dates.test
View file

File diff suppressed because it is too large Load diff

508
test/baseline/opt-lot-prices.test
View file

File diff suppressed because it is too large Load diff

1083
test/baseline/opt-lots.test
View file

File diff suppressed because it is too large Load diff

98
test/baseline/opt-lots_basis.test
View file

@ -676,9 +676,8 @@ test reg --basis
06-Mar-16 Post Expenses:Fees:Mail 90c 90c 06-Mar-16 Post Expenses:Fees:Mail 90c 90c
Assets:Tajer -90c 0 Assets:Tajer -90c 0
06-Mar-16 Auction House Assets:Tajer 119.58G 119.58G 06-Mar-16 Auction House Assets:Tajer 119.58G 119.58G
Assets:Tajer:Items -119.58G 0 Assets:Tajer:Items -65.00G 54.58G
Income:Brokering -54.58G -54.58G Income:Brokering -54.58G 0
Equity:Capital Gains 54.58G 0
06-Mar-16 Auction House Assets:Wyshona:Items "Plans: Mithril Shield Spike" 1 "Plans: Mithril Shield Spike" 1 06-Mar-16 Auction House Assets:Wyshona:Items "Plans: Mithril Shield Spike" 1 "Plans: Mithril Shield Spike" 1
Assets:Wyshona:Items "Plans: Mithril Shield Spike" 1 "Plans: Mithril Shield Spike" 2 Assets:Wyshona:Items "Plans: Mithril Shield Spike" 1 "Plans: Mithril Shield Spike" 2
Assets:Wyshona:Items "Recipe: Elixir of Giant Growth" 1 "Plans: Mithril Shield Spike" 2 Assets:Wyshona:Items "Recipe: Elixir of Giant Growth" 1 "Plans: Mithril Shield Spike" 2
@ -745,13 +744,11 @@ test reg --basis
06-Mar-16 Player Assets:Tajer 1.00G 1.00G 06-Mar-16 Player Assets:Tajer 1.00G 1.00G
Equity:Gold -1.00G 0 Equity:Gold -1.00G 0
06-Mar-17 Auction House Assets:Wyshona 18.06G 18.06G 06-Mar-17 Auction House Assets:Wyshona 18.06G 18.06G
Assets:Wyshona:Items -18.06G 0 Assets:Wyshona:Items -1.50G 16.56G
Income:Brokering -16.56G -16.56G Income:Brokering -16.56G 0
Equity:Capital Gains 16.56G 0
06-Mar-17 Auction House Assets:Wyshona 18.06G 18.06G 06-Mar-17 Auction House Assets:Wyshona 18.06G 18.06G
Assets:Wyshona:Items -18.06G 0 Assets:Wyshona:Items -1.00G 17.06G
Income:Brokering -17.06G -17.06G Income:Brokering -17.06G 0
Equity:Capital Gains 17.06G 0
06-Mar-17 Post Expenses:Fees:Mail 30c 30c 06-Mar-17 Post Expenses:Fees:Mail 30c 30c
Assets:Tajer -30c 0 Assets:Tajer -30c 0
06-Mar-17 Player: raev Assets:Tajer:Items 30.00G 30.00G 06-Mar-17 Player: raev Assets:Tajer:Items 30.00G 30.00G
@ -761,9 +758,8 @@ test reg --basis
06-Mar-17 Post Expenses:Fees:Mail 3.00s 3.00s 06-Mar-17 Post Expenses:Fees:Mail 3.00s 3.00s
Assets:Wyshona -3.00s 0 Assets:Wyshona -3.00s 0
06-Mar-17 Player Assets:Wyshona 1.00G 1.00G 06-Mar-17 Player Assets:Wyshona 1.00G 1.00G
Assets:Wyshona:Items -1.00G 0 Assets:Wyshona:Items -1.25G -25.00s
Expenses:Capital Loss 25.00s 25.00s Expenses:Capital Loss 25.00s 0
Equity:Capital Losses -25.00s 0
06-Mar-17 Auction House (impl.. Expenses:Items 2.79G 2.79G 06-Mar-17 Auction House (impl.. Expenses:Items 2.79G 2.79G
Assets:Wyshona -2.79G 0 Assets:Wyshona -2.79G 0
06-Mar-17 Auction House (impl.. Assets:Danell:Items 3.00G 3.00G 06-Mar-17 Auction House (impl.. Assets:Danell:Items 3.00G 3.00G
@ -776,24 +772,20 @@ test reg --basis
Assets:Tajer:Items 1.00G 26.90G Assets:Tajer:Items 1.00G 26.90G
Assets:Wyshona -26.90G 0 Assets:Wyshona -26.90G 0
06-Mar-17 Auction House Assets:Tajer 4.00G 4.00G 06-Mar-17 Auction House Assets:Tajer 4.00G 4.00G
Assets:Tajer:Items -4.00G 0 Assets:Tajer:Items -1.00G 3.00G
Income:Brokering -3.00G -3.00G Income:Brokering -3.00G 0
Equity:Capital Gains 3.00G 0
06-Mar-17 Auction House Assets:Danell 31.71s 31.71s 06-Mar-17 Auction House Assets:Danell 31.71s 31.71s
Assets:Danell:Items -31.71s 0 Assets:Danell:Items -3.00G -2.68G
Expenses:Capital Loss 2.68G 2.68G Expenses:Capital Loss 2.68G 0
Equity:Capital Losses -2.68G 0
06-Mar-17 Auction House Expenses:Fees:Auction 1.25G 1.25G 06-Mar-17 Auction House Expenses:Fees:Auction 1.25G 1.25G
Assets:Danell -1.25G 0 Assets:Danell -1.25G 0
06-Mar-17 Transfer Assets:Gruulmorg 15.00G 15.00G 06-Mar-17 Transfer Assets:Gruulmorg 15.00G 15.00G
Expenses:Fees:Mail 30c 15.00G Expenses:Fees:Mail 30c 15.00G
Assets:Tajer -15.00G 0 Assets:Tajer -15.00G 0
06-Mar-17 Auction House Assets:Wyshona 36.25G 36.25G 06-Mar-17 Auction House Assets:Wyshona 36.25G 36.25G
Assets:Wyshona:Items -18.12G 18.12G Assets:Wyshona:Items -2.11G 34.14G
Assets:Wyshona:Items -18.12G 0 Assets:Wyshona:Items -2.30G 31.84G
Income:Brokering -31.84G -31.84G Income:Brokering -31.84G 0
Equity:Capital Gains 16.02G -15.82G
Equity:Capital Gains 15.82G 0
06-Mar-17 Transfer Assets:Danell 49.96G 49.96G 06-Mar-17 Transfer Assets:Danell 49.96G 49.96G
Expenses:Gifts 1.00G 50.96G Expenses:Gifts 1.00G 50.96G
Expenses:Fees:Mail 30c 50.96G Expenses:Fees:Mail 30c 50.96G
@ -811,44 +803,35 @@ test reg --basis
Expenses:Fees:Mail 30c 75.30s Expenses:Fees:Mail 30c 75.30s
Assets:Tajer -75.30s 0 Assets:Tajer -75.30s 0
06-Mar-18 Auction House Assets:Tajer 15.00G 15.00G 06-Mar-18 Auction House Assets:Tajer 15.00G 15.00G
Assets:Tajer:Items -15.00G 0 Assets:Tajer:Items -3.90G 11.10G
Income:Brokering -11.10G -11.10G Income:Brokering -11.10G 0
Equity:Capital Gains 11.10G 0
06-Mar-18 Auction House Assets:Tajer 43.45G 43.45G 06-Mar-18 Auction House Assets:Tajer 43.45G 43.45G
Assets:Tajer:Items -43.45G 0 Assets:Tajer:Items -30.00G 13.45G
Income:Brokering -13.45G -13.45G Income:Brokering -13.45G 0
Equity:Capital Gains 13.45G 0
06-Mar-18 Auction House Assets:Tajer 19.95G 19.95G 06-Mar-18 Auction House Assets:Tajer 19.95G 19.95G
Assets:Tajer:Items -19.95G 0 Assets:Tajer:Items -5.00G 14.95G
Income:Brokering -14.95G -14.95G Income:Brokering -14.95G 0
Equity:Capital Gains 14.95G 0
06-Mar-19 Auction House Assets:Tajer 28.50G 28.50G 06-Mar-19 Auction House Assets:Tajer 28.50G 28.50G
Assets:Tajer:Items -28.50G 0 Assets:Tajer:Items -4.00G 24.50G
Income:Brokering -24.50G -24.50G Income:Brokering -24.50G 0
Equity:Capital Gains 24.50G 0
06-Mar-19 Auction House Assets:Tajer 17.10G 17.10G 06-Mar-19 Auction House Assets:Tajer 17.10G 17.10G
Assets:Tajer:Items -17.10G 0 Assets:Tajer:Items -4.00G 13.10G
Income:Brokering -13.10G -13.10G Income:Brokering -13.10G 0
Equity:Capital Gains 13.10G 0
06-Mar-19 Auction House Assets:Tajer 4.65G 4.65G 06-Mar-19 Auction House Assets:Tajer 4.65G 4.65G
Assets:Tajer:Items -4.65G 0 Assets:Tajer:Items -1.00G 3.65G
Income:Brokering -3.65G -3.65G Income:Brokering -3.65G 0
Equity:Capital Gains 3.65G 0
06-Mar-19 Auction House Assets:Tajer:Items 3.00G 3.00G 06-Mar-19 Auction House Assets:Tajer:Items 3.00G 3.00G
Assets:Tajer:Items 2.50G 5.50G Assets:Tajer:Items 2.50G 5.50G
Assets:Tajer -5.50G 0 Assets:Tajer -5.50G 0
06-Mar-20 Auction House Assets:Tajer 16.34G 16.34G 06-Mar-20 Auction House Assets:Tajer 16.34G 16.34G
Assets:Tajer:Items -16.34G 0 Assets:Tajer:Items -2.00G 14.34G
Income:Brokering -14.34G -14.34G Income:Brokering -14.34G 0
Equity:Capital Gains 14.34G 0
06-Mar-20 Auction House Assets:Tajer 5.00G 5.00G 06-Mar-20 Auction House Assets:Tajer 5.00G 5.00G
Assets:Tajer:Items -5.00G 0 Assets:Tajer:Items -3.00G 2.00G
Income:Brokering -2.00G -2.00G Income:Brokering -2.00G 0
Equity:Capital Gains 2.00G 0
06-Mar-20 Auction House Assets:Tajer 15.00G 15.00G 06-Mar-20 Auction House Assets:Tajer 15.00G 15.00G
Assets:Tajer:Items -15.00G 0 Assets:Tajer:Items -4.00G 11.00G
Income:Brokering -11.00G -11.00G Income:Brokering -11.00G 0
Equity:Capital Gains 11.00G 0
06-Mar-20 Auction House Expenses:Fees:Mail 60c 60c 06-Mar-20 Auction House Expenses:Fees:Mail 60c 60c
Assets:Tajer -60c 0 Assets:Tajer -60c 0
06-Mar-21 Auction House Assets:Tajer:Items 170.00G 170.00G 06-Mar-21 Auction House Assets:Tajer:Items 170.00G 170.00G
@ -865,21 +848,18 @@ test reg --basis
Expenses:Fees:Auction 75.00s 7.83G Expenses:Fees:Auction 75.00s 7.83G
Assets:Tajer -7.83G 0 Assets:Tajer -7.83G 0
06-Mar-23 Auction House Assets:Tajer 166.53G 166.53G 06-Mar-23 Auction House Assets:Tajer 166.53G 166.53G
Assets:Tajer:Items -166.53G 0 Assets:Tajer:Items -170.00G -3.47G
Expenses:Capital Loss 3.47G 3.47G Expenses:Capital Loss 3.47G 0
Equity:Capital Losses -3.47G 0
06-Mar-26 Auction House Assets:Tajer 8.20G 8.20G 06-Mar-26 Auction House Assets:Tajer 8.20G 8.20G
Assets:Tajer:Items -8.20G 0 Assets:Tajer:Items -2.50G 5.70G
Income:Brokering -5.70G -5.70G Income:Brokering -5.70G 0
Equity:Capital Gains 5.70G 0
06-Mar-26 Player Expenses:Items 1.50G 1.50G 06-Mar-26 Player Expenses:Items 1.50G 1.50G
Expenses:Fees:Mail 30c 1.50G Expenses:Fees:Mail 30c 1.50G
Expenses:Fees:Mail 30c 1.51G Expenses:Fees:Mail 30c 1.51G
Assets:Tajer -1.51G 0 Assets:Tajer -1.51G 0
06-Mar-27 Player Assets:Tajer 160.00G 160.00G 06-Mar-27 Player Assets:Tajer 160.00G 160.00G
Assets:Tajer:Items -160.00G 0 Assets:Tajer:Items -200.00G -40.00G
Expenses:Capital Loss 40.00G 40.00G Expenses:Capital Loss 40.00G 0
Equity:Capital Losses -40.00G 0
06-Mar-27 Player Expenses:Fees:Mail 30c 30c 06-Mar-27 Player Expenses:Fees:Mail 30c 30c
Assets:Tajer -30c 0 Assets:Tajer -30c 0
06-Mar-26 Player Expenses:Items 54.00G 54.00G 06-Mar-26 Player Expenses:Items 54.00G 54.00G

98
test/baseline/opt-lots_basis_base.test
View file

@ -677,9 +677,8 @@ test reg --basis --base
06-Mar-16 Post Expenses:Fees:Mail 90c 90c 06-Mar-16 Post Expenses:Fees:Mail 90c 90c
Assets:Tajer -90c 0 Assets:Tajer -90c 0
06-Mar-16 Auction House Assets:Tajer 1195768c 1195768c 06-Mar-16 Auction House Assets:Tajer 1195768c 1195768c
Assets:Tajer:Items -1195768c 0 Assets:Tajer:Items -650000c 545768c
Income:Brokering -545768c -545768c Income:Brokering -545768c 0
Equity:Capital Gains 545768c 0
06-Mar-16 Auction House Assets:Wyshona:Items "Plans: Mithril Shield Spike" 1 "Plans: Mithril Shield Spike" 1 06-Mar-16 Auction House Assets:Wyshona:Items "Plans: Mithril Shield Spike" 1 "Plans: Mithril Shield Spike" 1
Assets:Wyshona:Items "Plans: Mithril Shield Spike" 1 "Plans: Mithril Shield Spike" 2 Assets:Wyshona:Items "Plans: Mithril Shield Spike" 1 "Plans: Mithril Shield Spike" 2
Assets:Wyshona:Items "Recipe: Elixir of Giant Growth" 1 "Plans: Mithril Shield Spike" 2 Assets:Wyshona:Items "Recipe: Elixir of Giant Growth" 1 "Plans: Mithril Shield Spike" 2
@ -746,13 +745,11 @@ test reg --basis --base
06-Mar-16 Player Assets:Tajer 10000c 10000c 06-Mar-16 Player Assets:Tajer 10000c 10000c
Equity:Gold -10000c 0 Equity:Gold -10000c 0
06-Mar-17 Auction House Assets:Wyshona 180584c 180584c 06-Mar-17 Auction House Assets:Wyshona 180584c 180584c
Assets:Wyshona:Items -180584c 0 Assets:Wyshona:Items -15000c 165584c
Income:Brokering -165584c -165584c Income:Brokering -165584c 0
Equity:Capital Gains 165584c 0
06-Mar-17 Auction House Assets:Wyshona 180584c 180584c 06-Mar-17 Auction House Assets:Wyshona 180584c 180584c
Assets:Wyshona:Items -180584c 0 Assets:Wyshona:Items -10000c 170584c
Income:Brokering -170584c -170584c Income:Brokering -170584c 0
Equity:Capital Gains 170584c 0
06-Mar-17 Post Expenses:Fees:Mail 30c 30c 06-Mar-17 Post Expenses:Fees:Mail 30c 30c
Assets:Tajer -30c 0 Assets:Tajer -30c 0
06-Mar-17 Player: raev Assets:Tajer:Items 300000c 300000c 06-Mar-17 Player: raev Assets:Tajer:Items 300000c 300000c
@ -762,9 +759,8 @@ test reg --basis --base
06-Mar-17 Post Expenses:Fees:Mail 300c 300c 06-Mar-17 Post Expenses:Fees:Mail 300c 300c
Assets:Wyshona -300c 0 Assets:Wyshona -300c 0
06-Mar-17 Player Assets:Wyshona 10000c 10000c 06-Mar-17 Player Assets:Wyshona 10000c 10000c
Assets:Wyshona:Items -10000c 0 Assets:Wyshona:Items -12500c -2500c
Expenses:Capital Loss 2500c 2500c Expenses:Capital Loss 2500c 0
Equity:Capital Losses -2500c 0
06-Mar-17 Auction House (impl.. Expenses:Items 27900c 27900c 06-Mar-17 Auction House (impl.. Expenses:Items 27900c 27900c
Assets:Wyshona -27900c 0 Assets:Wyshona -27900c 0
06-Mar-17 Auction House (impl.. Assets:Danell:Items 30000c 30000c 06-Mar-17 Auction House (impl.. Assets:Danell:Items 30000c 30000c
@ -777,24 +773,20 @@ test reg --basis --base
Assets:Tajer:Items 10000c 269000c Assets:Tajer:Items 10000c 269000c
Assets:Wyshona -269000c 0 Assets:Wyshona -269000c 0
06-Mar-17 Auction House Assets:Tajer 40000c 40000c 06-Mar-17 Auction House Assets:Tajer 40000c 40000c
Assets:Tajer:Items -40000c 0 Assets:Tajer:Items -10000c 30000c
Income:Brokering -30000c -30000c Income:Brokering -30000c 0
Equity:Capital Gains 30000c 0
06-Mar-17 Auction House Assets:Danell 3171c 3171c 06-Mar-17 Auction House Assets:Danell 3171c 3171c
Assets:Danell:Items -3171c 0 Assets:Danell:Items -30000c -26829c
Expenses:Capital Loss 26829c 26829c Expenses:Capital Loss 26829c 0
Equity:Capital Losses -26829c 0
06-Mar-17 Auction House Expenses:Fees:Auction 12537c 12537c 06-Mar-17 Auction House Expenses:Fees:Auction 12537c 12537c
Assets:Danell -12537c 0 Assets:Danell -12537c 0
06-Mar-17 Transfer Assets:Gruulmorg 150000c 150000c 06-Mar-17 Transfer Assets:Gruulmorg 150000c 150000c
Expenses:Fees:Mail 30c 150030c Expenses:Fees:Mail 30c 150030c
Assets:Tajer -150030c 0 Assets:Tajer -150030c 0
06-Mar-17 Auction House Assets:Wyshona 362450c 362450c 06-Mar-17 Auction House Assets:Wyshona 362450c 362450c
Assets:Wyshona:Items -181225c 181225c Assets:Wyshona:Items -21050c 341400c
Assets:Wyshona:Items -181225c 0 Assets:Wyshona:Items -23000c 318400c
Income:Brokering -318400c -318400c Income:Brokering -318400c 0
Equity:Capital Gains 160175c -158225c
Equity:Capital Gains 158225c 0
06-Mar-17 Transfer Assets:Danell 499560c 499560c 06-Mar-17 Transfer Assets:Danell 499560c 499560c
Expenses:Gifts 10000c 509560c Expenses:Gifts 10000c 509560c
Expenses:Fees:Mail 30c 509590c Expenses:Fees:Mail 30c 509590c
@ -812,44 +804,35 @@ test reg --basis --base
Expenses:Fees:Mail 30c 7530c Expenses:Fees:Mail 30c 7530c
Assets:Tajer -7530c 0 Assets:Tajer -7530c 0
06-Mar-18 Auction House Assets:Tajer 150000c 150000c 06-Mar-18 Auction House Assets:Tajer 150000c 150000c
Assets:Tajer:Items -150000c 0 Assets:Tajer:Items -39000c 111000c
Income:Brokering -111000c -111000c Income:Brokering -111000c 0
Equity:Capital Gains 111000c 0
06-Mar-18 Auction House Assets:Tajer 434472c 434472c 06-Mar-18 Auction House Assets:Tajer 434472c 434472c
Assets:Tajer:Items -434472c 0 Assets:Tajer:Items -300000c 134472c
Income:Brokering -134472c -134472c Income:Brokering -134472c 0
Equity:Capital Gains 134472c 0
06-Mar-18 Auction House Assets:Tajer 199500c 199500c 06-Mar-18 Auction House Assets:Tajer 199500c 199500c
Assets:Tajer:Items -199500c 0 Assets:Tajer:Items -50000c 149500c
Income:Brokering -149500c -149500c Income:Brokering -149500c 0
Equity:Capital Gains 149500c 0
06-Mar-19 Auction House Assets:Tajer 285000c 285000c 06-Mar-19 Auction House Assets:Tajer 285000c 285000c
Assets:Tajer:Items -285000c 0 Assets:Tajer:Items -40000c 245000c
Income:Brokering -245000c -245000c Income:Brokering -245000c 0
Equity:Capital Gains 245000c 0
06-Mar-19 Auction House Assets:Tajer 171000c 171000c 06-Mar-19 Auction House Assets:Tajer 171000c 171000c
Assets:Tajer:Items -171000c 0 Assets:Tajer:Items -40000c 131000c
Income:Brokering -131000c -131000c Income:Brokering -131000c 0
Equity:Capital Gains 131000c 0
06-Mar-19 Auction House Assets:Tajer 46550c 46550c 06-Mar-19 Auction House Assets:Tajer 46550c 46550c
Assets:Tajer:Items -46550c 0 Assets:Tajer:Items -10000c 36550c
Income:Brokering -36550c -36550c Income:Brokering -36550c 0
Equity:Capital Gains 36550c 0
06-Mar-19 Auction House Assets:Tajer:Items 30000c 30000c 06-Mar-19 Auction House Assets:Tajer:Items 30000c 30000c
Assets:Tajer:Items 25000c 55000c Assets:Tajer:Items 25000c 55000c
Assets:Tajer -55000c 0 Assets:Tajer -55000c 0
06-Mar-20 Auction House Assets:Tajer 163443c 163443c 06-Mar-20 Auction House Assets:Tajer 163443c 163443c
Assets:Tajer:Items -163443c 0 Assets:Tajer:Items -20000c 143443c
Income:Brokering -143443c -143443c Income:Brokering -143443c 0
Equity:Capital Gains 143443c 0
06-Mar-20 Auction House Assets:Tajer 50000c 50000c 06-Mar-20 Auction House Assets:Tajer 50000c 50000c
Assets:Tajer:Items -50000c 0 Assets:Tajer:Items -30000c 20000c
Income:Brokering -20000c -20000c Income:Brokering -20000c 0
Equity:Capital Gains 20000c 0
06-Mar-20 Auction House Assets:Tajer 150000c 150000c 06-Mar-20 Auction House Assets:Tajer 150000c 150000c
Assets:Tajer:Items -150000c 0 Assets:Tajer:Items -40000c 110000c
Income:Brokering -110000c -110000c Income:Brokering -110000c 0
Equity:Capital Gains 110000c 0
06-Mar-20 Auction House Expenses:Fees:Mail 60c 60c 06-Mar-20 Auction House Expenses:Fees:Mail 60c 60c
Assets:Tajer -60c 0 Assets:Tajer -60c 0
06-Mar-21 Auction House Assets:Tajer:Items 1700000c 1700000c 06-Mar-21 Auction House Assets:Tajer:Items 1700000c 1700000c
@ -866,21 +849,18 @@ test reg --basis --base
Expenses:Fees:Auction 7500c 78300c Expenses:Fees:Auction 7500c 78300c
Assets:Tajer -78300c 0 Assets:Tajer -78300c 0
06-Mar-23 Auction House Assets:Tajer 1665260c 1665260c 06-Mar-23 Auction House Assets:Tajer 1665260c 1665260c
Assets:Tajer:Items -1665260c 0 Assets:Tajer:Items -1700000c -34740c
Expenses:Capital Loss 34740c 34740c Expenses:Capital Loss 34740c 0
Equity:Capital Losses -34740c 0
06-Mar-26 Auction House Assets:Tajer 81980c 81980c 06-Mar-26 Auction House Assets:Tajer 81980c 81980c
Assets:Tajer:Items -81980c 0 Assets:Tajer:Items -25000c 56980c
Income:Brokering -56980c -56980c Income:Brokering -56980c 0
Equity:Capital Gains 56980c 0
06-Mar-26 Player Expenses:Items 15000c 15000c 06-Mar-26 Player Expenses:Items 15000c 15000c
Expenses:Fees:Mail 30c 15030c Expenses:Fees:Mail 30c 15030c
Expenses:Fees:Mail 30c 15060c Expenses:Fees:Mail 30c 15060c
Assets:Tajer -15060c 0 Assets:Tajer -15060c 0
06-Mar-27 Player Assets:Tajer 1600000c 1600000c 06-Mar-27 Player Assets:Tajer 1600000c 1600000c
Assets:Tajer:Items -1600000c 0 Assets:Tajer:Items -2000000c -400000c
Expenses:Capital Loss 400000c 400000c Expenses:Capital Loss 400000c 0
Equity:Capital Losses -400000c 0
06-Mar-27 Player Expenses:Fees:Mail 30c 30c 06-Mar-27 Player Expenses:Fees:Mail 30c 30c
Assets:Tajer -30c 0 Assets:Tajer -30c 0
06-Mar-26 Player Expenses:Items 540000c 540000c 06-Mar-26 Player Expenses:Items 540000c 540000c

7
test/baseline/opt-price.test
View file

@ -18,7 +18,7 @@ end test
test reg -B equities test reg -B equities
08-Jan-01 Purchase Apple shares Equities $2000 $2000 08-Jan-01 Purchase Apple shares Equities $2000 $2000
08-Jun-30 Sell some Apple sha.. Equities $-1250 $750 08-Jun-30 Sell some Apple sha.. Equities $-1000 $1000
end test end test
test reg --end 2009/06/26 -V equities test reg --end 2009/06/26 -V equities
@ -31,8 +31,9 @@ end test
test reg --end 2009/06/26 -G equities test reg --end 2009/06/26 -G equities
08-Jun-30 Commodities revalued <Revalued> $500 $500 08-Jun-30 Commodities revalued <Revalued> $500 $500
09-Jan-31 Commodities revalued <Revalued> $250 $750 08-Jun-30 Sell some Apple sha.. Equities $-250 $250
09-Jun-26 Commodities revalued <Revalued> $500 $1250 09-Jan-31 Commodities revalued <Revalued> $250 $500
09-Jun-26 Commodities revalued <Revalued> $500 $1000
end test end test
test reg -I equities test reg -I equities

0
test/regress/712.test → test/regress/712-a.test
View file

22
test/regress/712-b.test Normal file
View file

@ -0,0 +1,22 @@
2011-01-01 * Opening balance
Assets:Cash 10.00 GBP
Equity:Opening balance -10.00 GBP
2011-02-01 * Buy 1 AAA for 10.00 GBP
Assets:Investments 1 AAA {10.00 GBP}
Assets:Cash -10.00 GBP
2011-12-07 * Sell AAA with a gain
Assets:Cash 12.00 GBP
Assets:Investments -1 AAA {10.00 GBP} @@ 12.00 GBP
Income:Capital gains -2.00 GBP
test bal
12.00 GBP Assets:Cash
-10.00 GBP Equity:Opening balance
-2.00 GBP Income:Capital gains
--------------------
0
end test

40
test/regress/713-a.test Normal file
View file

@ -0,0 +1,40 @@
2011-01-01 * Opening balance
Assets:Cash 25.00 GBP
Equity:Opening balance -25.00 GBP
2011-02-01 * Buy 1 AAA for 10.00 GBP
Assets:Investments 1 AAA {10.00 GBP}
Assets:Cash -10.00 GBP
2011-03-07 * Sell one AAA with a gain
Assets:Cash 12.00 GBP
Assets:Investments -1 AAA {10.00 GBP} @@ 12.00 GBP
Income:Capital gains -2.00 GBP
2011-04-01 * Buy 1 BBB for 15.00 GBP
Assets:Investments 1 BBB {15.00 GBP}
Assets:Cash -15.00 GBP
test bal -B Assets:Investments -p "until 2011-02-20"
10.00 GBP Assets:Investments
end test
test bal -B Assets:Investments -p "until 2011-03-20"
end test
test bal -B Assets:Investments -p "until 2011-04-20"
15.00 GBP Assets:Investments
end test
test bal Assets:Investments -p "until 2011-02-20"
1 AAA Assets:Investments
end test
test bal Assets:Investments -p "until 2011-03-20"
end test
test bal Assets:Investments -p "until 2011-04-20"
1 BBB Assets:Investments
end test

48
test/regress/713-b.test Normal file
View file

@ -0,0 +1,48 @@
2014-01-01 * Opening balances
Assets:Cash 100.00 GBP
Equity:Opening balances
2014-02-01 * Buy 1 AAA for 10 GBP
Assets:Investments 1 AAA @ 10.00 GBP
Assets:Cash -10.00 GBP
2014-03-01 * Buy 1 AAA for 20 GBP
Assets:Investments 1 AAA @ 20.00 GBP
Assets:Cash -20.00 GBP
; Let's say the second purchase attracts an equalisation of 2.00 GBP.
; This means that the purchase price from now on should be 18.00
; rather than 20.00 GBP. So we add a new share with that price and
; the original date, and remove the existing share at the old price; the
; difference of 2.00 GBP is the equalisation received, which is paid to
; the account.
2014-04-16 * Dividend (Equalisation) from AAA
Assets:Investments 1 AAA {18.00 GBP} [2014-03-01] @@ 18.00 GBP
Assets:Investments -1 AAA {20.00 GBP} [2014-03-01] @@ 20.00 GBP
Assets:Broker 2.00 GBP
test bal -B Assets:Investment -p "until 2014-02-20"
10.00 GBP Assets:Investments
end test
test bal -B Assets:Investment -p "until 2014-03-20"
30.00 GBP Assets:Investments
end test
test bal -B Assets:Investment -p "until 2014-04-20"
28.00 GBP Assets:Investments
end test
test bal Assets:Investment -p "until 2014-02-20"
1 AAA Assets:Investments
end test
test bal Assets:Investment -p "until 2014-03-20"
2 AAA Assets:Investments
end test
test bal Assets:Investment -p "until 2014-04-20"
2 AAA Assets:Investments
end test

3
test/regress/C0212EAC.test
View file

@ -27,7 +27,4 @@ test reg
-5.00 GBP {=1.40 EUR} -5.00 GBP {=1.40 EUR}
Income:Gain -0.50 EUR 5.00 GBP Income:Gain -0.50 EUR 5.00 GBP
-5.00 GBP {=1.40 EUR} -5.00 GBP {=1.40 EUR}
Equity:Capital Gains 0.50 EUR 0.50 EUR
5.00 GBP
-5.00 GBP {=1.40 EUR}
end test end test

3
test/regress/CAE63F5C-b.test
View file

@ -7,9 +7,8 @@
test bal -X $ test bal -X $
$272.67 Accrued $272.67 Accrued
$-271.54 Assets $-271.54 Assets
$6.45 Equity:Capital Gains
$5.32 Expenses $5.32 Expenses
$-6.45 Income:Currency Conversion $-6.45 Income:Currency Conversion
-------------------- --------------------
$6.45 0
end test end test

3
test/regress/CAE63F5C-c.test
View file

@ -7,9 +7,8 @@
test bal -X $ test bal -X $
$272.67 Accrued $272.67 Accrued
$-271.54 Assets $-271.54 Assets
$6.45 Equity:Capital Gains
$5.32 Expenses $5.32 Expenses
$-6.45 Income:Currency Conversion $-6.45 Income:Currency Conversion
-------------------- --------------------
$6.46 0
end test end test