BankTransaction: "Kontoauszug verbuchen" überarbeitet für ap_transaction und credit_note

[mfinanz.git] / SL / Controller / BankTransaction.pm

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index dbb278632e1ea0573f2ff7dd9eaf174f773e4b50..f93bfd79e3500ed42e0ee2172304a68211877547 100644 (file)
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -189,6 +189,8 @@ sub action_list {
     foreach ( @{$all_open_sepa_export_items}) {
       last if scalar (@all_sepa_invoices) == 0;
       foreach my $open_invoice (@all_sepa_invoices){
     foreach ( @{$all_open_sepa_export_items}) {
       last if scalar (@all_sepa_invoices) == 0;
       foreach my $open_invoice (@all_sepa_invoices){

+        $open_invoice->{agreement}    = 0;
+        $open_invoice->{rule_matches} ='';

         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);
         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);


@@ -664,25 +666,23 @@ sub save_single_bank_transaction {
                               source       => $source,
                               memo         => $memo,
                               transdate    => $bank_transaction->transdate->to_kivitendo);
                               source       => $source,
                               memo         => $memo,
                               transdate    => $bank_transaction->transdate->to_kivitendo);

-      } elsif (( $invoice->is_sales && $invoice->invoice_type eq 'credit_note' ) ||
-               (!$invoice->is_sales && $invoice->invoice_type eq 'ap_transaction' )) {
-        # no check for overpayment/multiple payments
-
-        # 1. $invoice->open_amount is arap.amount - ararp.paid (always positive!)
-        # 2. $bank_transaction->amount is negative for outgoing transactions and positive for
-        #    incoming transactions.
-        # 1. and 2. => we have to turn the sign for invoice_amount in bank_transactions
-        # for verifying expected data, check t/bank/bank_transactions.t
-        $bank_transaction->invoice_amount($invoice->open_amount * -1);
+      } else {
+        # use the whole amount of the bank transaction for the invoice, overpay the invoice if necessary
+
+        if ( $invoice->is_sales && $invoice->invoice_type eq 'credit_note' ) {
+          # $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;
+        }

 
 

-        $invoice->pay_invoice(chart_id     => $bank_transaction->local_bank_account->chart_id,
-                              trans_id     => $invoice->id,
-                              amount       => $invoice->open_amount,
-                              payment_type => $payment_type,
-                              source       => $source,
-                              memo         => $memo,
-                              transdate    => $bank_transaction->transdate->to_kivitendo);
-      } else { # use the whole amount of the bank transaction for the invoice, overpay the invoice if necessary

         my $overpaid_amount = $amount_of_transaction - $invoice->open_amount;
         $invoice->pay_invoice(chart_id     => $bank_transaction->local_bank_account->chart_id,
                               trans_id     => $invoice->id,
         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,