X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBankTransaction.pm;h=c220f3c1cfc47fc62d6892767663399e7b3c0e6a;hb=f319b065b828d7ac69ecbef68bfb16b4f3415422;hp=752dba0a400f3b44b111533938f129d4b8b32216;hpb=aae306cda6274d6e53a6af8e52348524416b8fba;p=kivitendo-erp.git diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm index 752dba0a4..c220f3c1c 100644 --- a/SL/Controller/BankTransaction.pm +++ b/SL/Controller/BankTransaction.pm @@ -21,17 +21,17 @@ 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::DB::RecordTemplate; 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 ( + scalar => [ qw(callback transaction) ], 'scalar --get_set_init' => [ qw(models problems) ], ); @@ -47,6 +47,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); } @@ -57,6 +58,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); } @@ -98,49 +100,42 @@ sub action_list { @where ], ); - $main::lxdebug->message(LXDebug->DEBUG2(),"count bt=".scalar(@{$bank_transactions}." bank_account=".$bank_account->id." chart=".$bank_account->chart_id)); - - my $all_open_ar_invoices = SL::DB::Manager::Invoice ->get_all(where => [amount => { gt => \'paid' }], with_objects => ['customer','payment_terms']); - my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => [amount => { gt => \'paid' }], with_objects => ['vendor' ,'payment_terms']); + # 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, 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 })." 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>0?1:-1); - $main::lxdebug->message(LXDebug->DEBUG2(),"exitem=".$_->id." for invoice ".$open_invoice->id." factor=".$factor); + if (($_->ap_id && $_->ap_id == $open_invoice->id) || ($_->ar_id && $_->ar_id == $open_invoice->id)) { + my $factor = ($_->ar_id == $open_invoice->id ? 1 : -1); + #$main::lxdebug->message(LXDebug->DEBUG2(),"sepa_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}->{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 @@ -151,48 +146,29 @@ 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)); - #$main::lxdebug->message(LXDebug->DEBUG2(),"compare with '".$_->vc_iban."' amount=".$_->amount); - if ( $bt->{remote_account_number} eq $_->vc_iban && abs(( $_->amount *1 ) - ($bt->amount * $factor)) < 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 !! + } 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 @@ -204,11 +180,11 @@ 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){ + foreach my $open_invoice (@all_open_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." agreement=".$open_invoice->{agreement}." rules matches=".$open_invoice->{rule_matches}); - }; + $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 @@ -241,13 +217,23 @@ sub action_list { : 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 ($::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; + } + $::request->layout->add_javascripts("kivi.BankTransaction.js"); $self->render('bank_transactions/list', title => t8('Bank transactions MT940'), BANK_TRANSACTIONS => $bank_transactions, @@ -271,41 +257,45 @@ 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}); + $self->transaction(SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id})); - my $use_vendor_filter = $self->{transaction}->{remote_account_number} && $vendor_of_transaction; + # This was dead code: We compared vendor.account_name with bank_transaction.iban. + # This did never match (Kontonummer != IBAN). It's kivis 09/02 (2013) day + # If refactored/improved, also consider that vendor.iban should be normalized + # user may like to input strings like: 'AT 3333 3333 2222 1111' -> can be checked strictly + # at Vendor code because we need the correct data for all sepa exports. - my $drafts = SL::DB::Manager::Draft->get_all(where => [ module => 'ap'] , with_objects => 'employee'); + 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 @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; - } + 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 $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; - my $all_vendors = SL::DB::Manager::Vendor->get_all(); - my $callback = $self->url_for(action => 'list', - 'filter.bank_account' => $::form->{filter}->{bank_account}, - 'filter.todate' => $::form->{filter}->{todate}, - 'filter.fromdate' => $::form->{filter}->{fromdate}); + $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'), - DRAFTS => \@filtered_drafts, - vendor_id => $use_vendor_filter ? $vendor_of_transaction->id : undef, - vendor_name => $use_vendor_filter ? $vendor_of_transaction->name : undef, - ALL_VENDORS => $all_vendors, - callback => $callback, + 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, ); } @@ -324,57 +314,58 @@ sub action_ajax_payment_suggestion { 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(t8('Invno.') . ': ' . $invoice->invnumber . ' '); - $html .= SL::Presenter->escape(t8('Open amount') . ': ' . $::form->format_amount(\%::myconfig, $invoice->open_amount, 2) . ' '); - $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); - next unless $draft_as_object->{vendor_id}; # we cannot filter for vendor name, if this is a gl draft - - 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 (@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', + 'bank_transactions/_template_list', { output => 0 }, - DRAFTS => \@filtered_drafts, + TEMPLATES_AP => $templates_ap, + TEMPLATES_GL => $templates_gl, ); - my %result = ( count => 0, html => $output ); - - $self->render(\to_json(\%result), { type => 'json', process => 0 }); + $self->render(\to_json({ html => $output }), { type => 'json', process => 0 }); } sub action_ajax_add_list { @@ -498,6 +489,8 @@ sub save_invoices { 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} ); } @@ -506,24 +499,35 @@ sub save_invoices { 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} ); } } - 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(); } sub action_save_proposals { my ($self) = @_; + if ( $::form->{proposal_ids} ) { my $propcount = scalar(@{ $::form->{proposal_ids} }); if ( $propcount > 0 ) { @@ -536,11 +540,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) = @_; @@ -568,6 +567,7 @@ sub save_single_bank_transaction { 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) { @@ -577,7 +577,6 @@ sub save_single_bank_transaction { message => $::locale->text("The ID #1 is not a valid database ID.", $invoice_id), }; } - push @{ $data{invoices} }, $invoice; } @@ -594,7 +593,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, @@ -607,6 +606,8 @@ sub save_single_bank_transaction { my $n_invoices = 0; foreach my $invoice (@{ $data{invoices} }) { + my $source = ($data{sources} // [])->[$n_invoices]; + my $memo = ($data{memos} // [])->[$n_invoices]; $n_invoices++ ; @@ -635,6 +636,7 @@ 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); @@ -651,13 +653,34 @@ sub save_single_bank_transaction { trans_id => $invoice->id, amount => $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 + } else { + # use the whole amount of the bank transaction for the invoice, overpay the invoice if necessary + + # this catches credit_notes and negative sales invoices + if ( $invoice->is_sales && $invoice->amount < 0 ) { + # $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 + $amount_of_transaction *= -1; + + } elsif (!$invoice->is_sales && $invoice->invoice_type =~ m/ap_transaction|purchase_invoice/) { + # $invoice->open_amount may be negative for ap_transaction but may be positiv for negativ 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->open_amount == - $amount_of_transaction; + } + 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; @@ -712,7 +735,8 @@ sub save_single_bank_transaction { }; }; - die if $error; + # Rollback Fehler nicht weiterreichen + # die if $error; }); return grep { $_ } ($error, @warnings); @@ -852,6 +876,64 @@ 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, + ); +} + +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__