X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDB%2FBankTransaction.pm;h=e4cf67cd37cb6ce6fab1e64690757aa8b8748550;hb=98056ff901abcbbbcf3f0499c3149056628631e8;hp=1d8705e9a3341125db3b330a83d0703cb0a4ad74;hpb=17f43ff5eed41ff4fe630fd874905cacf4f763d8;p=kivitendo-erp.git

diff --git a/SL/DB/BankTransaction.pm b/SL/DB/BankTransaction.pm
index 1d8705e9a..e4cf67cd3 100644
--- a/SL/DB/BankTransaction.pm
+++ b/SL/DB/BankTransaction.pm
@@ -48,7 +48,7 @@ sub linked_invoices {
 }
 
 sub is_batch_transaction {
-  $_[0]->transaction_code eq "191";
+  ($_[0]->transaction_code // '') eq "191";
 }
 
 
@@ -99,11 +99,11 @@ sub get_agreement_with_invoice {
   if ( $bank_code eq $self->remote_bank_code && $account_number eq $self->remote_account_number ) {
     $agreement += $points{remote_account_number};
     $rule_matches .= 'remote_account_number(' . $points{'remote_account_number'} . ') ';
-  };
+  }
   if ( $iban eq $self->remote_account_number ) {
     $agreement += $points{remote_account_number};
     $rule_matches .= 'remote_account_number(' . $points{'remote_account_number'} . ') ';
-  };
+  }
 
   my $datediff = $self->transdate->{utc_rd_days} - $invoice->transdate->{utc_rd_days};
   $invoice->{datediff} = $datediff;
@@ -112,19 +112,19 @@ sub get_agreement_with_invoice {
   if (abs(abs($invoice->amount) - abs($self->amount)) < 0.01) {
     $agreement += $points{exact_amount};
     $rule_matches .= 'exact_amount(' . $points{'exact_amount'} . ') ';
-  };
+  }
 
   # compare open amount, preventing double points when open amount = invoice amount
   if ( $invoice->amount != $invoice->open_amount && abs(abs($invoice->open_amount) - abs($self->amount)) < 0.01) {
     $agreement += $points{exact_open_amount};
     $rule_matches .= 'exact_open_amount(' . $points{'exact_open_amount'} . ') ';
-  };
+  }
 
   if ( $invoice->skonto_date && abs(abs($invoice->amount_less_skonto) - abs($self->amount)) < 0.01) {
     $agreement += $points{skonto_exact_amount};
     $rule_matches .= 'skonto_exact_amount(' . $points{'skonto_exact_amount'} . ') ';
     $invoice->{skonto_type} = 'with_skonto_pt';
-  };
+  }
 
   #search invoice number in purpose
   my $invnumber = $invoice->invnumber;
@@ -143,11 +143,11 @@ sub get_agreement_with_invoice {
   if ( $invoice->is_sales && $self->amount < 0 ) {
     $agreement += $points{wrong_sign};
     $rule_matches .= 'wrong_sign(' . $points{'wrong_sign'} . ') ';
-  };
+  }
   if ( ! $invoice->is_sales && $self->amount > 0 ) {
     $agreement += $points{wrong_sign};
     $rule_matches .= 'wrong_sign(' . $points{'wrong_sign'} . ') ';
-  };
+  }
 
   # search customer/vendor number in purpose
   my $cvnumber;
@@ -165,7 +165,7 @@ sub get_agreement_with_invoice {
   if ( $cvname && $self->purpose =~ /\b\Q$cvname\E\b/i ) {
     $agreement += $points{cust_vend_name_in_purpose};
     $rule_matches .= 'cust_vend_name_in_purpose(' . $points{'cust_vend_name_in_purpose'} . ') ';
-  };
+  }
 
   # compare depositorname, don't try to match empty depositors
   my $depositorname;
@@ -174,24 +174,24 @@ sub get_agreement_with_invoice {
   if ( $depositorname && $self->remote_name =~ /$depositorname/ ) {
     $agreement += $points{depositor_matches};
     $rule_matches .= 'depositor_matches(' . $points{'depositor_matches'} . ') ';
-  };
+  }
 
   #Check if words in remote_name appear in cvname
   my $check_string_points = _check_string($self->remote_name,$cvname);
   if ( $check_string_points ) {
     $agreement += $check_string_points;
     $rule_matches .= 'remote_name(' . $check_string_points . ') ';
-  };
+  }
 
   # transdate prefilter: compare transdate of bank_transaction with transdate of invoice
   if ( $datediff < -5 ) { # this might conflict with advance payments
     $agreement += $points{payment_before_invoice};
     $rule_matches .= 'payment_before_invoice(' . $points{'payment_before_invoice'} . ') ';
-  };
+  }
   if ( $datediff < 30 ) {
     $agreement += $points{payment_within_30_days};
     $rule_matches .= 'payment_within_30_days(' . $points{'payment_within_30_days'} . ') ';
-  };
+  }
 
   # only if we already have a good agreement, let date further change value of agreement.
   # this is so that if there are several plausible open invoices which are all equal
@@ -216,16 +216,18 @@ sub get_agreement_with_invoice {
       $agreement += $points{datebonus_negative};
       $rule_matches .= 'datebonus_negative(' . $points{'datebonus_negative'} . ') ';
     } else {
-  # e.g. datediff > 120
-    };
-  };
+      # e.g. datediff > 120
+    }
+  }
 
   # if there is exactly one non-executed sepa_export_item for the invoice
-  if ( my $seis = $invoice->{sepa_export_item} ) {
-      if (scalar @$seis == 1) {
+  if ( my $seis = $invoice->find_sepa_export_items({ executed => 0 }) ) {
+    if (scalar @$seis == 1) {
       my $sei = $seis->[0];
 
-      if ( abs(abs($self->amount) - abs($sei->amount)) < 0.01 ) {
+      # test for amount and id matching only, sepa transfer date and bank
+      # transaction date needn't match
+      if (abs($self->amount) == ($sei->amount) && $invoice->id == $sei->arap_id) {
         $agreement    += $points{sepa_export_item};
         $rule_matches .= 'sepa_export_item(' . $points{'sepa_export_item'} . ') ';
       }