Revision history for App-HomeBank2Ledger.
+0.009 2022-01-15 16:40:58-07:00 America/Denver
+ * Use posting dates for internal transfers where the transactions have
+ different dates.
+
0.008 2020-05-02 13:06:06-06:00 MST7MDT
* Add file_version method to File::HomeBank.
* Fix matching internal transfers for files generated by HomeBank 5.4.
-# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.014.
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.024.
Changes
LICENSE
MANIFEST
t/00-report-prereqs.dd
t/00-report-prereqs.t
xt/author/critic.t
+xt/author/distmeta.t
xt/author/eol.t
xt/author/minimum-version.t
xt/author/no-tabs.t
xt/author/portability.t
xt/release/consistent-version.t
xt/release/cpan-changes.t
-xt/release/distmeta.t
"Charles McGarvey <chazmcgarvey@brokenzipper.com>"
],
"dynamic_config" : 0,
- "generated_by" : "Dist::Zilla version 6.014, CPAN::Meta::Converter version 2.150010",
+ "generated_by" : "Dist::Zilla version 6.024, CPAN::Meta::Converter version 2.150010",
"license" : [
"mit"
],
"provides" : {
"App::HomeBank2Ledger" : {
"file" : "lib/App/HomeBank2Ledger.pm",
- "version" : "0.008"
+ "version" : "0.009"
},
"App::HomeBank2Ledger::Formatter" : {
"file" : "lib/App/HomeBank2Ledger/Formatter.pm",
- "version" : "0.008"
+ "version" : "0.009"
},
"App::HomeBank2Ledger::Formatter::Beancount" : {
"file" : "lib/App/HomeBank2Ledger/Formatter/Beancount.pm",
- "version" : "0.008"
+ "version" : "0.009"
},
"App::HomeBank2Ledger::Formatter::Ledger" : {
"file" : "lib/App/HomeBank2Ledger/Formatter/Ledger.pm",
- "version" : "0.008"
+ "version" : "0.009"
},
"App::HomeBank2Ledger::Ledger" : {
"file" : "lib/App/HomeBank2Ledger/Ledger.pm",
- "version" : "0.008"
+ "version" : "0.009"
},
"App::HomeBank2Ledger::Util" : {
"file" : "lib/App/HomeBank2Ledger/Util.pm",
- "version" : "0.008"
+ "version" : "0.009"
},
"File::HomeBank" : {
"file" : "lib/File/HomeBank.pm",
- "version" : "0.008"
+ "version" : "0.009"
}
},
"release_status" : "stable",
"web" : "https://github.com/chazmcgarvey/homebank2ledger"
}
},
- "version" : "0.008",
+ "version" : "0.009",
"x_authority" : "cpan:CCM",
"x_generated_by_perl" : "v5.28.0",
- "x_serialization_backend" : "Cpanel::JSON::XS version 4.15",
+ "x_serialization_backend" : "Cpanel::JSON::XS version 4.25",
"x_spdx_expression" : "MIT"
}
configure_requires:
ExtUtils::MakeMaker: '0'
dynamic_config: 0
-generated_by: 'Dist::Zilla version 6.014, CPAN::Meta::Converter version 2.150010'
+generated_by: 'Dist::Zilla version 6.024, CPAN::Meta::Converter version 2.150010'
license: mit
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
provides:
App::HomeBank2Ledger:
file: lib/App/HomeBank2Ledger.pm
- version: '0.008'
+ version: '0.009'
App::HomeBank2Ledger::Formatter:
file: lib/App/HomeBank2Ledger/Formatter.pm
- version: '0.008'
+ version: '0.009'
App::HomeBank2Ledger::Formatter::Beancount:
file: lib/App/HomeBank2Ledger/Formatter/Beancount.pm
- version: '0.008'
+ version: '0.009'
App::HomeBank2Ledger::Formatter::Ledger:
file: lib/App/HomeBank2Ledger/Formatter/Ledger.pm
- version: '0.008'
+ version: '0.009'
App::HomeBank2Ledger::Ledger:
file: lib/App/HomeBank2Ledger/Ledger.pm
- version: '0.008'
+ version: '0.009'
App::HomeBank2Ledger::Util:
file: lib/App/HomeBank2Ledger/Util.pm
- version: '0.008'
+ version: '0.009'
File::HomeBank:
file: lib/File/HomeBank.pm
- version: '0.008'
+ version: '0.009'
requires:
Carp: '0'
Exporter: '0'
bugtracker: https://github.com/chazmcgarvey/homebank2ledger/issues
homepage: https://github.com/chazmcgarvey/homebank2ledger
repository: https://github.com/chazmcgarvey/homebank2ledger.git
-version: '0.008'
+version: '0.009'
x_authority: cpan:CCM
x_generated_by_perl: v5.28.0
x_serialization_backend: 'YAML::Tiny version 1.73'
-# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.014.
+# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.024.
use strict;
use warnings;
"IPC::Open3" => 0,
"Test::More" => 0
},
- "VERSION" => "0.008",
+ "VERSION" => "0.009",
"test" => {
"TESTS" => "t/*.t"
}
VERSION
- version 0.008
+ version 0.009
SYNOPSIS
homebank2ledger converts HomeBank <http://homebank.free.fr/> files to a
format usable by Ledger <https://www.ledger-cli.org/>. It can also
- convert directly to the similar Beancount <http://furius.ca/beancount/>
- format.
+ convert directly to the similar Beancount
+ <https://beancount.github.io/docs/index.html> format.
This software is EXPERIMENTAL, in early development. Its interface may
change without notice.
use App::HomeBank2Ledger;
-our $VERSION = '0.008'; # VERSION
+our $VERSION = '0.009'; # VERSION
App::HomeBank2Ledger->main(@ARGV);
=head1 VERSION
-version 0.008
+version 0.009
=head1 SYNOPSIS
F<homebank2ledger> converts L<HomeBank|http://homebank.free.fr/> files to a format usable by
L<Ledger|https://www.ledger-cli.org/>. It can also convert directly to the similar
-L<Beancount|http://furius.ca/beancount/> format.
+L<Beancount|https://beancount.github.io/docs/index.html> format.
This software is B<EXPERIMENTAL>, in early development. Its interface may change without notice.
use Getopt::Long 2.38 qw(GetOptionsFromArray);
use Pod::Usage;
-our $VERSION = '0.008'; # VERSION
+our $VERSION = '0.009'; # VERSION
my %ACCOUNT_TYPES = ( # map HomeBank account types to Ledger accounts
bank => 'Assets:Bank',
my $memo = $transaction->{wording} || '';
my $payee = $homebank->find_payee_by_key($transaction->{payee});
my $tags = _split_tags($transaction->{tags});
+ my $date = $transaction->{date};
my @postings;
push @postings, {
+ date => $date,
account => $account->{ledger_name},
amount => $amount,
commodity => $commodities{$account->{currency}},
$seen{$transaction->{transfer_key}}++ if $transaction->{transfer_key};
$seen{$paired_transaction->{transfer_key}}++ if $paired_transaction->{transfer_key};
+ my $paired_date = $paired_transaction && $paired_transaction->{date};
my $paired_payee = $homebank->find_payee_by_key($paired_transaction->{payee});
push @postings, {
+ date => $paired_date,
account => $dst_account->{ledger_name},
amount => $paired_transaction->{amount} || -$transaction->{amount},
commodity => $commodities{$dst_account->{currency}},
};
}
}
- else { # with or without category
+ else { # normal transaction with or without category
my $amount = -$transaction->{amount};
my $category = $homebank->find_category_by_key($transaction->{category});
my $other_account = $category ? $category->{ledger_name}
}
$ledger->add_transactions({
- date => $transaction->{date},
+ date => $date,
payee => $payee->{name},
memo => $memo,
postings => \@postings,
=head1 VERSION
-version 0.008
+version 0.009
=head1 SYNOPSIS
use Module::Pluggable search_path => [__PACKAGE__],
sub_name => 'available_formatters';
-our $VERSION = '0.008'; # VERSION
+our $VERSION = '0.009'; # VERSION
sub _croak { require Carp; Carp::croak(@_) }
=head1 VERSION
-version 0.008
+version 0.009
=head1 SYNOPSIS
use parent 'App::HomeBank2Ledger::Formatter';
-our $VERSION = '0.008'; # VERSION
+our $VERSION = '0.009'; # VERSION
my %STATUS_SYMBOLS = (
cleared => '*',
my $date = $transaction->{date};
my $status = $transaction->{status};
my $payee = $transaction->{payee} || '';
- my $memo = $transaction->{memo} || '';
+ my $memo = $transaction->{note} // $transaction->{memo} // '';
my @postings = @{$transaction->{postings}};
my @out;
push @line, ' ';
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};
+ my $lot = $posting->{lot} || {};
+ my $lot_price = $lot->{price} // $posting->{lot_price};
+ my $lot_date = $lot->{date} // $posting->{lot_date};
+ my $lot_ref = $lot->{ref} // $posting->{lot_ref};
if ($lot_price || $lot_date || $lot_ref) {
push @line, ' {',
join(', ',
=head1 VERSION
-version 0.008
+version 0.009
=head1 DESCRIPTION
-This is a formatter for L<Beancount|http://furius.ca/beancount/>.
+This is a formatter for L<Beancount|https://beancount.github.io/docs/index.html>.
=head1 METHODS
use parent 'App::HomeBank2Ledger::Formatter';
-our $VERSION = '0.008'; # VERSION
+our $VERSION = '0.009'; # VERSION
my %STATUS_SYMBOLS = (
cleared => '*',
my $account_width = $self->account_width;
- my $date = $transaction->{date};
- my $status = $transaction->{status};
- my $payee = $self->_format_string($transaction->{payee} || '');
- my $memo = $self->_format_string($transaction->{memo} || '');
- my @postings = @{$transaction->{postings}};
+ my $date = $transaction->{date} or _croak 'Transaction date is required';
+ my $aux_date = $transaction->{aux_date} || $transaction->{effective_date} || '';
+ my $status = $transaction->{status} // '';
+ my $code = $transaction->{code};
+ my $payee = $self->_format_string($transaction->{payee});
+ my $note = $self->_format_string($transaction->{note} // $transaction->{memo});
+ my @postings = @{$transaction->{postings} || _croak 'At least one transaction posting is required'};
my @out;
# figure out the Ledger transaction status
- my $status_symbol = $STATUS_SYMBOLS{$status || ''};
+ my $status_symbol = $STATUS_SYMBOLS{$status};
if (!$status_symbol) {
my %posting_statuses = map { ($_->{status} || '') => 1 } @postings;
if (keys(%posting_statuses) == 1) {
}
}
- $payee =~ s/(?: )|\t;/ ;/g; # don't turn into a memo
+ $aux_date = '' if $date eq $aux_date;
+ $code =~ s/[\(\)]+// if defined $code;
+ $payee =~ s/(?: )|\t;/ ;/g if defined $payee; # don't turn into a note
- push @out, sprintf('%s%s%s%s', $date,
- $status_symbol && " ${status_symbol}",
- $payee && " $payee",
- $memo && " ; $memo",
+ my $has_code = defined $code && $code ne '';
+ my $has_payee = defined $payee && $payee ne '';
+ my $has_note = defined $note && $note ne '';
+
+ push @out, join('', $date,
+ $aux_date && "=${aux_date}",
+ $status_symbol && " ${status_symbol}",
+ $has_code && " (${code})",
+ $has_payee && " ${payee}",
+ $has_note && $has_payee && " ; ${note}",
);
+ if ($has_note && !$has_payee) {
+ push @out, " ; ${note}";
+ }
my $metadata = $transaction->{metadata} || {};
for my $key (sort keys %$metadata) {
- my $value = $self->_format_string($metadata->{$key});
+ my $value = $self->_format_string($metadata->{$key}) ;
push @out, " ; ${key}: ${value}";
}
push @line, ' ';
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 $lot = $posting->{lot} || {};
+ if (my $lot_price = $lot->{price} // $posting->{lot_price}) {
+ my $is_fixed = $lot_price->{fixed} // $posting->{lot_fixed};
my $fixed_symbol = $is_fixed ? '=' : '';
push @line, " {${fixed_symbol}",
- $self->_format_amount($price->{amount}, $price->{commodity}),
+ $self->_format_amount($lot_price->{amount}, $lot_price->{commodity}),
'}';
}
- if (my $lot_date = $posting->{lot_date}) {
- push @line, " [$posting->{lot_date}]";
+ if (my $lot_date = $lot->{date} // $posting->{lot_date}) {
+ push @line, " [${lot_date}]";
+ }
+ if (my $lot_note = $self->_format_string($lot->{note} // $posting->{lot_note} // '')) {
+ $lot_note =~ s/[\(\)]+//; # cleanup
+ $lot_note =~ s/^\@+//;
+ push @line, " (${lot_note})" if $lot_note;
}
if (my $cost = $posting->{total_cost} // $posting->{cost}) {
my $is_total = defined $posting->{total_cost};
$self->_format_amount($cost->{amount}, $cost->{commodity});
}
}
- if (my $note = $posting->{note}) {
- $note = $self->_format_string($note);
- push @line, " ; $note" if $note ne $memo;
+ my $posting_date = $posting->{date} || '';
+ my $posting_aux_date = $posting->{aux_date} || '';
+ my $posting_note = $self->_format_string($posting->{note} // $posting->{memo} // '');
+ $posting_date = '' if $posting_date eq $date;
+ $posting_aux_date = '' if $posting_aux_date eq $aux_date;
+ $posting_note = '' if $has_note && $posting_note eq $note;
+ my $has_posting_note = defined $posting_note && $posting_note ne '';
+ if ($posting_date || $posting_aux_date || $has_posting_note) {
+ if ($posting_date || $posting_aux_date) {
+ $posting_note = sprintf('[%s%s]%s',
+ $posting_date,
+ $posting_aux_date && "=${posting_aux_date}",
+ $has_posting_note && " ${posting_note}",
+ );
+ }
+ push @line, " ; ${posting_note}";
}
push @out, join('', @line);
push @out, " ; ${key}: ${value}";
}
- if (my $posting_payee = $posting->{payee}) {
- $posting_payee = $self->_format_string($posting_payee);
- push @out, " ; Payee: $posting_payee" if $posting_payee ne $payee;
+ if (my $posting_payee = $self->_format_string($posting->{payee} // '')) {
+ push @out, " ; Payee: $posting_payee" if !$has_payee || $posting_payee ne $payee;
}
if (my @tags = @{$posting->{tags} || []}) {
sub _format_string {
my $self = shift;
- my $str = shift;
+ my $str = shift // return;
$str =~ s/\v//g;
return $str;
}
=head1 VERSION
-version 0.008
+version 0.009
=head1 DESCRIPTION
use warnings;
use strict;
-our $VERSION = '0.008'; # VERSION
+our $VERSION = '0.009'; # VERSION
sub new {
=head1 VERSION
-version 0.008
+version 0.009
=head1 SYNOPSIS
=item *
-"Liabilities:Credit Card:CapitalOne"
+"Liabilities:Credit Card:Capital One"
=back
{
date => '2019-06-12', # required
- payee => 'Malcolm Reynolds', # required
+ aux_date => '2019-06-13', # optional
status => 'cleared', # optional; can be "cleared" or "pending"
- memo => 'Medical supplies', # optional
+ code => '1234', # optional
+ payee => 'Malcolm Reynolds', # required
+ note => 'Medical supplies', # optional
postings => [ # required
{
account => 'Some Account', # required
frac => 2,
},
payee => 'Somebody', # optional
- memo => 'Whatever', # optional
+ note => 'Whatever', # optional
status => 'pending', # optional; can be "cleared" or "pending"
tags => [qw(niska train-job)],
+ lot => { # optional
+ date => '2019-01-28',
+ price => {
+ amount => '15.00',
+ commodity => { ... },
+ },
+ },
+ cost => { # optional
+ amount => '10.00',
+ commodity => { ... },
+ },
},
...
],
use Exporter qw(import);
-our $VERSION = '0.008'; # VERSION
+our $VERSION = '0.009'; # VERSION
our @EXPORT_OK = qw(commify rtrim);
=head1 VERSION
-version 0.008
+version 0.009
=head1 FUNCTIONS
use XML::Entities;
use XML::Parser::Lite;
-our $VERSION = '0.008'; # VERSION
+our $VERSION = '0.009'; # VERSION
our @EXPORT_OK = qw(parse_string parse_file);
=head1 VERSION
-version 0.008
+version 0.009
=head1 SYNOPSIS
use strict;
use warnings;
-# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.027
+# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.028
use Test::More tests => 1;
);
}
-pass;
+pass('Reported prereqs');
# vim: ts=4 sts=4 sw=4 et:
't/00-report-prereqs.dd',
't/00-report-prereqs.t',
'xt/author/critic.t',
+ 'xt/author/distmeta.t',
'xt/author/eol.t',
'xt/author/minimum-version.t',
'xt/author/no-tabs.t',
'xt/author/pod-syntax.t',
'xt/author/portability.t',
'xt/release/consistent-version.t',
- 'xt/release/cpan-changes.t',
- 'xt/release/distmeta.t'
+ 'xt/release/cpan-changes.t'
);
eol_unix_ok($_, { trailing_whitespace => 1 }) foreach @files;
't/00-report-prereqs.dd',
't/00-report-prereqs.t',
'xt/author/critic.t',
+ 'xt/author/distmeta.t',
'xt/author/eol.t',
'xt/author/minimum-version.t',
'xt/author/no-tabs.t',
'xt/author/pod-syntax.t',
'xt/author/portability.t',
'xt/release/consistent-version.t',
- 'xt/release/cpan-changes.t',
- 'xt/release/distmeta.t'
+ 'xt/release/cpan-changes.t'
);
notabs_ok($_) foreach @files;