SEPA: collective_transaction nach batch_transaction umbenannt

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index e47c1cd..c36d930 100644 (file)
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -155,7 +155,7 @@ sub action_list {
 
     $bt->{remote_name} .= $bt->{remote_name_1} if $bt->{remote_name_1};
 
-    if ( $bt->is_collective_transaction ) {
+    if ( $bt->is_batch_transaction ) {
       foreach ( keys  %sepa_exports) {
         if ( abs(($sepa_exports{$_}->{amount} * 1) - ($bt->amount * 1)) < 0.01 ) {
           ## jupp
@@ -166,7 +166,7 @@ sub action_list {
           next;
         }
       }
-      # colletive transaction has no remotename !!
+      # batch transaction has no remotename !!
     } else {
       next unless $bt->{remote_name};  # bank has no name, usually fees, use create invoice to assign
     }

diff --git a/SL/DB/BankTransaction.pm b/SL/DB/BankTransaction.pm
index 8c26cd4..1d8705e 100644 (file)
--- a/SL/DB/BankTransaction.pm
+++ b/SL/DB/BankTransaction.pm
@@ -47,7 +47,7 @@ sub linked_invoices {
   return [ @linked_invoices ];
 }
 
-sub is_collective_transaction {
+sub is_batch_transaction {
   $_[0]->transaction_code eq "191";
 }
 
@@ -78,14 +78,14 @@ sub get_agreement_with_invoice {
     skonto_exact_amount         => 5,
     wrong_sign                  => -1,
     sepa_export_item            => 5,
-    collective_sepa_transaction => 20,
+    batch_sepa_transaction      => 20,
   );
 
   my ($agreement,$rule_matches);
 
-  if ( $self->is_collective_transaction && $self->{sepa_export_ok}) {
-    $agreement += $points{collective_sepa_transaction};
-    $rule_matches .= 'collective_sepa_transaction(' . $points{'collective_sepa_transaction'} . ') ';
+  if ( $self->is_batch_transaction && $self->{sepa_export_ok}) {
+    $agreement += $points{batch_sepa_transaction};
+    $rule_matches .= 'batch_sepa_transaction(' . $points{'batch_sepa_transaction'} . ') ';
   }
 
   # compare banking arrangements