use SL::DB::RecordTemplate;
use SL::DB::SepaExportItem;
use SL::DBUtils qw(like);
-use SL::Presenter;
+use List::UtilsBy qw(partition_by);
use List::MoreUtils qw(any);
use List::Util qw(max);
@where
],
);
- $::lxdebug->log_time('asdf');
# credit notes have a negative amount, treat differently
my $all_open_ar_invoices = SL::DB::Manager::Invoice ->get_all(where => [ or => [ amount => { gt => \'paid' },
and => [ type => 'credit_note',
my $all_open_sepa_export_items = SL::DB::Manager::SepaExportItem->get_all(where => [chart_id => $bank_account->chart_id ,
'sepa_export.executed' => 0, 'sepa_export.closed' => 0 ], with_objects => ['sepa_export']);
- $::lxdebug->log_time('asdf 2');
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 ( @{$all_open_sepa_export_items}) {
- if (($_->ap_id && $_->ap_id == $open_invoice->id) || ($_->ar_id && $_->ar_id == $open_invoice->id)) {
- my $factor = ($_->ar_id == $open_invoice->id ? 1 : -1);
- #$main::lxdebug->message(LXDebug->DEBUG2(),"sepa_exitem=".$_->id." for invoice ".$open_invoice->id." factor=".$factor);
- $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;
- }
+ 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;
}
}
- $::lxdebug->log_time('asdf 4');
# 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 ) {
+ my $found=0;
foreach ( keys %sepa_exports) {
if ( abs(($sepa_exports{$_}->{amount} * 1) - ($bt->amount * 1)) < 0.01 ) {
## jupp
$bt->{sepa_export_ok} = 1;
$sepa_exports{$_}->{proposed}=1;
push(@proposals, $bt);
- next;
+ $found=1;
+ last;
}
}
+ next if $found;
# batch transaction has no remotename !!
} else {
next unless $bt->{remote_name}; # bank has no name, usually fees, use create invoice to assign
# score is stored in $bt->{agreement}
foreach my $open_invoice (@all_open_invoices) {
- ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
+ ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice,
+ sepa_export_items => $all_open_sepa_export_items,
+ );
$open_invoice->{realamount} = $::form->format_amount(\%::myconfig,
$open_invoice->amount * ($open_invoice->{is_ar} ? 1 : -1), 2);
}
push(@{$bt->{rule_matches}}, $_->{rule_matches});
};
};
- $::lxdebug->log_time('asdf 5');
} # finished one bt
# finished all bt
$self->transaction(SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id}));
- # This was dead code: We compared vendor.account_name with bank_transaction.iban.
- # This did never match (Kontonummer != IBAN). It's kivis 09/02 (2013) day
- # If refactored/improved, also consider that vendor.iban should be normalized
- # user may like to input strings like: 'AT 3333 3333 2222 1111' -> can be checked strictly
- # at Vendor code because we need the correct data for all sepa exports.
-
my $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(iban => $self->transaction->{remote_account_number});
my $use_vendor_filter = $self->transaction->{remote_account_number} && $vendor_of_transaction;
'bank_transactions/create_invoice',
{ layout => 0 },
title => t8('Create invoice'),
- TEMPLATES_GL => $use_vendor_filter ? undef : $templates_gl,
+ TEMPLATES_GL => $use_vendor_filter && @{ $templates_ap } ? undef : $templates_gl,
TEMPLATES_AP => $templates_ap,
- vendor_name => $use_vendor_filter ? $vendor_of_transaction->name : undef,
+ vendor_name => $use_vendor_filter && @{ $templates_ap } ? $vendor_of_transaction->name : undef,
+ BT_ID => $::form->{bt_id},
);
}
$self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
- my @filter;
- push @filter, ('vendor.name' => { ilike => '%' . $::form->{vendor} . '%' }) if $::form->{vendor};
- push @filter, ('template_name' => { ilike => '%' . $::form->{template} . '%' }) if $::form->{template};
- push @filter, ('reference' => { ilike => '%' . $::form->{reference} . '%' }) if $::form->{reference};
+ my (@filter, @filter_ap);
- my $templates_ap = SL::DB::Manager::RecordTemplate->get_all(
- where => [ template_type => 'ap_transaction', (and => \@filter) x !!@filter ],
- with_objects => [ qw(employee vendor) ],
- );
+ # filter => gl and ap | filter_ap = ap (i.e. vendorname)
+ push @filter, ('template_name' => { ilike => '%' . $::form->{template} . '%' }) if $::form->{template};
+ push @filter, ('reference' => { ilike => '%' . $::form->{reference} . '%' }) if $::form->{reference};
+ push @filter_ap, ('vendor.name' => { ilike => '%' . $::form->{vendor} . '%' }) if $::form->{vendor};
+ push @filter_ap, @filter;
my $templates_gl = SL::DB::Manager::RecordTemplate->get_all(
query => [ template_type => 'gl_transaction',
chart_id => SL::DB::Manager::BankAccount->find_by(id => $self->transaction->local_bank_account_id)->chart_id,
with_objects => [ qw(employee record_template_items) ],
);
+ my $templates_ap = SL::DB::Manager::RecordTemplate->get_all(
+ where => [ template_type => 'ap_transaction', (and => \@filter_ap) x !!@filter_ap ],
+ with_objects => [ qw(employee vendor) ],
+ );
$::form->{filter} //= {};
$self->callback($self->url_for(
$count += scalar( @{$invoice_ids} );
}
}
+ my $max_count = $count;
foreach (@{ $self->problems }) {
$count-- if $_->{result} eq 'error';
}
- return $count;
+ return ($count, $max_count);
}
sub action_save_invoices {
my ($self) = @_;
- my $count = $self->save_invoices();
+ my ($success_count, $max_count) = $self->save_invoices();
- flash('ok', t8('#1 invoice(s) saved.', $count));
+ if ($success_count == $max_count) {
+ flash('ok', t8('#1 invoice(s) saved.', $success_count));
+ } else {
+ flash('error', t8('At least #1 invoice(s) not saved', $max_count - $success_count));
+ }
$self->action_list();
}
# Rollback Fehler nicht weiterreichen
# die if $error;
+ # aber einen rollback von hand
+ $::lxdebug->message(LXDebug->DEBUG2(),"finish worker with ". ($error ? $error->{result} : '-'));
+ $data{bank_transaction}->db->dbh->rollback if $error && $error->{result} eq 'error';
});
return grep { $_ } ($error, @warnings);
}
sub load_gl_record_template_url {
- my ($self, $template) = @_;
+ my ($self, $template, $bt_id) = @_;
return $self->url_for(
controller => 'gl.pl',
'form_defaults.amount_1' => abs($self->transaction->amount), # always positive
'form_defaults.transdate' => $self->transaction->transdate_as_date,
'form_defaults.callback' => $self->callback,
+ 'form_defaults.bt_id' => $self->transaction->id,
);
}
projects / kivitendo-erp.git / blobdiff