Revision 5092b0bb
Von Jan Büren vor 3 Monaten hinzugefügt
- ID 5092b0bb98b978ec718dfcfe5fa9eaab72dc9e6a
- Vorgänger 6fa8f517
| SL/Controller/BankTransaction.pm | ||
|---|---|---|
|
@where
|
||
|
],
|
||
|
);
|
||
|
|
||
|
my $has_batch_transaction = (grep { $_->is_batch_transaction } @{ $bank_transactions }) ? 1 : undef;
|
||
|
|
||
|
# credit notes have a negative amount, treat differently
|
||
|
my $all_open_ar_invoices = SL::DB::Manager::Invoice->get_all(where => [ or => [ amount => { gt => \'paid' }, # '} make emacs happy
|
||
|
and => [ type => 'credit_note',
|
||
| ... | ... | |
|
|
||
|
my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => [amount => { ne => \'paid' }], # '}] make emacs happy
|
||
|
with_objects => ['vendor' ,'payment_terms']);
|
||
|
my $all_open_sepa_export_items = SL::DB::Manager::SepaExportItem->get_all(where => [chart_id => $params{bank_account}->chart_id ,
|
||
|
'sepa_export.executed' => 0,
|
||
|
'sepa_export.closed' => 0
|
||
|
],
|
||
|
with_objects => ['sepa_export']);
|
||
|
|
||
|
my @all_open_invoices;
|
||
|
# filter out invoices with less than 1 cent outstanding
|
||
|
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 };
|
||
|
|
||
|
my %sepa_exports;
|
||
|
my %sepa_export_items_by_id = partition_by { $_->ar_id || $_->ap_id } @$all_open_sepa_export_items;
|
||
|
|
||
|
# first collect sepa export items to open invoices
|
||
|
foreach my $open_invoice (@all_open_invoices){
|
||
|
$open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount,2);
|
||
|
$open_invoice->{skonto_type} = 'without_skonto';
|
||
|
foreach (@{ $sepa_export_items_by_id{ $open_invoice->id } || [] }) {
|
||
|
my $factor = ($_->ar_id == $open_invoice->id ? 1 : -1);
|
||
|
$open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);
|
||
|
|
||
|
$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;
|
||
|
|
||
|
my (%sepa_exports, %sepa_export_items_by_id, $all_open_sepa_export_items);
|
||
|
if ($has_batch_transaction) {
|
||
|
$all_open_sepa_export_items = SL::DB::Manager::SepaExportItem->get_all(where => [chart_id => $params{bank_account}->chart_id ,
|
||
|
'sepa_export.executed' => 0,
|
||
|
'sepa_export.closed' => 0
|
||
|
],
|
||
|
with_objects => ['sepa_export']);
|
||
|
%sepa_export_items_by_id = partition_by { $_->ar_id || $_->ap_id } @$all_open_sepa_export_items;
|
||
|
|
||
|
# first collect sepa export items to open invoices
|
||
|
foreach my $open_invoice (@all_open_invoices){
|
||
|
$open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount,2);
|
||
|
$open_invoice->{skonto_type} = 'without_skonto';
|
||
|
foreach (@{ $sepa_export_items_by_id{ $open_invoice->id } || [] }) {
|
||
|
my $factor = ($_->ar_id == $open_invoice->id ? 1 : -1);
|
||
|
$open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);
|
||
|
|
||
|
$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;
|
||
|
}
|
||
|
}
|
||
|
}
|
||
|
|
||
|
# try to match each bank_transaction with each of the possible open invoices
|
||
|
# by awarding points
|
||
|
my @proposals;
|
||
| ... | ... | |
|
|
||
|
$bt->{remote_name} .= $bt->{remote_name_1} if $bt->{remote_name_1};
|
||
|
|
||
|
if ( $bt->is_batch_transaction ) {
|
||
|
if ($has_batch_transaction && $bt->is_batch_transaction ) {
|
||
|
my $found=0;
|
||
|
foreach ( keys %sepa_exports) {
|
||
|
if ( abs(($sepa_exports{$_}->{amount} * 1) - ($bt->amount * 1)) < 0.01 ) {
|
||
Auch abrufbar als: Unified diff
Code 191 Randfall nur berechnen, wenn dieser auch im Datenbestand vorkommt
Ich hab exakt einen Mandanten gefunden, der folgende Transaktionscodes
gespeichert hat:
select distinct transaction_code from bank_transactions;
transaction_code
------------------
116 TRF 105 MSC 835 191 159 51 DDT 166 STO 303 117 SEC CHG CHK
Der Code 191 befindet sich in 10 von 6800 Bankbewegungen, dennoch wird bei
jeder Verbuchungsabfrage über alle offene SEPA Exporte iteriert, um
diesen Fall auf Verdacht zu berechnen. Damit ist jetzt Schluss!
Die aktuelle Bankbewegungen lassen sich sehr simpel mit einer Zeile
vorher analysieren, ob sich die gesamte Aktion überhaupt lohnt.