X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBankTransaction.pm;h=8b0c9216abfcae962b2446f37747a3b3a6f2a0b9;hb=7c782e1fe7c497386c02981af3c3accba2df5780;hp=c16173537beb2a872ebdc414ebf92cfd26bb6b0d;hpb=66d468b093e7c4510722f22b4a0c069cb95e6117;p=kivitendo-erp.git diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm index c16173537..8b0c9216a 100644 --- a/SL/Controller/BankTransaction.pm +++ b/SL/Controller/BankTransaction.pm @@ -23,8 +23,11 @@ use SL::DB::AccTransaction; use SL::DB::Tax; use SL::DB::Draft; use SL::DB::BankAccount; +use SL::DB::SepaExportItem; use SL::DBUtils qw(like); use SL::Presenter; + +use List::MoreUtils qw(any); use List::Util qw(max); use Rose::Object::MakeMethods::Generic @@ -95,23 +98,116 @@ sub action_list { @where ], ); - - 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'); + $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_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 }; + $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; + # 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; + } + } + 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 # 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); + $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) ) { + 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 ) { + ## jupp + @{$bt->{proposals}} = @{$sepa_exports{$_}->{invoices}}; + $bt->{agreement} = 20; + push(@{$bt->{rule_matches}},'sepa_export_item(20)'); + $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); + } + } + } + } + } + # 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}. @@ -121,12 +217,12 @@ 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){ + 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; }; - $bt->{proposals} = []; - my $agreement = 15; my $min_agreement = 3; # suggestions must have at least this score @@ -151,23 +247,27 @@ 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 { + 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; - + $::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 { @@ -218,7 +318,6 @@ sub action_create_invoice { vendor_id => $use_vendor_filter ? $vendor_of_transaction->id : undef, vendor_name => $use_vendor_filter ? $vendor_of_transaction->name : undef, ALL_VENDORS => $all_vendors, - limit => $myconfig{vclimit}, callback => $callback, ); } @@ -246,8 +345,8 @@ sub action_ajax_payment_suggestion { 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}); + $html .= SL::Presenter->html_tag('a', 'x', href => '#', onclick => "kivi.BankTransaction.delete_invoice(" . $::form->{bt_id} . ',' . $::form->{prop_id} . ")"); + $html = SL::Presenter->html_tag('div', $html, id => $::form->{bt_id} . '.' . $::form->{prop_id}, 'data-invoice-amount' => $invoice->open_amount * 1); $self->render(\ SL::JSON::to_json( { 'html' => $html } ), { layout => 0, type => 'json', process => 0 }); }; @@ -371,10 +470,12 @@ sub action_ajax_accept_invoices { ); } -sub action_save_invoices { +sub save_invoices { my ($self) = @_; - my $invoice_hash = delete $::form->{invoice_ids}; # each key (the bt line with a bt_id) contains an array of invoice_ids + 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 = { @@ -401,14 +502,56 @@ sub action_save_invoices { $self->problems([]); - 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, - ); + 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, + ); + $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, + ); + $count += scalar( @{$invoice_ids} ); + } } + return $count; +} + +sub action_save_invoices { + my ($self) = @_; + my $count = $self->save_invoices(); + + flash('ok', t8('#1 invoice(s) saved.', $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(); + flash('ok', t8('#1 proposal(s) with #2 invoice(s) saved.', $propcount, $count)); + } + } $self->action_list(); + +} + +sub is_collective_transaction { + my ($self, $bt) = @_; + return $bt->transaction_code eq "191"; } sub save_single_bank_transaction { @@ -435,8 +578,10 @@ sub save_single_bank_transaction { 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; + - my @invoices; 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) { @@ -446,27 +591,38 @@ sub save_single_bank_transaction { message => $::locale->text("The ID #1 is not a valid database ID.", $invoice_id), }; } - - push @invoices, $invoice; + push @{ $data{invoices} }, $invoice; } - $data{invoices} = \@invoices; + 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."), + }; + } - @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; + if ( $payment_sent + && any { ( $_->is_sales && ($_->amount > 0)) + || (!$_->is_sales && ($_->amount < 0)) + } @{ $data{invoices} }) { + return { + %data, + result => 'error', + message => $::locale->text("Sent payments can only be posted for purchase invoices and sales credit notes."), + }; + } - my $max_invoices = scalar(@invoices); + my $max_invoices = scalar(@{ $data{invoices} }); my $n_invoices = 0; - foreach my $invoice (@invoices) { + foreach my $invoice (@{ $data{invoices} }) { $n_invoices++ ; + # 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)) { @@ -477,14 +633,12 @@ sub save_single_bank_transaction { }; } - if ($amount_of_transaction == 0) { - push @warnings, { + if (!$amount_of_transaction && $invoice->open_amount) { + return { %data, - result => 'warning', - message => $::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), + 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."), }; - last; } my $payment_type; @@ -494,23 +648,33 @@ sub save_single_bank_transaction { $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 * $invoice->open_amount; - $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $invoice->open_amount); + $amount_of_transaction -= $sign * $open_amount; + $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $open_amount); } else { - $amount_of_transaction += $sign * $invoice->open_amount; - $bank_transaction->invoice_amount($bank_transaction->invoice_amount - $invoice->open_amount); + $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, + transdate => $bank_transaction->transdate->to_kivitendo); + } elsif ( $invoice->is_sales && $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, 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, @@ -518,8 +682,15 @@ sub save_single_bank_transaction { transdate => $bank_transaction->transdate->to_kivitendo); $bank_transaction->invoice_amount($bank_transaction->amount); $amount_of_transaction = 0; - } + 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', @@ -568,58 +739,6 @@ sub save_single_bank_transaction { return grep { $_ } ($error, @warnings); } -sub action_save_proposals { - my ($self) = @_; - - foreach my $bt_id (@{ $::form->{proposal_ids} }) { - my $bt = SL::DB::Manager::BankTransaction->find_by(id => $bt_id); - - 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; - - # check for existing record_link for that $bt and $arap - # do this before any changes to $bt are made - die t8("Bank transaction with id #1 has already been linked to #2.", $bt->id, $arap->displayable_name) - if _existing_record_link($bt, $arap); - - #mark bt as booked - $bt->invoice_amount($bt->amount); - $bt->save; - - #pay invoice - $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, - ); - - SL::DB::RecordLink->new(@props)->save; - - # code duplicated in action_save_invoices! - # "close" a sepa_export_item if it exists - # currently only works, if there is only exactly one open sepa_export_item - if ( my $seis = $arap->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 $arap->id == $seis->[0]->arap_id; - } - } - } - - flash('ok', t8('#1 proposal(s) saved.', scalar @{ $::form->{proposal_ids} })); - - $self->action_list(); -} - # # filters # @@ -755,3 +874,68 @@ sub init_models { } 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). + +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