X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/2d8fabfca38ef5ddba73562bc25ecf5c32a2cbf3..69bfa40a001bfd0ca75d60babdb63f9199d4e45c:/SL/DB/BankTransaction.pm diff --git a/SL/DB/BankTransaction.pm b/SL/DB/BankTransaction.pm index cabdc816d..26c38e51b 100644 --- a/SL/DB/BankTransaction.pm +++ b/SL/DB/BankTransaction.pm @@ -210,26 +210,25 @@ sub get_agreement_with_invoice { }; # # if there is exactly one non-executed sepa_export_item for the invoice -# if ( my $seis = $invoice->find_sepa_export_items({ executed => 0 }) ) { -# if ( scalar @$seis == 1 ) { -# my $sei = $seis->[0]; -# -# # test for amount and id matching only, sepa transfer date and bank -# # transaction date needn't match -# my $arap = $invoice->is_sales ? 'ar' : 'ap'; -# 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'} . ') '; -# }; -# } else { -# # zero or more than one sepa_export_item, do nothing for this invoice -# # zero: do nothing, no sepa_export_item exists, no match -# # more than one: does this ever apply? Currently you can't create sepa -# # exports for invoices that already have a non-executed sepa_export -# }; -# }; + if ( my $seis = $invoice->find_sepa_export_items({ executed => 0 }) ) { + if (scalar @$seis == 1) { + my $sei = $seis->[0]; + + # test for amount and id matching only, sepa transfer date and bank + # transaction date needn't match + my $arap = $invoice->is_sales ? 'ar' : 'ap'; + + 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'} . ') '; + } + } else { + # zero or more than one sepa_export_item, do nothing for this invoice + # zero: do nothing, no sepa_export_item exists, no match + # more than one: does this ever apply? Currently you can't create sepa + # exports for invoices that already have a non-executed sepa_export + } + } return ($agreement,$rule_matches); };