my $bank_accounts = SL::DB::Manager::BankAccount->get_all_sorted( query => [ obsolete => 0 ] );
+ $self->setup_search_action_bar;
$self->render('bank_transactions/search',
BANK_ACCOUNTS => $bank_accounts);
}
$self->make_filter_summary;
$self->prepare_report;
+ $self->setup_list_all_action_bar;
$self->report_generator_list_objects(report => $self->{report}, objects => $self->models->get);
}
foreach ( @{$all_open_sepa_export_items}) {
last if scalar (@all_sepa_invoices) == 0;
foreach my $open_invoice (@all_sepa_invoices){
+ $open_invoice->{agreement} = 0;
+ $open_invoice->{rule_matches} ='';
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);
$count += scalar( @{$invoice_ids} );
}
}
+ foreach (@{ $self->problems }) {
+ $count-- if $_->{result} eq 'error';
+ }
return $count;
}
if ( $payment_sent
&& any { ( $_->is_sales && ($_->amount > 0))
- || (!$_->is_sales && ($_->amount < 0))
+ || (!$_->is_sales && ($_->amount < 0) && ($_->invoice_type eq 'purchase_invoice'))
} @{ $data{invoices} }) {
return {
%data,
source => $source,
memo => $memo,
transdate => $bank_transaction->transdate->to_kivitendo);
- } elsif ( $invoice->is_sales && $invoice->type eq 'credit_note' ) {
- # no check for overpayment/multiple payments
- $invoice->pay_invoice(chart_id => $bank_transaction->local_bank_account->chart_id,
- trans_id => $invoice->id,
- amount => $invoice->open_amount,
- payment_type => $payment_type,
- source => $source,
- memo => $memo,
- transdate => $bank_transaction->transdate->to_kivitendo);
- } else { # use the whole amount of the bank transaction for the invoice, overpay the invoice if necessary
+ } else {
+ # use the whole amount of the bank transaction for the invoice, overpay the invoice if necessary
+
+ # this catches credit_notes and negative sales invoices
+ if ( $invoice->is_sales && $invoice->amount < 0 ) {
+ # $invoice->open_amount is negative for credit_notes
+ # $bank_transaction->amount is negative for outgoing transactions
+ # so $amount_of_transaction is negative but needs positive
+ $amount_of_transaction *= -1;
+
+ } elsif (!$invoice->is_sales && $invoice->invoice_type eq 'ap_transaction' ) {
+ # $invoice->open_amount may be negative for ap_transaction but may be positiv for negativ ap_transaction
+ # if $invoice->open_amount is negative $bank_transaction->amount is positve
+ # if $invoice->open_amount is positive $bank_transaction->amount is negative
+ # but amount of transaction is for both positive
+ $amount_of_transaction *= -1 if $invoice->open_amount == - $amount_of_transaction;
+ }
+
my $overpaid_amount = $amount_of_transaction - $invoice->open_amount;
$invoice->pay_invoice(chart_id => $bank_transaction->local_bank_account->chart_id,
trans_id => $invoice->id,
};
};
- die if $error;
+ # Rollback Fehler nicht weiterreichen
+ # die if $error;
});
return grep { $_ } ($error, @warnings);
my ($self, $template) = @_;
return $self->url_for(
- controller => 'ap.pl',
- action => 'load_record_template',
- id => $template->id,
- 'form_defaults.amount_1' => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
- 'form_defaults.transdate' => $self->transaction->transdate_as_date,
- 'form_defaults.duedate' => $self->transaction->transdate_as_date,
- 'form_defaults.datepaid_1' => $self->transaction->transdate_as_date,
- 'form_defaults.paid_1' => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
- 'form_defaults.currency' => $self->transaction->currency->name,
- 'form_defaults.AP_paid_1' => $self->transaction->local_bank_account->chart->accno,
- 'form_defaults.callback' => $self->callback,
+ controller => 'ap.pl',
+ action => 'load_record_template',
+ id => $template->id,
+ 'form_defaults.amount_1' => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
+ 'form_defaults.transdate' => $self->transaction->transdate_as_date,
+ 'form_defaults.duedate' => $self->transaction->transdate_as_date,
+ 'form_defaults.no_payment_bookings' => 1,
+ 'form_defaults.paid_1_suggestion' => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
+ 'form_defaults.AP_paid_1_suggestion' => $self->transaction->local_bank_account->chart->accno,
+ 'form_defaults.callback' => $self->callback,
);
}
+sub setup_search_action_bar {
+ my ($self, %params) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Filter'),
+ submit => [ '#search_form', { action => 'BankTransaction/list' } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
+sub setup_list_all_action_bar {
+ my ($self, %params) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Filter'),
+ submit => [ '#filter_form', { action => 'BankTransaction/list_all' } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
1;
__END__