Refactoring: BankTransaction

minimalen aufgeräumt. Alte Copy&Paste doppelte Checks
an der Stelle entfernt, die ich gelesen und verstanden habe.

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index 0d609959d51443aa421321d37ed086cddfe0db9e..d83039f39da3acba2efff69237f958e31c4ad4b0 100644 (file)
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -405,7 +405,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 +420,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;
       }