X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBankTransaction.pm;h=e38f8a9972d1787bed42db8cb08793401ce8d0de;hb=23d55c8535d9eecc415791d42ec05a7d9cb5c8e0;hp=2ec9563c228ba1d932a3bd6cc931a8d0703197d0;hpb=665741c4bc6d05d6092a76383c1a444a3507921e;p=kivitendo-erp.git diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm index 2ec9563c2..e38f8a997 100644 --- a/SL/Controller/BankTransaction.pm +++ b/SL/Controller/BankTransaction.pm @@ -17,16 +17,20 @@ 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::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); @@ -64,32 +68,21 @@ sub action_list_all { $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( @@ -97,24 +90,28 @@ 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 ], ); # 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_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 @@ -170,8 +167,6 @@ sub action_list { } 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 @@ -213,38 +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; # sort bank transaction proposals by quality (score) of proposal - 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 } ]; - } + 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 } ]; } - # for testing with t/bank/banktransaction.t : - if ( $::form->{dont_render_for_test} ) { - return ( $bank_transactions , \@proposals ); + 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, ); } @@ -269,12 +278,14 @@ sub action_create_invoice { 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) ], ); @@ -288,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_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, - ); + # 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 { @@ -305,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 }); @@ -558,18 +572,21 @@ 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 $sign = $bank_transaction->amount < 0 ? -1 : 1; - my $amount_of_transaction = $sign * $bank_transaction->amount; - my $assigned_amount = $sign * $bank_transaction->invoice_amount; - my $not_assigned_amount = $amount_of_transaction - $assigned_amount; my $payment_received = $bank_transaction->amount > 0; my $payment_sent = $bank_transaction->amount < 0; - croak("No amount left to assign") if ($not_assigned_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); @@ -613,9 +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); - - 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', @@ -623,32 +642,59 @@ 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'; - }; + } + + 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 { + return { + %data, + 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 - - my $open_amount = ($payment_type eq 'with_skonto_pt' ? $invoice->amount_less_skonto : $invoice->open_amount); - my $amount_for_booking = abs(($open_amount < $not_assigned_amount) ? $open_amount : $not_assigned_amount); + # 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 => ($open_amount < $not_assigned_amount) ? $open_amount : $not_assigned_amount, - payment_type => $payment_type, - source => $source, - memo => $memo, - transdate => $bank_transaction->transdate->to_kivitendo); + 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) { + if (scalar(@acc_ids) < 2) { return { %data, result => 'error', @@ -714,7 +760,83 @@ sub save_single_bank_transaction { 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 # @@ -740,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) { @@ -757,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 => { }, @@ -818,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'), @@ -860,11 +993,12 @@ sub load_gl_record_template_url { controller => 'gl.pl', action => 'load_record_template', id => $template->id, - 'form_defaults.amount_1' => abs($self->transaction->amount), # always positive + '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, ); } @@ -887,9 +1021,18 @@ sub setup_list_all_action_bar { for my $bar ($::request->layout->get('actionbar')) { $bar->add( - action => [ - t8('Filter'), - submit => [ '#filter_form', { action => 'BankTransaction/list_all' } ], + 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', ], ); @@ -964,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