]> wagnertech.de Git - mfinanz.git/blobdiff - SL/Controller/BankTransaction.pm
projects / mfinanz.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
DATEV-Export nach Erfassungsdatum filtern
[mfinanz.git] / SL / Controller / BankTransaction.pm
diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index 9f08263f8892c4f8644651d98c06602981de992e..e47c1cd64d7e0f1ec81f29ae9e2b70e606d47f5b 100644 (file)
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -21,8 +21,9 @@ use SL::JSON;
 use SL::DB::Chart;
 use SL::DB::AccTransaction;
 use SL::DB::Tax;
 use SL::DB::Chart;
 use SL::DB::AccTransaction;
 use SL::DB::Tax;
-use SL::DB::Draft;
 use SL::DB::BankAccount;
 use SL::DB::BankAccount;
+use SL::DB::RecordTemplate;
+use SL::DB::SepaExportItem;
 use SL::DBUtils qw(like);
 use SL::Presenter;
 
 use SL::DBUtils qw(like);
 use SL::Presenter;
 
@@ -31,6 +32,7 @@ use List::Util qw(max);
 
 use Rose::Object::MakeMethods::Generic
 (
 
 use Rose::Object::MakeMethods::Generic
 (
+  scalar                  => [ qw(callback transaction) ],
   'scalar --get_set_init' => [ qw(models problems) ],
 );
 
   'scalar --get_set_init' => [ qw(models problems) ],
 );
 
@@ -46,6 +48,7 @@ sub action_search {
 
   my $bank_accounts = SL::DB::Manager::BankAccount->get_all_sorted( query => [ obsolete => 0 ] );
 
 
   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);
 }
   $self->render('bank_transactions/search',
                  BANK_ACCOUNTS => $bank_accounts);
 }
@@ -56,6 +59,7 @@ sub action_list_all {
   $self->make_filter_summary;
   $self->prepare_report;
 
   $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);
 }
 
   $self->report_generator_list_objects(report => $self->{report}, objects => $self->models->get);
 }
 
@@ -98,22 +102,75 @@ sub action_list {
     ],
   );
 
     ],
   );
 
-  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');
+  # credit notes have a negative amount, treat differently
+  my $all_open_ar_invoices = SL::DB::Manager::Invoice        ->get_all(where => [ or => [ amount => { gt => \'paid' },
+                                                                                          and => [ type    => 'credit_note',
+                                                                                                   amount  => { lt => \'paid' }
+                                                                                                 ],
+                                                                                        ],
+                                                                                ],
+                                                                       with_objects => ['customer','payment_terms']);
+
+  my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => [amount => { ne => \'paid' }], with_objects => ['vendor'  ,'payment_terms']);
+  my $all_open_sepa_export_items = SL::DB::Manager::SepaExportItem->get_all(where => [chart_id => $bank_account->chart_id ,
+                                                                             'sepa_export.executed' => 0, 'sepa_export.closed' => 0 ], with_objects => ['sepa_export']);
 
   my @all_open_invoices;
   # filter out invoices with less than 1 cent outstanding
 
   my @all_open_invoices;
   # filter out invoices with less than 1 cent outstanding
-  push @all_open_invoices, grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ar_invoices };
-  push @all_open_invoices, grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ap_invoices };
+  push @all_open_invoices, map { $_->{is_ar}=1 ; $_ } grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ar_invoices };
+  push @all_open_invoices, map { $_->{is_ar}=0 ; $_ } grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ap_invoices };
+
+  my %sepa_exports;
+  # first collect sepa export items to open invoices
+  foreach my $open_invoice (@all_open_invoices){
+    $open_invoice->{realamount}  = $::form->format_amount(\%::myconfig,$open_invoice->amount,2);
+    $open_invoice->{skonto_type} = 'without_skonto';
+    foreach ( @{$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(),"sepa_exitem=".$_->id." for invoice ".$open_invoice->id." factor=".$factor);
+        $open_invoice->{realamount}  = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);
+        push @{$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;
+      }
+    }
+  }
 
   # try to match each bank_transaction with each of the possible open invoices
   # by awarding points
 
   # try to match each bank_transaction with each of the possible open invoices
   # by awarding points
+  my @proposals;
 
   foreach my $bt (@{ $bank_transactions }) {
 
   foreach my $bt (@{ $bank_transactions }) {
-    next unless $bt->{remote_name};  # bank has no name, usually fees, use create invoice to assign
+    ## 5 Stellen hinter dem Komma auf 2 Stellen reduzieren
+    $bt->amount($bt->amount*1);
+    $bt->invoice_amount($bt->invoice_amount*1);
+
+    $bt->{proposals}    = [];
+    $bt->{rule_matches} = [];
 
     $bt->{remote_name} .= $bt->{remote_name_1} if $bt->{remote_name_1};
 
 
     $bt->{remote_name} .= $bt->{remote_name_1} if $bt->{remote_name_1};
 
+    if ( $bt->is_collective_transaction ) {
+      foreach ( keys  %sepa_exports) {
+        if ( abs(($sepa_exports{$_}->{amount} * 1) - ($bt->amount * 1)) < 0.01 ) {
+          ## jupp
+          @{$bt->{proposals}} = @{$sepa_exports{$_}->{invoices}};
+          $bt->{sepa_export_ok} = 1;
+          $sepa_exports{$_}->{proposed}=1;
+          push(@proposals, $bt);
+          next;
+        }
+      }
+      # colletive transaction has no remotename !!
+    } else {
+      next unless $bt->{remote_name};  # bank has no name, usually fees, use create invoice to assign
+    }
+
     # try to match the current $bt to each of the open_invoices, saving the
     # results of get_agreement_with_invoice in $open_invoice->{agreement} and
     # $open_invoice->{rule_matches}.
     # 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}.
@@ -123,11 +180,11 @@ sub action_list {
     # the arrays $bt->{proposals} and $bt->{rule_matches}, and the agreement
     # score is stored in $bt->{agreement}
 
     # 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_open_invoices) {
       ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
       ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
-    };
-
-    $bt->{proposals} = [];
+      $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
 
     my $agreement = 15;
     my $min_agreement = 3; # suggestions must have at least this score
@@ -153,23 +210,32 @@ 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;
   # * 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 };
 
        ($_->{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;
 
   # 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;
 
+  # 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,
                 PROPOSALS         => \@proposals,
   $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 {
 }
 
 sub action_assign_invoice {
@@ -186,42 +252,33 @@ sub action_create_invoice {
   my ($self) = @_;
   my %myconfig = %main::myconfig;
 
   my ($self) = @_;
   my %myconfig = %main::myconfig;
 
-  $self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
-  my $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(account_number => $self->{transaction}->{remote_account_number});
-
-  my $use_vendor_filter = $self->{transaction}->{remote_account_number} && $vendor_of_transaction;
+  $self->transaction(SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id}));
 
 
-  my $drafts = SL::DB::Manager::Draft->get_all(where => [ module => 'ap'] , with_objects => 'employee');
+  my $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(account_number => $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             = SL::DB::Manager::RecordTemplate->get_all(
+    where        => [ template_type => 'ap_transaction' ],
+    with_objects => [ qw(employee vendor) ],
+  );
 
 
-  #Filter drafts
-  @filtered_drafts = grep { $_->{vendor_id} == $vendor_of_transaction->id } @filtered_drafts if $use_vendor_filter;
+  #Filter templates
+  $templates = [ grep { $_->vendor_id == $vendor_of_transaction->id } @{ $templates } ] 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'),
 
   $self->render(
     'bank_transactions/create_invoice',
     { layout => 0 },
     title       => t8('Create invoice'),
-    DRAFTS      => \@filtered_drafts,
+    TEMPLATES   => $templates,
     vendor_id   => $use_vendor_filter ? $vendor_of_transaction->id   : undef,
     vendor_name => $use_vendor_filter ? $vendor_of_transaction->name : undef,
     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,
   );
 }
 
   );
 }
 
@@ -240,57 +297,48 @@ sub action_ajax_payment_suggestion {
   my @select_options = $invoice->get_payment_select_options_for_bank_transaction($::form->{bt_id});
 
   my $html;
   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 .= '<a href=# onclick="delete_invoice(' . $::form->{bt_id} . ',' . $::form->{prop_id} . ');">x</a>';
-  $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 ($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 @filter;
+  push @filter, ('vendor.id'   => $::form->{vendor_id})                       if $::form->{vendor_id};
+  push @filter, ('vendor.name' => { ilike => '%' . $::form->{vendor} . '%' }) if $::form->{vendor};
 
 
-  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 $templates = SL::DB::Manager::RecordTemplate->get_all(
+    where        => [ template_type => 'ap_transaction', (or => \@filter) x !!@filter ],
+    with_objects => [ qw(employee vendor) ],
+  );
 
 
-  my $vendor_name = $::form->{vendor};
-  my $vendor_id   = $::form->{vendor_id};
+  $::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(
 
   my $output  = $self->render(
-    'bank_transactions/filter_drafts',
+    'bank_transactions/_template_list',
     { output => 0 },
     { output => 0 },
-    DRAFTS => \@filtered_drafts,
+    TEMPLATES => $templates,
   );
 
   );
 
-  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 {
 }
 
 sub action_ajax_add_list {
@@ -373,10 +421,12 @@ sub action_ajax_accept_invoices {
   );
 }
 
   );
 }
 
-sub action_save_invoices {
+sub save_invoices {
   my ($self) = @_;
 
   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 = {
 
   # e.g. three partial payments with bt_ids 54, 55 and 56 for invoice with id 74:
   # $invoice_hash = {
@@ -403,14 +453,59 @@ sub action_save_invoices {
 
   $self->problems([]);
 
 
   $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,
+        sources             => ($::form->{sources} // {})->{$_},
+        memos               => ($::form->{memos}   // {})->{$_},
+      );
+      $count += scalar( @{$invoice_ids} );
+    }
+  } else {
+    while ( my ($bank_transaction_id, $invoice_ids) = each(%invoice_hash) ) {
+      push @{ $self->problems }, $self->save_single_bank_transaction(
+        bank_transaction_id => $bank_transaction_id,
+        invoice_ids         => $invoice_ids,
+        sources             => [  map { $::form->{"sources_${bank_transaction_id}_${_}"} } @{ $invoice_ids } ],
+        memos               => [  map { $::form->{"memos_${bank_transaction_id}_${_}"}   } @{ $invoice_ids } ],
+      );
+      $count += scalar( @{$invoice_ids} );
+    }
   }
   }
+  foreach (@{ $self->problems }) {
+    $count-- if $_->{result} eq 'error';
+  }
+  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();
   $self->action_list();
+
 }
 
 sub save_single_bank_transaction {
 }
 
 sub save_single_bank_transaction {
@@ -440,6 +535,7 @@ sub save_single_bank_transaction {
     my $payment_received      = $bank_transaction->amount > 0;
     my $payment_sent          = $bank_transaction->amount < 0;
 
     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) {
     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) {
@@ -449,7 +545,6 @@ sub save_single_bank_transaction {
           message => $::locale->text("The ID #1 is not a valid database ID.", $invoice_id),
         };
       }
           message => $::locale->text("The ID #1 is not a valid database ID.", $invoice_id),
         };
       }
-
       push @{ $data{invoices} }, $invoice;
     }
 
       push @{ $data{invoices} }, $invoice;
     }
 
@@ -466,7 +561,7 @@ sub save_single_bank_transaction {
 
     if (   $payment_sent
         && any {    ( $_->is_sales && ($_->amount > 0))
 
     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,
                } @{ $data{invoices} }) {
       return {
         %data,
@@ -479,6 +574,8 @@ sub save_single_bank_transaction {
     my $n_invoices   = 0;
 
     foreach my $invoice (@{ $data{invoices} }) {
     my $n_invoices   = 0;
 
     foreach my $invoice (@{ $data{invoices} }) {
+      my $source = ($data{sources} // [])->[$n_invoices];
+      my $memo   = ($data{memos}   // [])->[$n_invoices];
 
       $n_invoices++ ;
 
 
       $n_invoices++ ;
 
@@ -507,32 +604,63 @@ sub save_single_bank_transaction {
         $payment_type = 'without_skonto';
       };
 
         $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) {
       # 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) {
         # 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 {
         } 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,
         }
         # ... and then pay the invoice
         $invoice->pay_invoice(chart_id     => $bank_transaction->local_bank_account->chart_id,
                               trans_id     => $invoice->id,
-                              amount       => $invoice->open_amount,
+                              amount       => $open_amount,
                               payment_type => $payment_type,
                               payment_type => $payment_type,
+                              source       => $source,
+                              memo         => $memo,
                               transdate    => $bank_transaction->transdate->to_kivitendo);
                               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 eq 'ap_transaction' ) {
+          # $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,
         $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;
                               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',
       # Record a record link from the bank transaction to the invoice
       my @props = (
         from_table => 'bank_transactions',
@@ -575,64 +703,13 @@ sub save_single_bank_transaction {
       };
     };
 
       };
     };
 
-    die if $error;
+    # Rollback Fehler nicht weiterreichen
+    # die if $error;
   });
 
   return grep { $_ } ($error, @warnings);
 }
 
   });
 
   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
 #
 #
 # filters
 #
@@ -767,6 +844,51 @@ 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 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__
 
 1;
 __END__
 
Unnamed repository; edit this file 'description' to name the repository.