Debitoren- und Kreditorenbuchungen in Fremdwährung öffnen

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

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index 0d609959d51443aa421321d37ed086cddfe0db9e..77f5b963ec6187d4ed001b5339d9abf0cbb1f39d 100644 (file)
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -250,6 +250,7 @@ sub action_filter_drafts {
 
   foreach my $draft ( @{ $drafts } ) {
     my $draft_as_object = YAML::Load($draft->form);
 
   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;
     my $vendor = SL::DB::Manager::Vendor->find_by(id => $draft_as_object->{vendor_id});
     $draft->{vendor} = $vendor->name;
     $draft->{vendor_id} = $vendor->id;


@@ -405,7 +406,7 @@ sub action_save_invoices {
           $amount_of_transaction -= $sign * $invoice->open_amount;
           $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $invoice->open_amount);
         } else {
           $amount_of_transaction -= $sign * $invoice->open_amount;
           $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $invoice->open_amount);
         } else {

-          $amount_of_transaction += $sign * $invoice->open_amount if (!$invoice->is_sales);
+          $amount_of_transaction += $sign * $invoice->open_amount;

           $bank_transaction->invoice_amount($bank_transaction->invoice_amount - $invoice->open_amount);
         }
         # ... and then pay the invoice
           $bank_transaction->invoice_amount($bank_transaction->invoice_amount - $invoice->open_amount);
         }
         # ... and then pay the invoice


@@ -420,8 +421,7 @@ sub action_save_invoices {
                               amount       => $amount_of_transaction,
                               payment_type => $payment_type,
                               transdate    => $bank_transaction->transdate->to_kivitendo);
                               amount       => $amount_of_transaction,
                               payment_type => $payment_type,
                               transdate    => $bank_transaction->transdate->to_kivitendo);

-        $bank_transaction->invoice_amount($bank_transaction->amount) if $invoice->is_sales;
-        $bank_transaction->invoice_amount($bank_transaction->amount) if !$invoice->is_sales;
+        $bank_transaction->invoice_amount($bank_transaction->amount);

         $amount_of_transaction = 0;
       }
 
         $amount_of_transaction = 0;
       }