From b492b169ba4538d55b7ca16d7f5a6c3e8dfa322b Mon Sep 17 00:00:00 2001 From: Charles McGarvey Date: Sat, 17 Aug 2019 16:09:00 -0600 Subject: [PATCH 1/1] add formatting of transactions with lot specifiers --- .../HomeBank2Ledger/Formatter/Beancount.pm | 23 ++++++++++++++++- lib/App/HomeBank2Ledger/Formatter/Ledger.pm | 25 ++++++++++++++++++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/lib/App/HomeBank2Ledger/Formatter/Beancount.pm b/lib/App/HomeBank2Ledger/Formatter/Beancount.pm index a72a64e..659283a 100644 --- a/lib/App/HomeBank2Ledger/Formatter/Beancount.pm +++ b/lib/App/HomeBank2Ledger/Formatter/Beancount.pm @@ -11,6 +11,7 @@ L =cut +use v5.10.1; # defined-or use warnings; use strict; @@ -209,7 +210,27 @@ sub _format_transaction { push @line, ($posting_status_symbol ? " $posting_status_symbol " : ' '); push @line, sprintf("\%-${account_width}s", $account); push @line, ' '; - push @line, $self->_format_amount($posting->{amount}, $posting->{commodity}) if defined $posting->{amount}; + if (defined $posting->{amount}) { + push @line, $self->_format_amount($posting->{amount}, $posting->{commodity}); + my $lot_price = $posting->{lot_price}; + my $lot_date = $posting->{lot_date}; + my $lot_ref = $posting->{lot_ref}; + if ($lot_price || $lot_date || $lot_ref) { + push @line, ' {', + join(', ', + $lot_price ? $self->_format_amount($lot_price->{amount}, $lot_price->{commodity}) : (), + $lot_date ? $lot_date : (), + $lot_ref ? $self->_format_string($lot_ref) : (), + ), + '}'; + } + if (my $cost = $posting->{total_cost} // $posting->{cost}) { + my $is_total = defined $posting->{total_cost}; + my $cost_symbol = $is_total ? '@@' : '@'; + push @line, ' ', $cost_symbol, ' ', + $self->_format_amount($cost->{amount}, $cost->{commodity}); + } + } push @out, join('', @line); } diff --git a/lib/App/HomeBank2Ledger/Formatter/Ledger.pm b/lib/App/HomeBank2Ledger/Formatter/Ledger.pm index 3a5a713..8f05441 100644 --- a/lib/App/HomeBank2Ledger/Formatter/Ledger.pm +++ b/lib/App/HomeBank2Ledger/Formatter/Ledger.pm @@ -11,6 +11,7 @@ L =cut +use v5.10.1; # defined-or use warnings; use strict; @@ -244,7 +245,29 @@ sub _format_transaction { push @line, ($posting_status_symbol ? " $posting_status_symbol " : ' '); push @line, sprintf("\%-${account_width}s", $posting->{account}); push @line, ' '; - push @line, $self->_format_amount($posting->{amount}, $posting->{commodity}) if defined $posting->{amount}; + if (defined $posting->{amount}) { + push @line, $self->_format_amount($posting->{amount}, $posting->{commodity}); + if (my $price = $posting->{lot_price}) { + my $is_fixed = $posting->{lot_fixed}; + my $fixed_symbol = $is_fixed ? '=' : ''; + push @line, " {${fixed_symbol}", + $self->_format_amount($price->{amount}, $price->{commodity}), + '}'; + } + if (my $lot_date = $posting->{lot_date}) { + push @line, " [$posting->{lot_date}]"; + } + if (my $cost = $posting->{total_cost} // $posting->{cost}) { + my $is_total = defined $posting->{total_cost}; + my $cost_symbol = $is_total ? '@@' : '@'; + push @line, ' ', $cost_symbol, ' ', + $self->_format_amount($cost->{amount}, $cost->{commodity}); + } + } + if (my $note = $posting->{note}) { + $note = $self->_format_string($note); + push @line, " ; $note" if $note ne $memo; + } push @out, join('', @line); -- 2.43.0