Banktransaction: Kontoauszug verbuchen überarbeitet(3)

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

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index 143d9d99dc2e31ea4d246d6bab25465b4eccf2ef..7217e5fccbe18c58a826ef52ba4ecb5013405c06 100644 (file)
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -124,15 +124,15 @@ sub action_list {
     foreach ( @{$all_open_sepa_export_items}) {
       if ( $_->ap_id == $open_invoice->id ||  $_->ar_id == $open_invoice->id ) {
         my $factor = ( $_->ar_id == $open_invoice->id>0?1:-1);
     foreach ( @{$all_open_sepa_export_items}) {
       if ( $_->ap_id == $open_invoice->id ||  $_->ar_id == $open_invoice->id ) {
         my $factor = ( $_->ar_id == $open_invoice->id>0?1:-1);

-        $open_invoice->{realamount}  = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);

         $main::lxdebug->message(LXDebug->DEBUG2(),"exitem=".$_->id." for invoice ".$open_invoice->id." factor=".$factor);
         $main::lxdebug->message(LXDebug->DEBUG2(),"exitem=".$_->id." for invoice ".$open_invoice->id." factor=".$factor);

+        $open_invoice->{realamount}  = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);

         $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 * $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 * $factor;

-        push ( @{ $sepa_exports{$_->sepa_export_id}->{invoices}} , $open_invoice );
+        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 = ".
         #$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 = ".


@@ -145,7 +145,6 @@ sub action_list {
 
   # try to match each bank_transaction with each of the possible open invoices
   # by awarding points
 
   # try to match each bank_transaction with each of the possible open invoices
   # by awarding points

-  @all_open_invoices = @all_non_sepa_invoices;

   my @proposals;
 
   foreach my $bt (@{ $bank_transactions }) {
   my @proposals;
 
   foreach my $bt (@{ $bank_transactions }) {


@@ -154,18 +153,19 @@ sub action_list {
     $bt->invoice_amount($bt->invoice_amount*1);
     $main::lxdebug->message(LXDebug->DEBUG2(),"BT ".$bt->id." amount=".$bt->amount." invoice_amount=".$bt->invoice_amount." remote=". $bt->{remote_name});
 
     $bt->invoice_amount($bt->invoice_amount*1);
     $main::lxdebug->message(LXDebug->DEBUG2(),"BT ".$bt->id." amount=".$bt->amount." invoice_amount=".$bt->invoice_amount." remote=". $bt->{remote_name});
 

-    $bt->{proposals} = [];
+    $bt->{proposals}    = [];
+    $bt->{rule_matches} = [];

 
     $bt->{remote_name} .= $bt->{remote_name_1} if $bt->{remote_name_1};
 
     if ( $self->is_collective_transaction($bt) ) {
       foreach ( keys  %sepa_exports) {
         #$main::lxdebug->message(LXDebug->DEBUG2(),"Exp ID=".$_." compare sum amount ".($sepa_exports{$_}->{amount} *1) ." == ".($bt->amount * 1));
 
     $bt->{remote_name} .= $bt->{remote_name_1} if $bt->{remote_name_1};
 
     if ( $self->is_collective_transaction($bt) ) {
       foreach ( keys  %sepa_exports) {
         #$main::lxdebug->message(LXDebug->DEBUG2(),"Exp ID=".$_." compare sum amount ".($sepa_exports{$_}->{amount} *1) ." == ".($bt->amount * 1));

-        if ( $bt->transactioncode eq '191' && ($sepa_exports{$_}->{amount} * 1) eq ($bt->amount * 1) ) {
+        if ( $bt->transaction_code eq '191' && abs(($sepa_exports{$_}->{amount} * 1) - ($bt->amount * 1)) < 0.01 ) {

           ## jupp
           ## jupp

-          $bt->{proposals} = $sepa_exports{$_}->{invoices} ;
+          @{$bt->{proposals}} = @{$sepa_exports{$_}->{invoices}};

           $bt->{agreement}    = 20;
           $bt->{agreement}    = 20;

-          $bt->{rule_matches} = 'sepa_export_item(20)';
+          push(@{$bt->{rule_matches}},'sepa_export_item(20)');

           $sepa_exports{$_}->{proposed}=1;
           #$main::lxdebug->message(LXDebug->DEBUG2(),"has ".scalar($bt->{proposals})." invoices");
           push(@proposals, $bt);
           $sepa_exports{$_}->{proposed}=1;
           #$main::lxdebug->message(LXDebug->DEBUG2(),"has ".scalar($bt->{proposals})." invoices");
           push(@proposals, $bt);


@@ -184,13 +184,17 @@ sub action_list {
           $_->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);
           $_->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 && $_->amount eq ($bt->amount * $factor)) {
-            push ($bt->{proposals},$open_invoice );
-            $bt->{agreement}    = 20;
-            $bt->{rule_matches} = 'sepa_export_item(20)';
-            #$main::lxdebug->message(LXDebug->DEBUG2(),"found invoice");
-            @all_sepa_invoices = grep { $_ != $open_invoice } @all_sepa_invoices;
-            last;
+          if ( $bt->{remote_account_number} eq $_->vc_iban && abs(( $_->amount *1 ) - ($bt->amount * $factor)) < 0.01 ) {
+            my $iban;
+            $iban = $open_invoice->customer->iban if $open_invoice->is_sales;
+            $iban = $open_invoice->vendor->iban   if ! $open_invoice->is_sales;
+            if($bt->{remote_account_number} eq $iban && abs(abs($open_invoice->amount) - abs($bt->amount)) < 0.01 ) {
+              ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
+              $open_invoice->{agreement} += 5;
+              $open_invoice->{rule_matches} .= 'sepa_export_item(5) ';
+              $main::lxdebug->message(LXDebug->DEBUG2(),"sepa invoice_id=".$open_invoice->id." agreement=".$open_invoice->{agreement}." rules matches=".$open_invoice->{rule_matches});
+              $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);
+            }

           }
         }
       }
           }
         }
       }


@@ -205,10 +209,10 @@ sub action_list {
     # the arrays $bt->{proposals} and $bt->{rule_matches}, and the agreement
     # score is stored in $bt->{agreement}
 
     # the arrays $bt->{proposals} and $bt->{rule_matches}, and the agreement
     # score is stored in $bt->{agreement}
 

-    foreach my $open_invoice (@all_open_invoices){
+    foreach my $open_invoice (@all_non_sepa_invoices){

       ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
       $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*($open_invoice->{is_ar}?1:-1),2);
       ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
       $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});
+      $main::lxdebug->message(LXDebug->DEBUG2(),"nons invoice_id=".$open_invoice->id." agreement=".$open_invoice->{agreement}." rules matches=".$open_invoice->{rule_matches}) if $open_invoice->{agreement} > 2;

     };
 
     my $agreement = 15;
     };
 
     my $agreement = 15;


@@ -306,7 +310,6 @@ sub action_create_invoice {
     vendor_id   => $use_vendor_filter ? $vendor_of_transaction->id   : undef,
     vendor_name => $use_vendor_filter ? $vendor_of_transaction->name : undef,
     ALL_VENDORS => $all_vendors,
     vendor_id   => $use_vendor_filter ? $vendor_of_transaction->id   : undef,
     vendor_name => $use_vendor_filter ? $vendor_of_transaction->name : undef,
     ALL_VENDORS => $all_vendors,

-    limit       => $myconfig{vclimit},

     callback    => $callback,
   );
 }
     callback    => $callback,
   );
 }


@@ -540,7 +543,7 @@ sub action_save_proposals {
 
 sub is_collective_transaction {
   my ($self, $bt) = @_;
 
 sub is_collective_transaction {
   my ($self, $bt) = @_;

-  return $bt->transactioncode eq "191";
+  return $bt->transaction_code eq "191";

 }
 
 sub save_single_bank_transaction {
 }
 
 sub save_single_bank_transaction {


@@ -672,7 +675,6 @@ sub save_single_bank_transaction {
           };
         }
       }
           };
         }
       }

-

       # Record a record link from the bank transaction to the invoice
       my @props = (
         from_table => 'bank_transactions',
       # Record a record link from the bank transaction to the invoice
       my @props = (
         from_table => 'bank_transactions',