X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBankTransaction.pm;h=ac9c3b123cea22bf86f40a35bae906118b7dd6f5;hb=6b92d724ba32af43410d9563e77de6bb1013a5f1;hp=350ce610fe63a1d4b524c576818c166879d91509;hpb=88d162cc5e8e8d3810059d918a1eef6a2b205984;p=kivitendo-erp.git

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index 350ce610f..ac9c3b123 100644
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -108,8 +108,8 @@ sub action_list {
 
   my @all_open_invoices;
   # filter out invoices with less than 1 cent outstanding
-  push @all_open_invoices, grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ar_invoices };
-  push @all_open_invoices, grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ap_invoices };
+  push @all_open_invoices, map { $_->{is_ar}=1 ; $_ } grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ar_invoices };
+  push @all_open_invoices, map { $_->{is_ar}=0 ; $_ } grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ap_invoices };
   $main::lxdebug->message(LXDebug->DEBUG2(),"bank_account=".$::form->{filter}{bank_account}." invoices: ".scalar(@{ $all_open_ar_invoices }).
                               " + ".scalar(@{ $all_open_ap_invoices })." transactions=".scalar(@{ $bank_transactions }));
 
@@ -123,14 +123,15 @@ sub action_list {
     $open_invoice->{skonto_type} = 'without_skonto';
     foreach ( @{$all_open_sepa_export_items}) {
       if ( $_->ap_id == $open_invoice->id ||  $_->ar_id == $open_invoice->id ) {
-        #$main::lxdebug->message(LXDebug->DEBUG2(),"exitem=".$_->id." for invoice ".$open_invoice->id);
+        my $factor = ( $_->ar_id == $open_invoice->id>0?1:-1);
+        #$main::lxdebug->message(LXDebug->DEBUG2(),"exitem=".$_->id." for invoice ".$open_invoice->id." factor=".$factor);
         $open_invoice->{sepa_export_item} = $_ ;
         $open_invoice->{skonto_type} = $_->payment_type;
         $sepa_exports{$_->sepa_export_id} ||= { count => 0, is_ar => 0, amount => 0, proposed => 0, invoices => [], item => $_ };
         $sepa_exports{$_->sepa_export_id}->{count}++ ;
         $sepa_exports{$_->sepa_export_id}->{is_ar}++ if  $_->ar_id == $open_invoice->id;
-        $sepa_exports{$_->sepa_export_id}->{amount} += $_->amount;
-        push ( @{ $sepa_exports{$_->sepa_export_id}->{invoices}} , $open_invoice );
+        $sepa_exports{$_->sepa_export_id}->{amount} += $_->amount * $factor;
+        push @{ $sepa_exports{$_->sepa_export_id}->{invoices} }, $open_invoice;
         #$main::lxdebug->message(LXDebug->DEBUG2(),"amount for export id ".$_->sepa_export_id." = ".
         #                          $sepa_exports{$_->sepa_export_id}->{amount}." count = ".
         #                          $sepa_exports{$_->sepa_export_id}->{count}." is_ar = ".
@@ -158,11 +159,12 @@ sub action_list {
 
     if ( $self->is_collective_transaction($bt) ) {
       foreach ( keys  %sepa_exports) {
-        my $factor = ($sepa_exports{$_}->{is_ar}>0?1:-1);
-        #$main::lxdebug->message(LXDebug->DEBUG2(),"Exp ID=".$_." factor=".$factor." compare sum amount ".($sepa_exports{$_}->{amount} *1) ." == ".($bt->amount * $factor));
-        if ( $bt->transactioncode eq '191' && ($sepa_exports{$_}->{amount} * 1) eq ($bt->amount * $factor) ) {
+        #$main::lxdebug->message(LXDebug->DEBUG2(),"Exp ID=".$_." compare sum amount ".($sepa_exports{$_}->{amount} *1) ." == ".($bt->amount * 1));
+        if ( $bt->transaction_code eq '191' && abs(($sepa_exports{$_}->{amount} * 1) - ($bt->amount * 1)) < 0.01 ) {
           ## jupp
           $bt->{proposals} = $sepa_exports{$_}->{invoices} ;
+          $bt->{agreement}    = 20;
+          $bt->{rule_matches} = 'sepa_export_item(20)';
           $sepa_exports{$_}->{proposed}=1;
           #$main::lxdebug->message(LXDebug->DEBUG2(),"has ".scalar($bt->{proposals})." invoices");
           push(@proposals, $bt);
@@ -172,24 +174,26 @@ sub action_list {
     }
     next unless $bt->{remote_name};  # bank has no name, usually fees, use create invoice to assign
 
-    foreach ( keys %sepa_exports) {
-      my $factor = ($sepa_exports{$_}->{is_ar}>0?1:-1);
-      #$main::lxdebug->message(LXDebug->DEBUG2(),"exp count=".$sepa_exports{$_}->{count}." factor=".$factor." proposed=".$sepa_exports{$_}->{proposed});
-      if ( $sepa_exports{$_}->{count} == 1 ) {
-        my $oinvoice = @{ $sepa_exports{$_}->{invoices}}[0];
-        my $eitem = $sepa_exports{$_}->{item};
-        $eitem->amount($eitem->amount*1);
-        #$main::lxdebug->message(LXDebug->DEBUG2(),"remote account '".$bt->{remote_account_number}."' bt_amount=". ($bt->amount * $factor));
-        #$main::lxdebug->message(LXDebug->DEBUG2(),"compare with   '".$eitem->vc_iban."' amount=".$eitem->amount);
-        if ( $bt->{remote_account_number} eq $eitem->vc_iban && $eitem->amount eq ($bt->amount * $factor)) {
-          ## jupp
-          $bt->{proposals} = $sepa_exports{$_}->{invoices} ;
-          #$main::lxdebug->message(LXDebug->DEBUG2(),"found invoice");
-          $sepa_exports{$_}->{proposed}=1;
-          push(@proposals, $bt);
-          next;
+    foreach ( @{$all_open_sepa_export_items}) {
+      last if scalar (@all_sepa_invoices) == 0;
+      foreach my $open_invoice (@all_sepa_invoices){
+        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);
+          $_->amount($_->amount*1);
+          #$main::lxdebug->message(LXDebug->DEBUG2(),"remote account '".$bt->{remote_account_number}."' bt_amount=". ($bt->amount * $factor));
+          #$main::lxdebug->message(LXDebug->DEBUG2(),"compare with   '".$_->vc_iban."'    amount=".$_->amount);
+          if ( $bt->{remote_account_number} eq $_->vc_iban && abs(( $_->amount *1 ) - ($bt->amount * $factor)) < 0.01 ) {
+            push @{ $bt->{proposals} }, $open_invoice;
+            $bt->{agreement}    = 20;
+            $bt->{rule_matches} = 'sepa_export_item(20)';
+            #$main::lxdebug->message(LXDebug->DEBUG2(),"found invoice");
+            push(@proposals, $bt);
+            @all_sepa_invoices = grep { $_ != $open_invoice } @all_sepa_invoices;
+            last;
+          }
         }
-     }
+      }
     }
 
     # try to match the current $bt to each of the open_invoices, saving the
@@ -203,7 +207,8 @@ sub action_list {
 
     foreach my $open_invoice (@all_open_invoices){
       ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
-      #  $main::lxdebug->message(LXDebug->DEBUG2(),"agreement=".$open_invoice->{agreement}." rules matches=".$open_invoice->{rule_matches});
+      $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*($open_invoice->{is_ar}?1:-1),2);
+       # $main::lxdebug->message(LXDebug->DEBUG2(),"agreement=".$open_invoice->{agreement}." rules matches=".$open_invoice->{rule_matches});
     };
 
     my $agreement = 15;
@@ -535,7 +540,7 @@ sub action_save_proposals {
 
 sub is_collective_transaction {
   my ($self, $bt) = @_;
-  return $bt->transactioncode eq "191";
+  return $bt->transaction_code eq "191";
 }
 
 sub save_single_bank_transaction {
@@ -667,7 +672,6 @@ sub save_single_bank_transaction {
           };
         }
       }
-
       # Record a record link from the bank transaction to the invoice
       my @props = (
         from_table => 'bank_transactions',