X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBankTransaction.pm;h=3d98e9fecd6f209510b6ce0b13e45e80ec1fb5cc;hb=698bf12d23e82883b9cc8920e40e1d15c6298d00;hp=47089bdc9fc082ece360f76e619b76b2c85ab848;hpb=573562a5411e9a3cb35b586935a6a0ed29d805db;p=kivitendo-erp.git
diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index 47089bdc9..3d98e9fec 100644
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -21,14 +21,19 @@ use SL::JSON;
use SL::DB::Chart;
use SL::DB::AccTransaction;
use SL::DB::Tax;
-use SL::DB::Draft;
use SL::DB::BankAccount;
-use SL::Presenter;
+use SL::DB::RecordTemplate;
+use SL::DB::SepaExportItem;
+use SL::DBUtils qw(like);
+
+use List::UtilsBy qw(partition_by);
+use List::MoreUtils qw(any);
use List::Util qw(max);
use Rose::Object::MakeMethods::Generic
(
- 'scalar --get_set_init' => [ qw(models) ],
+ scalar => [ qw(callback transaction) ],
+ 'scalar --get_set_init' => [ qw(models problems) ],
);
__PACKAGE__->run_before('check_auth');
@@ -43,6 +48,7 @@ sub action_search {
my $bank_accounts = SL::DB::Manager::BankAccount->get_all_sorted( query => [ obsolete => 0 ] );
+ $self->setup_search_action_bar;
$self->render('bank_transactions/search',
BANK_ACCOUNTS => $bank_accounts);
}
@@ -53,6 +59,7 @@ sub action_list_all {
$self->make_filter_summary;
$self->prepare_report;
+ $self->setup_list_all_action_bar;
$self->report_generator_list_objects(report => $self->{report}, objects => $self->models->get);
}
@@ -78,33 +85,94 @@ sub action_list {
push @where, (transdate => { lt => $todate }) if ($todate);
my $bank_account = SL::DB::Manager::BankAccount->find_by( id => $::form->{filter}{bank_account} );
# bank_transactions no younger than starting date,
+ # including starting date (same search behaviour as fromdate)
# but OPEN invoices to be matched may be from before
if ( $bank_account->reconciliation_starting_date ) {
- push @where, (transdate => { gt => $bank_account->reconciliation_starting_date });
+ push @where, (transdate => { ge => $bank_account->reconciliation_starting_date });
};
- my $bank_transactions = SL::DB::Manager::BankTransaction->get_all(where => [ amount => {ne => \'invoice_amount'},
- local_bank_account_id => $::form->{filter}{bank_account},
- @where ],
- with_objects => [ 'local_bank_account', 'currency' ],
- sort_by => $sort_by, limit => 10000);
-
- my $all_open_ar_invoices = SL::DB::Manager::Invoice->get_all(where => [amount => { gt => \'paid' }], with_objects => 'customer');
- my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => [amount => { gt => \'paid' }], with_objects => 'vendor');
+ my $bank_transactions = SL::DB::Manager::BankTransaction->get_all(
+ with_objects => [ 'local_bank_account', 'currency' ],
+ sort_by => $sort_by,
+ limit => 10000,
+ where => [
+ amount => {ne => \'invoice_amount'},
+ local_bank_account_id => $::form->{filter}{bank_account},
+ cleared => 0,
+ @where
+ ],
+ );
+ # credit notes have a negative amount, treat differently
+ my $all_open_ar_invoices = SL::DB::Manager::Invoice ->get_all(where => [ or => [ amount => { gt => \'paid' },
+ and => [ type => 'credit_note',
+ amount => { lt => \'paid' }
+ ],
+ ],
+ ],
+ with_objects => ['customer','payment_terms']);
+
+ my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => [amount => { ne => \'paid' }], with_objects => ['vendor' ,'payment_terms']);
+ my $all_open_sepa_export_items = SL::DB::Manager::SepaExportItem->get_all(where => [chart_id => $bank_account->chart_id ,
+ 'sepa_export.executed' => 0, 'sepa_export.closed' => 0 ], with_objects => ['sepa_export']);
my @all_open_invoices;
# filter out invoices with less than 1 cent outstanding
- push @all_open_invoices, grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ar_invoices };
- push @all_open_invoices, grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ap_invoices };
+ push @all_open_invoices, map { $_->{is_ar}=1 ; $_ } grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ar_invoices };
+ push @all_open_invoices, map { $_->{is_ar}=0 ; $_ } grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ap_invoices };
+
+ my %sepa_exports;
+ my %sepa_export_items_by_id = partition_by { $_->ar_id || $_->ap_id } @$all_open_sepa_export_items;
+
+ # first collect sepa export items to open invoices
+ foreach my $open_invoice (@all_open_invoices){
+ $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount,2);
+ $open_invoice->{skonto_type} = 'without_skonto';
+ foreach (@{ $sepa_export_items_by_id{ $open_invoice->id } || [] }) {
+ my $factor = ($_->ar_id == $open_invoice->id ? 1 : -1);
+ $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);
+
+ $open_invoice->{skonto_type} = $_->payment_type;
+ $sepa_exports{$_->sepa_export_id} ||= { count => 0, is_ar => 0, amount => 0, proposed => 0, invoices => [], item => $_ };
+ $sepa_exports{$_->sepa_export_id}->{count}++;
+ $sepa_exports{$_->sepa_export_id}->{is_ar}++ if $_->ar_id == $open_invoice->id;
+ $sepa_exports{$_->sepa_export_id}->{amount} += $_->amount * $factor;
+ push @{ $sepa_exports{$_->sepa_export_id}->{invoices} }, $open_invoice;
+ }
+ }
# try to match each bank_transaction with each of the possible open invoices
# by awarding points
+ my @proposals;
foreach my $bt (@{ $bank_transactions }) {
- next unless $bt->{remote_name}; # bank has no name, usually fees, use create invoice to assign
+ ## 5 Stellen hinter dem Komma auf 2 Stellen reduzieren
+ $bt->amount($bt->amount*1);
+ $bt->invoice_amount($bt->invoice_amount*1);
+
+ $bt->{proposals} = [];
+ $bt->{rule_matches} = [];
$bt->{remote_name} .= $bt->{remote_name_1} if $bt->{remote_name_1};
+ if ( $bt->is_batch_transaction ) {
+ my $found=0;
+ foreach ( keys %sepa_exports) {
+ if ( abs(($sepa_exports{$_}->{amount} * 1) - ($bt->amount * 1)) < 0.01 ) {
+ ## jupp
+ @{$bt->{proposals}} = @{$sepa_exports{$_}->{invoices}};
+ $bt->{sepa_export_ok} = 1;
+ $sepa_exports{$_}->{proposed}=1;
+ push(@proposals, $bt);
+ $found=1;
+ last;
+ }
+ }
+ next if $found;
+ # batch transaction has no remotename !!
+ } else {
+ next unless $bt->{remote_name}; # bank has no name, usually fees, use create invoice to assign
+ }
+
# try to match the current $bt to each of the open_invoices, saving the
# results of get_agreement_with_invoice in $open_invoice->{agreement} and
# $open_invoice->{rule_matches}.
@@ -114,11 +182,13 @@ sub action_list {
# the arrays $bt->{proposals} and $bt->{rule_matches}, and the agreement
# score is stored in $bt->{agreement}
- foreach my $open_invoice (@all_open_invoices){
- ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
- };
-
- $bt->{proposals} = [];
+ foreach my $open_invoice (@all_open_invoices) {
+ ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice,
+ sepa_export_items => $all_open_sepa_export_items,
+ );
+ $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,
+ $open_invoice->amount * ($open_invoice->{is_ar} ? 1 : -1), 2);
+ }
my $agreement = 15;
my $min_agreement = 3; # suggestions must have at least this score
@@ -144,20 +214,37 @@ sub action_list {
# * there must be only one exact match
# * depending on whether sales or purchase the amount has to have the correct sign (so Gutschriften don't work?)
my $proposal_threshold = 5;
- my @proposals = grep { $_->{agreement} >= $proposal_threshold
- and 1 == scalar @{ $_->{proposals} }
- and (@{ $_->{proposals} }[0]->is_sales ? abs(@{ $_->{proposals} }[0]->amount - $_->amount) < 0.01 : abs(@{ $_->{proposals} }[0]->amount + $_->amount) < 0.01) } @{ $bank_transactions };
+ my @otherproposals = grep {
+ ($_->{agreement} >= $proposal_threshold)
+ && (1 == scalar @{ $_->{proposals} })
+ && (@{ $_->{proposals} }[0]->is_sales ? abs(@{ $_->{proposals} }[0]->amount - $_->amount) < 0.01
+ : abs(@{ $_->{proposals} }[0]->amount + $_->amount) < 0.01)
+ } @{ $bank_transactions };
+
+ push @proposals, @otherproposals;
# sort bank transaction proposals by quality (score) of proposal
- $bank_transactions = [ sort { $a->{agreement} <=> $b->{agreement} } @{ $bank_transactions } ] if $::form->{sort_by} eq 'proposal' and $::form->{sort_dir} == 1;
- $bank_transactions = [ sort { $b->{agreement} <=> $a->{agreement} } @{ $bank_transactions } ] if $::form->{sort_by} eq 'proposal' and $::form->{sort_dir} == 0;
+ if ($::form->{sort_by} && $::form->{sort_by} eq 'proposal') {
+ if ($::form->{sort_dir}) {
+ $bank_transactions = [ sort { $a->{agreement} <=> $b->{agreement} } @{ $bank_transactions } ];
+ } else {
+ $bank_transactions = [ sort { $b->{agreement} <=> $a->{agreement} } @{ $bank_transactions } ];
+ }
+ }
+ # for testing with t/bank/banktransaction.t :
+ if ( $::form->{dont_render_for_test} ) {
+ return ( $bank_transactions , \@proposals );
+ }
+ $::request->layout->add_javascripts("kivi.BankTransaction.js");
$self->render('bank_transactions/list',
title => t8('Bank transactions MT940'),
BANK_TRANSACTIONS => $bank_transactions,
PROPOSALS => \@proposals,
- bank_account => $bank_account );
+ bank_account => $bank_account,
+ ui_tab => scalar(@proposals) > 0?1:0,
+ );
}
sub action_assign_invoice {
@@ -165,46 +252,49 @@ sub action_assign_invoice {
$self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
- $self->render('bank_transactions/assign_invoice', { layout => 0 },
- title => t8('Assign invoice'),);
+ $self->render('bank_transactions/assign_invoice',
+ { layout => 0 },
+ title => t8('Assign invoice'),);
}
sub action_create_invoice {
my ($self) = @_;
my %myconfig = %main::myconfig;
- $self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
- my $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(account_number => $self->{transaction}->{remote_account_number});
-
- my $drafts = SL::DB::Manager::Draft->get_all(where => [ module => 'ap'] , with_objects => 'employee');
+ $self->transaction(SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id}));
- my @filtered_drafts;
+ my $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(iban => $self->transaction->{remote_account_number});
+ my $use_vendor_filter = $self->transaction->{remote_account_number} && $vendor_of_transaction;
- foreach my $draft ( @{ $drafts } ) {
- my $draft_as_object = YAML::Load($draft->form);
- my $vendor = SL::DB::Manager::Vendor->find_by(id => $draft_as_object->{vendor_id});
- $draft->{vendor} = $vendor->name;
- $draft->{vendor_id} = $vendor->id;
- push @filtered_drafts, $draft;
- }
+ my $templates_ap = SL::DB::Manager::RecordTemplate->get_all(
+ where => [ template_type => 'ap_transaction' ],
+ with_objects => [ qw(employee vendor) ],
+ );
+ my $templates_gl = SL::DB::Manager::RecordTemplate->get_all(
+ query => [ template_type => 'gl_transaction',
+ chart_id => SL::DB::Manager::BankAccount->find_by(id => $self->transaction->local_bank_account_id)->chart_id,
+ ],
+ with_objects => [ qw(employee record_template_items) ],
+ );
- #Filter drafts
- @filtered_drafts = grep { $_->{vendor_id} == $vendor_of_transaction->id } @filtered_drafts if $vendor_of_transaction;
-
- my $all_vendors = SL::DB::Manager::Vendor->get_all();
-
- $self->render('bank_transactions/create_invoice', { layout => 0 },
- title => t8('Create invoice'),
- DRAFTS => \@filtered_drafts,
- vendor_id => $vendor_of_transaction ? $vendor_of_transaction->id : undef,
- vendor_name => $vendor_of_transaction ? $vendor_of_transaction->name : undef,
- ALL_VENDORS => $all_vendors,
- limit => $myconfig{vclimit},
- callback => $self->url_for(action => 'list',
- 'filter.bank_account' => $::form->{filter}->{bank_account},
- 'filter.todate' => $::form->{filter}->{todate},
- 'filter.fromdate' => $::form->{filter}->{fromdate}),
- );
+ # pre filter templates_ap, if we have a vendor match (IBAN eq IBAN) - show and allow user to edit this via gui!
+ $templates_ap = [ grep { $_->vendor_id == $vendor_of_transaction->id } @{ $templates_ap } ] if $use_vendor_filter;
+
+ $self->callback($self->url_for(
+ action => 'list',
+ 'filter.bank_account' => $::form->{filter}->{bank_account},
+ 'filter.todate' => $::form->{filter}->{todate},
+ 'filter.fromdate' => $::form->{filter}->{fromdate},
+ ));
+
+ $self->render(
+ 'bank_transactions/create_invoice',
+ { layout => 0 },
+ title => t8('Create invoice'),
+ TEMPLATES_GL => $use_vendor_filter && @{ $templates_ap } ? undef : $templates_gl,
+ TEMPLATES_AP => $templates_ap,
+ vendor_name => $use_vendor_filter && @{ $templates_ap } ? $vendor_of_transaction->name : undef,
+ );
}
sub action_ajax_payment_suggestion {
@@ -214,60 +304,66 @@ sub action_ajax_payment_suggestion {
# create an HTML blob to be used by the js function add_invoices in templates/webpages/bank_transactions/list.html
# and return encoded as JSON
- my $bt = SL::DB::Manager::BankTransaction->find_by( id => $::form->{bt_id} );
- my $invoice = SL::DB::Manager::Invoice->find_by( id => $::form->{prop_id} );
- $invoice = SL::DB::Manager::PurchaseInvoice->find_by( id => $::form->{prop_id} ) unless $invoice;
+ my $bt = SL::DB::Manager::BankTransaction->find_by( id => $::form->{bt_id} );
+ my $invoice = SL::DB::Manager::Invoice->find_by( id => $::form->{prop_id} ) || SL::DB::Manager::PurchaseInvoice->find_by( id => $::form->{prop_id} );
die unless $bt and $invoice;
my @select_options = $invoice->get_payment_select_options_for_bank_transaction($::form->{bt_id});
my $html;
- $html .= SL::Presenter->input_tag('invoice_ids.' . $::form->{bt_id} . '[]', $::form->{prop_id} , type => 'hidden');
- $html .= SL::Presenter->escape( $invoice->invnumber );
- $html .= SL::Presenter->select_tag('invoice_skontos.' . $::form->{bt_id} . '[]', \@select_options,
- value_key => 'payment_type',
- title_key => 'display' ) if @select_options;
- $html .= 'x';
- $html = SL::Presenter->html_tag('div', $html, id => $::form->{bt_id} . '.' . $::form->{prop_id});
-
- $self->render(\ SL::JSON::to_json( { 'html' => $html } ), { layout => 0, type => 'json', process => 0 });
+ $html = $self->render(
+ 'bank_transactions/_payment_suggestion', { output => 0 },
+ bt_id => $::form->{bt_id},
+ prop_id => $::form->{prop_id},
+ invoice => $invoice,
+ SELECT_OPTIONS => \@select_options,
+ );
+
+ $self->render(\ SL::JSON::to_json( { 'html' => "$html" } ), { layout => 0, type => 'json', process => 0 });
};
-sub action_filter_drafts {
+sub action_filter_templates {
my ($self) = @_;
- $self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
- my $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(account_number => $self->{transaction}->{remote_account_number});
-
- my $drafts = SL::DB::Manager::Draft->get_all(with_objects => 'employee');
-
- my @filtered_drafts;
-
- foreach my $draft ( @{ $drafts } ) {
- my $draft_as_object = YAML::Load($draft->form);
- my $vendor = SL::DB::Manager::Vendor->find_by(id => $draft_as_object->{vendor_id});
- $draft->{vendor} = $vendor->name;
- $draft->{vendor_id} = $vendor->id;
- push @filtered_drafts, $draft;
- }
+ $self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
+
+ my (@filter, @filter_ap);
+
+ # filter => gl and ap | filter_ap = ap (i.e. vendorname)
+ push @filter, ('template_name' => { ilike => '%' . $::form->{template} . '%' }) if $::form->{template};
+ push @filter, ('reference' => { ilike => '%' . $::form->{reference} . '%' }) if $::form->{reference};
+ push @filter_ap, ('vendor.name' => { ilike => '%' . $::form->{vendor} . '%' }) if $::form->{vendor};
+ push @filter_ap, @filter;
+ my $templates_gl = SL::DB::Manager::RecordTemplate->get_all(
+ query => [ template_type => 'gl_transaction',
+ chart_id => SL::DB::Manager::BankAccount->find_by(id => $self->transaction->local_bank_account_id)->chart_id,
+ (and => \@filter) x !!@filter
+ ],
+ with_objects => [ qw(employee record_template_items) ],
+ );
- my $vendor_name = $::form->{vendor};
- my $vendor_id = $::form->{vendor_id};
+ my $templates_ap = SL::DB::Manager::RecordTemplate->get_all(
+ where => [ template_type => 'ap_transaction', (and => \@filter_ap) x !!@filter_ap ],
+ with_objects => [ qw(employee vendor) ],
+ );
+ $::form->{filter} //= {};
- #Filter drafts
- @filtered_drafts = grep { $_->{vendor_id} == $vendor_id } @filtered_drafts if $vendor_id;
- @filtered_drafts = grep { $_->{vendor} =~ /$vendor_name/i } @filtered_drafts if $vendor_name;
+ $self->callback($self->url_for(
+ action => 'list',
+ 'filter.bank_account' => $::form->{filter}->{bank_account},
+ 'filter.todate' => $::form->{filter}->{todate},
+ 'filter.fromdate' => $::form->{filter}->{fromdate},
+ ));
my $output = $self->render(
- 'bank_transactions/filter_drafts',
- { output => 0 },
- DRAFTS => \@filtered_drafts,
- );
-
- my %result = ( count => 0, html => $output );
+ 'bank_transactions/_template_list',
+ { output => 0 },
+ TEMPLATES_AP => $templates_ap,
+ TEMPLATES_GL => $templates_gl,
+ );
- $self->render(\to_json(\%result), { type => 'json', process => 0 });
+ $self->render(\to_json({ html => $output }), { type => 'json', process => 0 });
}
sub action_ajax_add_list {
@@ -277,8 +373,8 @@ sub action_ajax_add_list {
my @where_purchase = (amount => { ne => \'paid' });
if ($::form->{invnumber}) {
- push @where_sale, (invnumber => { ilike => '%' . $::form->{invnumber} . '%'});
- push @where_purchase, (invnumber => { ilike => '%' . $::form->{invnumber} . '%'});
+ push @where_sale, (invnumber => { ilike => like($::form->{invnumber})});
+ push @where_purchase, (invnumber => { ilike => like($::form->{invnumber})});
}
if ($::form->{amount}) {
@@ -287,13 +383,13 @@ sub action_ajax_add_list {
}
if ($::form->{vcnumber}) {
- push @where_sale, ('customer.customernumber' => { ilike => '%' . $::form->{vcnumber} . '%'});
- push @where_purchase, ('vendor.vendornumber' => { ilike => '%' . $::form->{vcnumber} . '%'});
+ push @where_sale, ('customer.customernumber' => { ilike => like($::form->{vcnumber})});
+ push @where_purchase, ('vendor.vendornumber' => { ilike => like($::form->{vcnumber})});
}
if ($::form->{vcname}) {
- push @where_sale, ('customer.name' => { ilike => '%' . $::form->{vcname} . '%'});
- push @where_purchase, ('vendor.name' => { ilike => '%' . $::form->{vcname} . '%'});
+ push @where_sale, ('customer.name' => { ilike => like($::form->{vcname})});
+ push @where_purchase, ('vendor.name' => { ilike => like($::form->{vcname})});
}
if ($::form->{transdatefrom}) {
@@ -313,20 +409,20 @@ sub action_ajax_add_list {
};
}
- my $all_open_ar_invoices = SL::DB::Manager::Invoice->get_all(where => \@where_sale, with_objects => 'customer');
+ my $all_open_ar_invoices = SL::DB::Manager::Invoice ->get_all(where => \@where_sale, with_objects => 'customer');
my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => \@where_purchase, with_objects => 'vendor');
- my @all_open_invoices;
- # filter out subcent differences from ap invoices
+ my @all_open_invoices = @{ $all_open_ar_invoices };
+ # add ap invoices, filtering out subcent open amounts
push @all_open_invoices, grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ap_invoices };
@all_open_invoices = sort { $a->id <=> $b->id } @all_open_invoices;
my $output = $self->render(
- 'bank_transactions/add_list',
- { output => 0 },
- INVOICES => \@all_open_invoices,
- );
+ 'bank_transactions/add_list',
+ { output => 0 },
+ INVOICES => \@all_open_invoices,
+ );
my %result = ( count => 0, html => $output );
@@ -338,130 +434,312 @@ sub action_ajax_accept_invoices {
my @selected_invoices;
foreach my $invoice_id (@{ $::form->{invoice_id} || [] }) {
- my $invoice_object = SL::DB::Manager::Invoice->find_by(id => $invoice_id);
- $invoice_object ||= SL::DB::Manager::PurchaseInvoice->find_by(id => $invoice_id);
-
+ my $invoice_object = SL::DB::Manager::Invoice->find_by(id => $invoice_id) || SL::DB::Manager::PurchaseInvoice->find_by(id => $invoice_id);
push @selected_invoices, $invoice_object;
}
- $self->render('bank_transactions/invoices', { layout => 0 },
- INVOICES => \@selected_invoices,
- bt_id => $::form->{bt_id} );
+ $self->render(
+ 'bank_transactions/invoices',
+ { layout => 0 },
+ INVOICES => \@selected_invoices,
+ bt_id => $::form->{bt_id},
+ );
+}
+
+sub save_invoices {
+ my ($self) = @_;
+
+ return 0 if !$::form->{invoice_ids};
+
+ my %invoice_hash = %{ delete $::form->{invoice_ids} }; # each key (the bt line with a bt_id) contains an array of invoice_ids
+
+ # e.g. three partial payments with bt_ids 54, 55 and 56 for invoice with id 74:
+ # $invoice_hash = {
+ # '55' => [
+ # '74'
+ # ],
+ # '54' => [
+ # '74'
+ # ],
+ # '56' => [
+ # '74'
+ # ]
+ # };
+ #
+ # or if the payment with bt_id 44 is used to pay invoices with ids 50, 51 and 52
+ # $invoice_hash = {
+ # '44' => [ '50', '51', 52' ]
+ # };
+
+ $::form->{invoice_skontos} ||= {}; # hash of arrays containing the payment types, could be empty
+
+ # a bank_transaction may be assigned to several invoices, i.e. a customer
+ # might pay several open invoices with one transaction
+
+ $self->problems([]);
+
+ my $count = 0;
+
+ if ( $::form->{proposal_ids} ) {
+ foreach (@{ $::form->{proposal_ids} }) {
+ my $bank_transaction_id = $_;
+ my $invoice_ids = $invoice_hash{$_};
+ push @{ $self->problems }, $self->save_single_bank_transaction(
+ bank_transaction_id => $bank_transaction_id,
+ invoice_ids => $invoice_ids,
+ sources => ($::form->{sources} // {})->{$_},
+ memos => ($::form->{memos} // {})->{$_},
+ );
+ $count += scalar( @{$invoice_ids} );
+ }
+ } else {
+ while ( my ($bank_transaction_id, $invoice_ids) = each(%invoice_hash) ) {
+ push @{ $self->problems }, $self->save_single_bank_transaction(
+ bank_transaction_id => $bank_transaction_id,
+ invoice_ids => $invoice_ids,
+ sources => [ map { $::form->{"sources_${bank_transaction_id}_${_}"} } @{ $invoice_ids } ],
+ memos => [ map { $::form->{"memos_${bank_transaction_id}_${_}"} } @{ $invoice_ids } ],
+ );
+ $count += scalar( @{$invoice_ids} );
+ }
+ }
+ my $max_count = $count;
+ foreach (@{ $self->problems }) {
+ $count-- if $_->{result} eq 'error';
+ }
+ return ($count, $max_count);
}
sub action_save_invoices {
my ($self) = @_;
+ my ($success_count, $max_count) = $self->save_invoices();
+
+ if ($success_count == $max_count) {
+ flash('ok', t8('#1 invoice(s) saved.', $success_count));
+ } else {
+ flash('error', t8('At least #1 invoice(s) not saved', $max_count - $success_count));
+ }
+
+ $self->action_list();
+}
+
+sub action_save_proposals {
+ my ($self) = @_;
+
+ if ( $::form->{proposal_ids} ) {
+ my $propcount = scalar(@{ $::form->{proposal_ids} });
+ if ( $propcount > 0 ) {
+ my $count = $self->save_invoices();
- my $invoice_hash = delete $::form->{invoice_ids}; # each key (the bt line with a bt_id) contains an array of invoice_ids
- my $skonto_hash = delete $::form->{invoice_skontos} || {}; # array containing the payment type, could be empty
+ flash('ok', t8('#1 proposal(s) with #2 invoice(s) saved.', $propcount, $count));
+ }
+ }
+ $self->action_list();
- while ( my ($bt_id, $invoice_ids) = each(%$invoice_hash) ) {
- my $bank_transaction = SL::DB::Manager::BankTransaction->find_by(id => $bt_id);
- my $sign = $bank_transaction->amount < 0 ? -1 : 1;
+}
+
+sub save_single_bank_transaction {
+ my ($self, %params) = @_;
+
+ my %data = (
+ %params,
+ bank_transaction => SL::DB::Manager::BankTransaction->find_by(id => $params{bank_transaction_id}),
+ invoices => [],
+ );
+
+ if (!$data{bank_transaction}) {
+ return {
+ %data,
+ result => 'error',
+ message => $::locale->text('The ID #1 is not a valid database ID.', $data{bank_transaction_id}),
+ };
+ }
+
+ my $bank_transaction = $data{bank_transaction};
+
+ # see pod
+ if (@{ $bank_transaction->linked_invoices } || $bank_transaction->invoice_amount != 0) {
+ return {
+ %data,
+ result => 'error',
+ message => $::locale->text("Bank transaction with id #1 has already been linked to one or more record and/or some amount is already assigned.", $bank_transaction->id),
+ };
+ }
+ my (@warnings);
+
+ my $worker = sub {
+ my $bt_id = $data{bank_transaction_id};
+ my $sign = $bank_transaction->amount < 0 ? -1 : 1;
my $amount_of_transaction = $sign * $bank_transaction->amount;
+ my $payment_received = $bank_transaction->amount > 0;
+ my $payment_sent = $bank_transaction->amount < 0;
+
+
+ foreach my $invoice_id (@{ $params{invoice_ids} }) {
+ my $invoice = SL::DB::Manager::Invoice->find_by(id => $invoice_id) || SL::DB::Manager::PurchaseInvoice->find_by(id => $invoice_id);
+ if (!$invoice) {
+ return {
+ %data,
+ result => 'error',
+ message => $::locale->text("The ID #1 is not a valid database ID.", $invoice_id),
+ };
+ }
+ push @{ $data{invoices} }, $invoice;
+ }
+
+ if ( $payment_received
+ && any { ( $_->is_sales && ($_->amount < 0))
+ || (!$_->is_sales && ($_->amount > 0))
+ } @{ $data{invoices} }) {
+ return {
+ %data,
+ result => 'error',
+ message => $::locale->text("Received payments can only be posted for sales invoices and purchase credit notes."),
+ };
+ }
- my @invoices;
- foreach my $invoice_id (@{ $invoice_ids }) {
- push @invoices, (SL::DB::Manager::Invoice->find_by(id => $invoice_id) || SL::DB::Manager::PurchaseInvoice->find_by(id => $invoice_id));
+ if ( $payment_sent
+ && any { ( $_->is_sales && ($_->amount > 0))
+ || (!$_->is_sales && ($_->amount < 0) && ($_->invoice_type eq 'purchase_invoice'))
+ } @{ $data{invoices} }) {
+ return {
+ %data,
+ result => 'error',
+ message => $::locale->text("Sent payments can only be posted for purchase invoices and sales credit notes."),
+ };
}
- @invoices = sort { return 1 if ($a->is_sales and $a->amount > 0);
- return 1 if (!$a->is_sales and $a->amount < 0);
- return -1; } @invoices if $bank_transaction->amount > 0;
- @invoices = sort { return -1 if ($a->is_sales and $a->amount > 0);
- return -1 if (!$a->is_sales and $a->amount < 0);
- return 1; } @invoices if $bank_transaction->amount < 0;
-
- foreach my $invoice (@invoices) {
+
+ my $max_invoices = scalar(@{ $data{invoices} });
+ my $n_invoices = 0;
+
+ foreach my $invoice (@{ $data{invoices} }) {
+ my $source = ($data{sources} // [])->[$n_invoices];
+ my $memo = ($data{memos} // [])->[$n_invoices];
+
+ $n_invoices++ ;
+
+
+ if (!$amount_of_transaction && $invoice->open_amount) {
+ return {
+ %data,
+ result => 'error',
+ message => $::locale->text("A payment can only be posted for multiple invoices if the amount to post is equal to or bigger than the sum of the open amounts of the affected invoices."),
+ };
+ }
+
my $payment_type;
- if ( @$skonto_hash{"$bt_id"} ) {
- $payment_type = shift( @$skonto_hash{"$bt_id"} );
+ if ( defined $::form->{invoice_skontos}->{"$bt_id"} ) {
+ $payment_type = shift(@{ $::form->{invoice_skontos}->{"$bt_id"} });
} else {
$payment_type = 'without_skonto';
};
- if ($amount_of_transaction == 0) {
- flash('warning', $::locale->text('There are invoices which could not be paid by bank transaction #1 (Account number: #2, bank code: #3)!',
- $bank_transaction->purpose,
- $bank_transaction->remote_account_number,
- $bank_transaction->remote_bank_code));
- last;
- }
- #pay invoice or go to the next bank transaction if the amount is not sufficiently high
- if ($invoice->amount <= $amount_of_transaction) {
+
+
+ # pay invoice or go to the next bank transaction if the amount is not sufficiently high
+ if ($invoice->open_amount <= $amount_of_transaction && $n_invoices < $max_invoices) {
+ my $open_amount = ($payment_type eq 'with_skonto_pt'?$invoice->amount_less_skonto:$invoice->open_amount);
+ # first calculate new bank transaction amount ...
+ if ($invoice->is_sales) {
+ $amount_of_transaction -= $sign * $open_amount;
+ $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $open_amount);
+ } else {
+ $amount_of_transaction += $sign * $open_amount;
+ $bank_transaction->invoice_amount($bank_transaction->invoice_amount - $open_amount);
+ }
+ # ... and then pay the invoice
$invoice->pay_invoice(chart_id => $bank_transaction->local_bank_account->chart_id,
trans_id => $invoice->id,
- amount => $invoice->amount,
+ amount => $open_amount,
payment_type => $payment_type,
+ source => $source,
+ memo => $memo,
transdate => $bank_transaction->transdate->to_kivitendo);
- if ($invoice->is_sales) {
- $amount_of_transaction -= $sign * $invoice->amount;
- $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $invoice->amount);
- } else {
- $amount_of_transaction += $sign * $invoice->amount if (!$invoice->is_sales);
- $bank_transaction->invoice_amount($bank_transaction->invoice_amount - $invoice->amount);
- }
} else {
+ # use the whole amount of the bank transaction for the invoice, overpay the invoice if necessary
+
+ # $invoice->open_amount is negative for credit_notes
+ # $bank_transaction->amount is negative for outgoing transactions
+ # so $amount_of_transaction is negative but needs positive
+ # $invoice->open_amount may be negative for ap_transaction but may be positiv for negative ap_transaction
+ # if $invoice->open_amount is negative $bank_transaction->amount is positve
+ # if $invoice->open_amount is positive $bank_transaction->amount is negative
+ # but amount of transaction is for both positive
+
+ $amount_of_transaction *= -1 if ($invoice->amount < 0);
+
+ # if we have a skonto case - the last invoice needs skonto
+ $amount_of_transaction = $invoice->amount_less_skonto if ($payment_type eq 'with_skonto_pt');
+
+
+ my $overpaid_amount = $amount_of_transaction - $invoice->open_amount;
$invoice->pay_invoice(chart_id => $bank_transaction->local_bank_account->chart_id,
trans_id => $invoice->id,
amount => $amount_of_transaction,
payment_type => $payment_type,
+ source => $source,
+ memo => $memo,
transdate => $bank_transaction->transdate->to_kivitendo);
- $bank_transaction->invoice_amount($bank_transaction->amount) if $invoice->is_sales;
- $bank_transaction->invoice_amount($bank_transaction->amount) if !$invoice->is_sales;
+ $bank_transaction->invoice_amount($bank_transaction->amount);
$amount_of_transaction = 0;
- }
- #Record a link from the bank transaction to the invoice
+ if ($overpaid_amount >= 0.01) {
+ push @warnings, {
+ %data,
+ result => 'warning',
+ message => $::locale->text('Invoice #1 was overpaid by #2.', $invoice->invnumber, $::form->format_amount(\%::myconfig, $overpaid_amount, 2)),
+ };
+ }
+ }
+ # Record a record link from the bank transaction to the invoice
my @props = (
- from_table => 'bank_transactions',
- from_id => $bt_id,
- to_table => $invoice->is_sales ? 'ar' : 'ap',
- to_id => $invoice->id,
- );
+ from_table => 'bank_transactions',
+ from_id => $bt_id,
+ to_table => $invoice->is_sales ? 'ar' : 'ap',
+ to_id => $invoice->id,
+ );
- my $existing = SL::DB::Manager::RecordLink->get_all(where => \@props, limit => 1)->[0];
+ SL::DB::RecordLink->new(@props)->save;
+
+ # "close" a sepa_export_item if it exists
+ # code duplicated in action_save_proposals!
+ # currently only works, if there is only exactly one open sepa_export_item
+ if ( my $seis = $invoice->find_sepa_export_items({ executed => 0 }) ) {
+ if ( scalar @$seis == 1 ) {
+ # moved the execution and the check for sepa_export into a method,
+ # this isn't part of a transaction, though
+ $seis->[0]->set_executed if $invoice->id == $seis->[0]->arap_id;
+ }
+ }
- SL::DB::RecordLink->new(@props)->save if !$existing;
}
$bank_transaction->save;
- }
- $self->action_list();
-}
-
-sub action_save_proposals {
- my ($self) = @_;
-
- foreach my $bt_id (@{ $::form->{proposal_ids} }) {
- #mark bt as booked
- my $bt = SL::DB::Manager::BankTransaction->find_by(id => $bt_id);
- $bt->invoice_amount($bt->amount);
- $bt->save;
-
- #pay invoice
- my $arap = SL::DB::Manager::Invoice->find_by(id => $::form->{"proposed_invoice_$bt_id"});
- $arap = SL::DB::Manager::PurchaseInvoice->find_by(id => $::form->{"proposed_invoice_$bt_id"}) if not defined $arap;
- $arap->pay_invoice(chart_id => $bt->local_bank_account->chart_id,
- trans_id => $arap->id,
- amount => $arap->amount,
- transdate => $bt->transdate->to_kivitendo);
- $arap->save;
-
- #create record link
- my @props = (
- from_table => 'bank_transactions',
- from_id => $bt_id,
- to_table => $arap->is_sales ? 'ar' : 'ap',
- to_id => $arap->id,
- );
-
- my $existing = SL::DB::Manager::RecordLink->get_all(where => \@props, limit => 1)->[0];
+ # 'undef' means 'no error' here.
+ return undef;
+ };
- SL::DB::RecordLink->new(@props)->save if !$existing;
- }
+ my $error;
+ my $rez = $data{bank_transaction}->db->with_transaction(sub {
+ eval {
+ $error = $worker->();
+ 1;
+
+ } or do {
+ $error = {
+ %data,
+ result => 'error',
+ message => $@,
+ };
+ };
- flash('ok', t8('#1 proposal(s) saved.', scalar @{ $::form->{proposal_ids} }));
+ # Rollback Fehler nicht weiterreichen
+ # die if $error;
+ # aber einen rollback von hand
+ $::lxdebug->message(LXDebug->DEBUG2(),"finish worker with ". ($error ? $error->{result} : '-'));
+ $data{bank_transaction}->db->dbh->rollback if $error && $error->{result} eq 'error';
+ });
- $self->action_list();
+ return grep { $_ } ($error, @warnings);
}
#
@@ -483,12 +761,12 @@ sub make_filter_summary {
my @filter_strings;
my @filters = (
- [ $filter->{"transdate:date::ge"}, $::locale->text('Transdate') . " " . $::locale->text('From Date') ],
- [ $filter->{"transdate:date::le"}, $::locale->text('Transdate') . " " . $::locale->text('To Date') ],
- [ $filter->{"valutadate:date::ge"}, $::locale->text('Valutadate') . " " . $::locale->text('From Date') ],
- [ $filter->{"valutadate:date::le"}, $::locale->text('Valutadate') . " " . $::locale->text('To Date') ],
- [ $filter->{"amount:number"}, $::locale->text('Amount') ],
- [ $filter->{"bank_account_id:integer"}, $::locale->text('Local bank account') ],
+ [ $filter->{"transdate:date::ge"}, $::locale->text('Transdate') . " " . $::locale->text('From Date') ],
+ [ $filter->{"transdate:date::le"}, $::locale->text('Transdate') . " " . $::locale->text('To Date') ],
+ [ $filter->{"valutadate:date::ge"}, $::locale->text('Valutadate') . " " . $::locale->text('From Date') ],
+ [ $filter->{"valutadate:date::le"}, $::locale->text('Valutadate') . " " . $::locale->text('To Date') ],
+ [ $filter->{"amount:number"}, $::locale->text('Amount') ],
+ [ $filter->{"bank_account_id:integer"}, $::locale->text('Local bank account') ],
);
for (@filters) {
@@ -510,21 +788,21 @@ sub prepare_report {
my @sortable = qw(local_bank_name transdate valudate remote_name remote_account_number remote_bank_code amount purpose local_account_number local_bank_code);
my %column_defs = (
- transdate => { sub => sub { $_[0]->transdate_as_date } },
- valutadate => { sub => sub { $_[0]->valutadate_as_date } },
+ transdate => { sub => sub { $_[0]->transdate_as_date } },
+ valutadate => { sub => sub { $_[0]->valutadate_as_date } },
remote_name => { },
remote_account_number => { },
remote_bank_code => { },
- amount => { sub => sub { $_[0]->amount_as_number },
+ amount => { sub => sub { $_[0]->amount_as_number },
align => 'right' },
- invoice_amount => { sub => sub { $_[0]->invoice_amount_as_number },
+ invoice_amount => { sub => sub { $_[0]->invoice_amount_as_number },
align => 'right' },
- invoices => { sub => sub { $_[0]->linked_invoices } },
- currency => { sub => sub { $_[0]->currency->name } },
+ invoices => { sub => sub { $_[0]->linked_invoices } },
+ currency => { sub => sub { $_[0]->currency->name } },
purpose => { },
- local_account_number => { sub => sub { $_[0]->local_bank_account->account_number } },
- local_bank_code => { sub => sub { $_[0]->local_bank_account->bank_code } },
- local_bank_name => { sub => sub { $_[0]->local_bank_account->name } },
+ local_account_number => { sub => sub { $_[0]->local_bank_account->account_number } },
+ local_bank_code => { sub => sub { $_[0]->local_bank_account->bank_code } },
+ local_bank_name => { sub => sub { $_[0]->local_bank_account->name } },
id => {},
);
@@ -554,15 +832,17 @@ sub prepare_report {
);
}
+sub init_problems { [] }
+
sub init_models {
my ($self) = @_;
SL::Controller::Helper::GetModels->new(
controller => $self,
- sorted => {
+ sorted => {
_default => {
- by => 'transdate',
- dir => 0, # 1 = ASC, 0 = DESC : default sort is newest at top
+ by => 'transdate',
+ dir => 0, # 1 = ASC, 0 = DESC : default sort is newest at top
},
transdate => t8('Transdate'),
remote_name => t8('Remote name'),
@@ -582,4 +862,136 @@ sub init_models {
);
}
+sub load_ap_record_template_url {
+ my ($self, $template) = @_;
+
+ return $self->url_for(
+ controller => 'ap.pl',
+ action => 'load_record_template',
+ id => $template->id,
+ 'form_defaults.amount_1' => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
+ 'form_defaults.transdate' => $self->transaction->transdate_as_date,
+ 'form_defaults.duedate' => $self->transaction->transdate_as_date,
+ 'form_defaults.no_payment_bookings' => 1,
+ 'form_defaults.paid_1_suggestion' => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
+ 'form_defaults.AP_paid_1_suggestion' => $self->transaction->local_bank_account->chart->accno,
+ 'form_defaults.callback' => $self->callback,
+ );
+}
+
+sub load_gl_record_template_url {
+ my ($self, $template) = @_;
+
+ return $self->url_for(
+ controller => 'gl.pl',
+ action => 'load_record_template',
+ id => $template->id,
+ 'form_defaults.amount_1' => abs($self->transaction->amount), # always positive
+ 'form_defaults.transdate' => $self->transaction->transdate_as_date,
+ 'form_defaults.callback' => $self->callback,
+ 'form_defaults.bt_id' => $self->transaction->id,
+ 'form_defaults.bt_chart_id' => $self->transaction->local_bank_account->chart->id,
+ );
+}
+
+sub setup_search_action_bar {
+ my ($self, %params) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Filter'),
+ submit => [ '#search_form', { action => 'BankTransaction/list' } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
+sub setup_list_all_action_bar {
+ my ($self, %params) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Filter'),
+ submit => [ '#filter_form', { action => 'BankTransaction/list_all' } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
1;
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Controller::BankTransaction - Posting payments to invoices from
+bank transactions imported earlier
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C
+
+Takes a bank transaction ID (as parameter C and
+tries to post its amount to a certain number of invoices (parameter
+C, an array ref of database IDs to purchase or sales
+invoice objects).
+
+This method cannot handle already partly assigned bank transactions, i.e.
+a bank transaction that has a invoice_amount <> 0 but not the fully
+transaction amount (invoice_amount == amount).
+
+If the amount of the bank transaction is higher than the sum of
+the assigned invoices (1 .. n) the last invoice will be overpayed.
+
+The whole function is wrapped in a database transaction. If an
+exception occurs the bank transaction is not posted at all. The same
+is true if the code detects an error during the execution, e.g. a bank
+transaction that's already been posted earlier. In both cases the
+database transaction will be rolled back.
+
+If warnings but not errors occur the database transaction is still
+committed.
+
+The return value is an error object or C if the function
+succeeded. The calling function will collect all warnings and errors
+and display them in a nicely formatted table if any occurred.
+
+An error object is a hash reference containing the following members:
+
+=over 2
+
+=item * C â can be either C or C. Warnings are
+displayed slightly different than errors.
+
+=item * C â a human-readable message included in the list of
+errors meant as the description of why the problem happened
+
+=item * C, C â the same parameters
+that the function was called with
+
+=item * C â the database object
+(C) corresponding to C
+
+=item * C â an array ref of the database objects (either
+C or C) corresponding to
+C
+
+=back
+
+=back
+
+=head1 AUTHOR
+
+Niclas Zimmermann Eniclas@kivitendo-premium.deE,
+Geoffrey Richardson Einformation@richardson-bueren.deE
+
+=cut