X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBankTransaction.pm;h=e38f8a9972d1787bed42db8cb08793401ce8d0de;hb=23d55c8535d9eecc415791d42ec05a7d9cb5c8e0;hp=8bc3317aeeab2042a51e8f730c972db79b5195e8;hpb=542befb19fa7a69def1d244218594a009da73aaa;p=kivitendo-erp.git diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm index 8bc3317ae..e38f8a997 100644 --- a/SL/Controller/BankTransaction.pm +++ b/SL/Controller/BankTransaction.pm @@ -17,16 +17,21 @@ use SL::SEPA; use SL::DB::Invoice; use SL::DB::PurchaseInvoice; use SL::DB::RecordLink; +use SL::DB::ReconciliationLink; use SL::JSON; use SL::DB::Chart; use SL::DB::AccTransaction; +use SL::DB::BankTransactionAccTrans; use SL::DB::Tax; use SL::DB::BankAccount; +use SL::DB::GLTransaction; use SL::DB::RecordTemplate; use SL::DB::SepaExportItem; -use SL::DBUtils qw(like); -use SL::Presenter; +use SL::DBUtils qw(like do_query); +use SL::Presenter::Tag qw(checkbox_tag html_tag); +use Carp; +use List::UtilsBy qw(partition_by); use List::MoreUtils qw(any); use List::Util qw(max); @@ -48,6 +53,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); } @@ -58,35 +64,25 @@ 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); } -sub action_list { - my ($self) = @_; - - if (!$::form->{filter}{bank_account}) { - flash('error', t8('No bank account chosen!')); - $self->action_search; - return; - } +sub gather_bank_transactions_and_proposals { + my ($self, %params) = @_; - my $sort_by = $::form->{sort_by} || 'transdate'; + my $sort_by = $params{sort_by} || 'transdate'; $sort_by = 'transdate' if $sort_by eq 'proposal'; - $sort_by .= $::form->{sort_dir} ? ' DESC' : ' ASC'; - - my $fromdate = $::locale->parse_date_to_object($::form->{filter}->{fromdate}); - my $todate = $::locale->parse_date_to_object($::form->{filter}->{todate}); - $todate->add( days => 1 ) if $todate; + $sort_by .= $params{sort_dir} ? ' DESC' : ' ASC'; my @where = (); - push @where, (transdate => { ge => $fromdate }) if ($fromdate); - push @where, (transdate => { lt => $todate }) if ($todate); - my $bank_account = SL::DB::Manager::BankAccount->find_by( id => $::form->{filter}{bank_account} ); + push @where, (transdate => { ge => $params{fromdate} }) if $params{fromdate}; + push @where, (transdate => { lt => $params{todate} }) if $params{todate}; # 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 => { ge => $bank_account->reconciliation_starting_date }); + if ( $params{bank_account}->reconciliation_starting_date ) { + push @where, (transdate => { ge => $params{bank_account}->reconciliation_starting_date }); }; my $bank_transactions = SL::DB::Manager::BankTransaction->get_all( @@ -94,62 +90,52 @@ sub action_list { sort_by => $sort_by, limit => 10000, where => [ - amount => {ne => \'invoice_amount'}, - local_bank_account_id => $::form->{filter}{bank_account}, + amount => {ne => \'invoice_amount'}, # '} make emacs happy + local_bank_account_id => $params{bank_account}->id, + cleared => 0, @where ], ); - $main::lxdebug->message(LXDebug->DEBUG2(),"count bt=".scalar(@{$bank_transactions}." bank_account=".$bank_account->id." chart=".$bank_account->chart_id)); - # 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']); - $main::lxdebug->message(LXDebug->DEBUG2(),"count sepaexport=".scalar(@{$all_open_sepa_export_items})); + my $all_open_ar_invoices = SL::DB::Manager::Invoice->get_all(where => [ or => [ amount => { gt => \'paid' }, # '} make emacs happy + and => [ type => 'credit_note', + amount => { lt => \'paid' } # '} make emacs happy + ], + ], + ], + with_objects => ['customer','payment_terms']); + + my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => [amount => { ne => \'paid' }], # '}] make emacs happy + with_objects => ['vendor' ,'payment_terms']); + my $all_open_sepa_export_items = SL::DB::Manager::SepaExportItem->get_all(where => [chart_id => $params{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, 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 }; - $main::lxdebug->message(LXDebug->DEBUG2(),"bank_account=".$::form->{filter}{bank_account}." invoices: ".scalar(@{ $all_open_ar_invoices }). - " + ".scalar(@{ $all_open_ap_invoices })." non fully paid=".scalar(@all_open_invoices)." transactions=".scalar(@{ $bank_transactions })); - my @all_sepa_invoices; - my @all_non_sepa_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){ - # my @items = grep { $_->ap_id == $open_invoice->id || $_->ar_id == $open_invoice->id } @{$all_open_sepa_export_items}; $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount,2); $open_invoice->{skonto_type} = 'without_skonto'; - foreach ( @{$all_open_sepa_export_items}) { - if ( $_->ap_id == $open_invoice->id || $_->ar_id == $open_invoice->id ) { - my $factor = ($_->ar_id == $open_invoice->id?1:-1); - $main::lxdebug->message(LXDebug->DEBUG2(),"exitem=".$_->id." for invoice ".$open_invoice->id." factor=".$factor); - $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2); - $open_invoice->{sepa_export_item} = $_ ; - $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; - #$main::lxdebug->message(LXDebug->DEBUG2(),"amount for export id ".$_->sepa_export_id." = ". - # $sepa_exports{$_->sepa_export_id}->{amount}." count = ". - # $sepa_exports{$_->sepa_export_id}->{count}." is_ar = ". - # $sepa_exports{$_->sepa_export_id}->{is_ar} ); - push @all_sepa_invoices , $open_invoice; - } + 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; } - push @all_non_sepa_invoices , $open_invoice if ! $open_invoice->{sepa_export_item}; } # try to match each bank_transaction with each of the possible open invoices @@ -160,53 +146,27 @@ sub action_list { ## 5 Stellen hinter dem Komma auf 2 Stellen reduzieren $bt->amount($bt->amount*1); $bt->invoice_amount($bt->invoice_amount*1); - $main::lxdebug->message(LXDebug->DEBUG2(),"BT ".$bt->id." amount=".$bt->amount." invoice_amount=".$bt->invoice_amount." remote=". $bt->{remote_name}); $bt->{proposals} = []; $bt->{rule_matches} = []; $bt->{remote_name} .= $bt->{remote_name_1} if $bt->{remote_name_1}; - if ( $self->is_collective_transaction($bt) ) { + if ( $bt->is_batch_transaction ) { + my $found=0; foreach ( keys %sepa_exports) { - #$main::lxdebug->message(LXDebug->DEBUG2(),"Exp ID=".$_." compare sum amount ".($sepa_exports{$_}->{amount} *1) ." == ".($bt->amount * 1)); - if ( $bt->transaction_code eq '191' && abs(($sepa_exports{$_}->{amount} * 1) - ($bt->amount * 1)) < 0.01 ) { + if ( abs(($sepa_exports{$_}->{amount} * 1) - ($bt->amount * 1)) < 0.01 ) { ## jupp @{$bt->{proposals}} = @{$sepa_exports{$_}->{invoices}}; - $bt->{agreement} = 20; - push(@{$bt->{rule_matches}},'sepa_export_item(20)'); + $bt->{sepa_export_ok} = 1; $sepa_exports{$_}->{proposed}=1; - #$main::lxdebug->message(LXDebug->DEBUG2(),"has ".scalar($bt->{proposals})." invoices"); push(@proposals, $bt); - next; - } - } - } - next unless $bt->{remote_name}; # bank has no name, usually fees, use create invoice to assign - - foreach ( @{$all_open_sepa_export_items}) { - last if scalar (@all_sepa_invoices) == 0; - foreach my $open_invoice (@all_sepa_invoices){ - if ( $_->ap_id == $open_invoice->id || $_->ar_id == $open_invoice->id ) { - #$main::lxdebug->message(LXDebug->DEBUG2(),"exitem2=".$_->id." for invoice ".$open_invoice->id); - my $factor = ( $_->ar_id == $open_invoice->id?1:-1); - $_->amount($_->amount*1); - #$main::lxdebug->message(LXDebug->DEBUG2(),"remote account '".$bt->{remote_account_number}."' bt_amount=".$bt->amount." factor=".$factor); - #$main::lxdebug->message(LXDebug->DEBUG2(),"compare with '".$_->vc_iban."' amount=".$_->amount); - if ( $bt->{remote_account_number} eq $_->vc_iban && abs(abs($_->amount) - abs($bt->amount)) < 0.01 ) { - my $iban; - $iban = $open_invoice->customer->iban if $open_invoice->is_sales; - $iban = $open_invoice->vendor->iban if ! $open_invoice->is_sales; - if($bt->{remote_account_number} eq $iban && abs(abs($open_invoice->amount) - abs($bt->amount)) < 0.01 ) { - ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice); - $open_invoice->{agreement} += 5; - $open_invoice->{rule_matches} .= 'sepa_export_item(5) '; - $main::lxdebug->message(LXDebug->DEBUG2(),"sepa invoice_id=".$open_invoice->id." agreement=".$open_invoice->{agreement}." rules matches=".$open_invoice->{rule_matches}); - $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2); - } - } + $found=1; + last; } } + next if $found; + # batch transaction has no remotename !! } # try to match the current $bt to each of the open_invoices, saving the @@ -218,11 +178,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_non_sepa_invoices){ - ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice); - $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*($open_invoice->{is_ar}?1:-1),2); - $main::lxdebug->message(LXDebug->DEBUG2(),"nons invoice_id=".$open_invoice->id." amount=".$open_invoice->amount." agreement=".$open_invoice->{agreement}." rules matches=".$open_invoice->{rule_matches}) if $open_invoice->{agreement} > 2; - }; + 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 @@ -246,28 +208,52 @@ sub action_list { # to qualify as a proposal there has to be # * agreement >= 5 TODO: make threshold configurable in configuration # * 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 @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); + 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 ($params{sort_by} && $params{sort_by} eq 'proposal') { + my $dir = $params{sort_dir} ? 1 : -1; + $bank_transactions = [ sort { ($a->{agreement} <=> $b->{agreement}) * $dir } @{ $bank_transactions } ]; + } + + return ( $bank_transactions , \@proposals ); +} + +sub action_list { + my ($self) = @_; + + if (!$::form->{filter}{bank_account}) { + flash('error', t8('No bank account chosen!')); + $self->action_search; + return; + } + + my $bank_account = SL::DB::BankAccount->load_cached($::form->{filter}->{bank_account}); + my $fromdate = $::locale->parse_date_to_object($::form->{filter}->{fromdate}); + my $todate = $::locale->parse_date_to_object($::form->{filter}->{todate}); + $todate->add( days => 1 ) if $todate; + + my ($bank_transactions, $proposals) = $self->gather_bank_transactions_and_proposals( + bank_account => $bank_account, + fromdate => $fromdate, + todate => $todate, + sort_by => $::form->{sort_by}, + sort_dir => $::form->{sort_dir}, + ); $::request->layout->add_javascripts("kivi.BankTransaction.js"); $self->render('bank_transactions/list', title => t8('Bank transactions MT940'), BANK_TRANSACTIONS => $bank_transactions, - PROPOSALS => \@proposals, + PROPOSALS => $proposals, bank_account => $bank_account, - ui_tab => scalar(@proposals) > 0?1:0, + ui_tab => scalar(@{ $proposals }) > 0 ? 1 : 0, ); } @@ -287,16 +273,24 @@ sub action_create_invoice { $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 $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; - my $templates = SL::DB::Manager::RecordTemplate->get_all( + my $templates_ap = SL::DB::Manager::RecordTemplate->get_all( where => [ template_type => 'ap_transaction' ], + sort_by => [ qw(template_name) ], 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, + ], + sort_by => [ qw(template_name) ], + with_objects => [ qw(employee record_template_items) ], + ); - #Filter templates - $templates = [ grep { $_->vendor_id == $vendor_of_transaction->id } @{ $templates } ] if $use_vendor_filter; + # 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', @@ -305,14 +299,21 @@ sub action_create_invoice { 'filter.fromdate' => $::form->{filter}->{fromdate}, )); - $self->render( - 'bank_transactions/create_invoice', - { layout => 0 }, - title => t8('Create invoice'), - TEMPLATES => $templates, - vendor_id => $use_vendor_filter ? $vendor_of_transaction->id : undef, - vendor_name => $use_vendor_filter ? $vendor_of_transaction->name : undef, - ); + # if we have exactly one ap match, use this directly + if (1 == scalar @{ $templates_ap }) { + $self->redirect_to($self->load_ap_record_template_url($templates_ap->[0])); + + } else { + my $dialog_html = $self->render( + 'bank_transactions/create_invoice', + { layout => 0, output => 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, + ); + $self->js->run('kivi.BankTransaction.show_create_invoice_dialog', $dialog_html)->render; + } } sub action_ajax_payment_suggestion { @@ -322,20 +323,16 @@ 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} ) || SL::DB::Manager::PurchaseInvoice->find_by( id => $::form->{prop_id} ); + croak("Need bt_id") unless $::form->{bt_id}; - die unless $bt and $invoice; + my $invoice = SL::DB::Manager::Invoice->find_by( id => $::form->{prop_id} ) || SL::DB::Manager::PurchaseInvoice->find_by( id => $::form->{prop_id} ); - my @select_options = $invoice->get_payment_select_options_for_bank_transaction($::form->{bt_id}); + croak("No valid invoice found") unless $invoice; - my $html; - $html = $self->render( + my $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 }); @@ -345,17 +342,26 @@ 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 @filter; - push @filter, ('vendor.id' => $::form->{vendor_id}) if $::form->{vendor_id}; - push @filter, ('vendor.name' => { ilike => '%' . $::form->{vendor} . '%' }) if $::form->{vendor}; + 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 $templates = SL::DB::Manager::RecordTemplate->get_all( - where => [ template_type => 'ap_transaction', (or => \@filter) x !!@filter ], + 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} //= {}; $self->callback($self->url_for( @@ -368,7 +374,8 @@ sub action_filter_templates { my $output = $self->render( 'bank_transactions/_template_list', { output => 0 }, - TEMPLATES => $templates, + TEMPLATES_AP => $templates_ap, + TEMPLATES_GL => $templates_gl, ); $self->render(\to_json({ html => $output }), { type => 'json', process => 0 }); @@ -511,14 +518,22 @@ sub save_invoices { $count += scalar( @{$invoice_ids} ); } } - return $count; + my $max_count = $count; + foreach (@{ $self->problems }) { + $count-- if $_->{result} eq 'error'; + } + return ($count, $max_count); } sub action_save_invoices { my ($self) = @_; - my $count = $self->save_invoices(); + my ($success_count, $max_count) = $self->save_invoices(); - flash('ok', t8('#1 invoice(s) saved.', $count)); + 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(); } @@ -538,11 +553,6 @@ sub action_save_proposals { } -sub is_collective_transaction { - my ($self, $bt) = @_; - return $bt->transaction_code eq "191"; -} - sub save_single_bank_transaction { my ($self, %params) = @_; @@ -560,13 +570,20 @@ sub save_single_bank_transaction { }; } + my $bank_transaction = $data{bank_transaction}; + + if ($bank_transaction->closed_period) { + return { + %data, + result => 'error', + message => $::locale->text('Cannot post payment for a closed period!'), + }; + } my (@warnings); my $worker = sub { my $bt_id = $data{bank_transaction_id}; - my $bank_transaction = $data{bank_transaction}; 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; @@ -596,7 +613,7 @@ sub save_single_bank_transaction { if ( $payment_sent && any { ( $_->is_sales && ($_->amount > 0)) - || (!$_->is_sales && ($_->amount < 0)) + || (!$_->is_sales && ($_->amount < 0) && ($_->invoice_type eq 'purchase_invoice')) } @{ $data{invoices} }) { return { %data, @@ -613,18 +630,11 @@ sub save_single_bank_transaction { my $memo = ($data{memos} // [])->[$n_invoices]; $n_invoices++ ; + # safety check invoice open + croak("Invoice closed. Cannot proceed.") unless ($invoice->open_amount); - # Check if bank_transaction already has a link to the invoice, may only be linked once per invoice - # This might be caused by the user reloading a page and resending the form - if (_existing_record_link($bank_transaction, $invoice)) { - return { - %data, - result => 'error', - message => $::locale->text("Bank transaction with id #1 has already been linked to #2.", $bank_transaction->id, $invoice->displayable_name), - }; - } - - if (!$amount_of_transaction && $invoice->open_amount) { + if ( ($payment_sent && $bank_transaction->not_assigned_amount >= 0) + || ($payment_received && $bank_transaction->not_assigned_amount <= 0)) { return { %data, result => 'error', @@ -632,71 +642,82 @@ sub save_single_bank_transaction { }; } - my $payment_type; + my ($payment_type, $free_skonto_amount); if ( defined $::form->{invoice_skontos}->{"$bt_id"} ) { $payment_type = shift(@{ $::form->{invoice_skontos}->{"$bt_id"} }); } else { $payment_type = 'without_skonto'; - }; - + } - # 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); + if ($payment_type eq 'free_skonto') { + # parse user input > 0 + if ($::form->parse_amount(\%::myconfig, $::form->{"free_skonto_amount"}->{"$bt_id"}{$invoice->id}) > 0) { + $free_skonto_amount = $::form->parse_amount(\%::myconfig, $::form->{"free_skonto_amount"}->{"$bt_id"}{$invoice->id}); } 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 => $open_amount, - payment_type => $payment_type, - source => $source, - memo => $memo, - transdate => $bank_transaction->transdate->to_kivitendo); - } elsif ( $invoice->is_sales && $invoice->invoice_type eq 'credit_note' ) { - # no check for overpayment/multiple payments - $invoice->pay_invoice(chart_id => $bank_transaction->local_bank_account->chart_id, - trans_id => $invoice->id, - amount => $invoice->open_amount, - payment_type => $payment_type, - source => $source, - memo => $memo, - transdate => $bank_transaction->transdate->to_kivitendo); - } else { # use the whole amount of the bank transaction for the invoice, overpay the invoice if necessary - 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); - $amount_of_transaction = 0; - - if ($overpaid_amount >= 0.01) { - push @warnings, { + return { %data, - result => 'warning', - message => $::locale->text('Invoice #1 was overpaid by #2.', $invoice->invnumber, $::form->format_amount(\%::myconfig, $overpaid_amount, 2)), + result => 'error', + message => $::locale->text("Free skonto amount has to be a positive number."), }; } } + # pay invoice + # TODO rewrite this: really booked amount should be a return value of Payment.pm + # also this controller shouldnt care about how to calc skonto. we simply delegate the + # payment_type to the helper and get the corresponding bank_transaction values back + # hotfix to get the signs right - compare absolute values and later set the signs + # should be better done elsewhere - changing not_assigned_amount to abs feels seriously bogus + + my $open_amount = $payment_type eq 'with_skonto_pt' ? $invoice->amount_less_skonto : $invoice->open_amount; + $open_amount = abs($open_amount); + $open_amount -= $free_skonto_amount if ($payment_type eq 'free_skonto'); + my $not_assigned_amount = abs($bank_transaction->not_assigned_amount); + my $amount_for_booking = ($open_amount < $not_assigned_amount) ? $open_amount : $not_assigned_amount; + my $amount_for_payment = $amount_for_booking; + + # get the right direction for the payment bookings (all amounts < 0 are stornos, credit notes or negative ap) + $amount_for_payment *= -1 if $invoice->amount < 0; + $free_skonto_amount *= -1 if ($free_skonto_amount && $invoice->amount < 0); + # get the right direction for the bank transaction + $amount_for_booking *= $sign; + + $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $amount_for_booking); + + # ... and then pay the invoice + my @acc_ids = $invoice->pay_invoice(chart_id => $bank_transaction->local_bank_account->chart_id, + trans_id => $invoice->id, + amount => $amount_for_payment, + payment_type => $payment_type, + source => $source, + memo => $memo, + skonto_amount => $free_skonto_amount, + bt_id => $bt_id, + transdate => $bank_transaction->valutadate->to_kivitendo); + # ... and record the origin via BankTransactionAccTrans + if (scalar(@acc_ids) < 2) { + return { + %data, + result => 'error', + message => $::locale->text("Unable to book transactions for bank purpose #1", $bank_transaction->purpose), + }; + } + foreach my $acc_trans_id (@acc_ids) { + my $id_type = $invoice->is_sales ? 'ar' : 'ap'; + my %props_acc = ( + acc_trans_id => $acc_trans_id, + bank_transaction_id => $bank_transaction->id, + $id_type => $invoice->id, + ); + SL::DB::BankTransactionAccTrans->new(%props_acc)->save; + } # Record a record link from the bank transaction to the invoice - my @props = ( + my %props = ( from_table => 'bank_transactions', from_id => $bt_id, to_table => $invoice->is_sales ? 'ar' : 'ap', to_id => $invoice->id, ); - - SL::DB::RecordLink->new(@props)->save; + SL::DB::RecordLink->new(%props)->save; # "close" a sepa_export_item if it exists # code duplicated in action_save_proposals! @@ -732,11 +753,90 @@ sub save_single_bank_transaction { # 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'; }); return grep { $_ } ($error, @warnings); } +sub action_unlink_bank_transaction { + my ($self, %params) = @_; + + croak("No bank transaction ids") unless scalar @{ $::form->{ids}} > 0; + + my $success_count; + + foreach my $bt_id (@{ $::form->{ids}} ) { + + my $bank_transaction = SL::DB::Manager::BankTransaction->find_by(id => $bt_id); + croak("No valid bank transaction found") unless (ref($bank_transaction) eq 'SL::DB::BankTransaction'); + croak t8('Cannot unlink payment for a closed period!') if $bank_transaction->closed_period; + + # everything in one transaction + my $rez = $bank_transaction->db->with_transaction(sub { + # 1. remove all reconciliations (due to underlying trigger, this has to be the first step) + my $rec_links = SL::DB::Manager::ReconciliationLink->get_all(where => [ bank_transaction_id => $bt_id ]); + $_->delete for @{ $rec_links }; + + my %trans_ids; + foreach my $acc_trans_id_entry (@{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt_id ] )}) { + + my $acc_trans = SL::DB::Manager::AccTransaction->get_all(where => [acc_trans_id => $acc_trans_id_entry->acc_trans_id]); + + # save trans_id and type + die "no type" unless ($acc_trans_id_entry->ar_id || $acc_trans_id_entry->ap_id || $acc_trans_id_entry->gl_id); + $trans_ids{$acc_trans_id_entry->ar_id} = 'ar' if $acc_trans_id_entry->ar_id; + $trans_ids{$acc_trans_id_entry->ap_id} = 'ap' if $acc_trans_id_entry->ap_id; + $trans_ids{$acc_trans_id_entry->gl_id} = 'gl' if $acc_trans_id_entry->gl_id; + # 2. all good -> ready to delete acc_trans and bt_acc link + $acc_trans_id_entry->delete; + $_->delete for @{ $acc_trans }; + } + # 3. update arap.paid (may not be 0, yet) + # or in case of gl, delete whole entry + while (my ($trans_id, $type) = each %trans_ids) { + if ($type eq 'gl') { + SL::DB::Manager::GLTransaction->delete_all(where => [ id => $trans_id ]); + next; + } + die ("invalid type") unless $type =~ m/^(ar|ap)$/; + + # recalc and set paid via database query + my $query = qq|UPDATE $type SET paid = + (SELECT COALESCE(abs(sum(amount)),0) FROM acc_trans + WHERE trans_id = ? + AND chart_link ilike '%paid%') + WHERE id = ?|; + + die if (do_query($::form, $bank_transaction->db->dbh, $query, $trans_id, $trans_id) == -1); + } + # 4. and delete all (if any) record links + my $rl = SL::DB::Manager::RecordLink->delete_all(where => [ from_id => $bt_id, from_table => 'bank_transactions' ]); + + # 5. finally reset this bank transaction + $bank_transaction->invoice_amount(0); + $bank_transaction->cleared(0); + $bank_transaction->save; + # 6. and add a log entry in history_erp + SL::DB::History->new( + trans_id => $bank_transaction->id, + snumbers => 'bank_transaction_unlink_' . $bank_transaction->id, + employee_id => SL::DB::Manager::Employee->current->id, + what_done => 'bank_transaction', + addition => 'UNLINKED', + )->save(); + + 1; + + }) || die t8('error while unlinking payment #1 : ', $bank_transaction->purpose) . $bank_transaction->db->error . "\n"; + + $success_count++; + } + flash('ok', t8('#1 bank transaction bookings undone.', $success_count)); + $self->action_list_all() unless $params{testcase}; +} # # filters # @@ -762,6 +862,7 @@ sub make_filter_summary { [ $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->{"remote_name:substr::ilike"}, $::locale->text('Remote name') ], ); for (@filters) { @@ -779,10 +880,19 @@ sub prepare_report { my $report = SL::ReportGenerator->new(\%::myconfig, $::form); $self->{report} = $report; - my @columns = qw(local_bank_name transdate valudate remote_name remote_account_number remote_bank_code amount invoice_amount invoices currency purpose local_account_number local_bank_code id); + my @columns = qw(ids local_bank_name transdate valudate remote_name remote_account_number remote_bank_code amount invoice_amount invoices currency purpose local_account_number local_bank_code id); 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 = ( + ids => { raw_header_data => checkbox_tag("", id => "check_all", checkall => "[data-checkall=1]"), + 'align' => 'center', + raw_data => sub { if (@{ $_[0]->linked_invoices }) { + if ($_[0]->closed_period) { + html_tag('text', "X"); #, tooltip => t8('Bank Transaction is in a closed period.')), + } else { + checkbox_tag("ids[]", value => $_[0]->id, "data-checkall" => 1); + } + } } }, transdate => { sub => sub { $_[0]->transdate_as_date } }, valutadate => { sub => sub { $_[0]->valutadate_as_date } }, remote_name => { }, @@ -792,7 +902,8 @@ sub prepare_report { align => 'right' }, invoice_amount => { sub => sub { $_[0]->invoice_amount_as_number }, align => 'right' }, - invoices => { sub => sub { $_[0]->linked_invoices } }, + invoices => { sub => sub { my @invnumbers; for my $obj (@{ $_[0]->linked_invoices }) { + next unless $obj; push @invnumbers, $obj->invnumber } return \@invnumbers } }, currency => { sub => sub { $_[0]->currency->name } }, purpose => { }, local_account_number => { sub => sub { $_[0]->local_bank_account->account_number } }, @@ -827,20 +938,6 @@ sub prepare_report { ); } -sub _existing_record_link { - my ($bt, $invoice) = @_; - - # check whether a record link from banktransaction $bt already exists to - # invoice $invoice, returns 1 if that is the case - - die unless $bt->isa("SL::DB::BankTransaction") && ( $invoice->isa("SL::DB::Invoice") || $invoice->isa("SL::DB::PurchaseInvoice") ); - - my $linked_record_to_table = $invoice->is_sales ? 'Invoice' : 'PurchaseInvoice'; - my $linked_records = $bt->linked_records( direction => 'to', to => $linked_record_to_table, query => [ id => $invoice->id ] ); - - return @$linked_records ? 1 : 0; -}; - sub init_problems { [] } sub init_models { @@ -853,6 +950,7 @@ sub init_models { by => 'transdate', dir => 0, # 1 = ASC, 0 = DESC : default sort is newest at top }, + id => t8('ID'), transdate => t8('Transdate'), remote_name => t8('Remote name'), amount => t8('Amount'), @@ -875,20 +973,72 @@ 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.datepaid_1' => $self->transaction->transdate_as_date, - 'form_defaults.paid_1' => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2), - 'form_defaults.currency' => $self->transaction->currency->name, - 'form_defaults.AP_paid_1' => $self->transaction->local_bank_account->chart->accno, - 'form_defaults.callback' => $self->callback, + 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->not_assigned_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, + 'form_defaults.description' => $self->transaction->purpose, ); } +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( + combobox => [ + action => [ t8('Actions') ], + action => [ + t8('Unlink bank transactions'), + submit => [ '#form', { action => 'BankTransaction/unlink_bank_transaction' } ], + checks => [ [ 'kivi.check_if_entries_selected', '[name="ids[]"]' ] ], + disabled => $::instance_conf->get_payments_changeable ? t8('Cannot safely unlink bank transactions, please set the posting configuration for payments to unchangeable.') : undef, + ], + ], + action => [ + t8('Filter'), + submit => [ '#filter_form', { action => 'BankTransaction/list_all' } ], + accesskey => 'enter', + ], + ); + } +} + 1; __END__ @@ -912,6 +1062,16 @@ 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 handles already partly assigned bank transactions. + +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 bank transaction will only be +partly assigned. + 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 @@ -947,6 +1107,18 @@ C =back +=item C + +Takes one or more bank transaction ID (as parameter C) and +tries to revert all payment bookings including already cleared bookings. + +This method won't undo payments that are in a closed period and assumes +that payments are not manually changed, i.e. only imported payments. + +GL-records will be deleted completely if a bank transaction was the source. + +TODO: we still rely on linked_records for the check boxes + =back =head1 AUTHOR