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);
source => $source,
memo => $memo,
transdate => $bank_transaction->transdate->to_kivitendo);
- } elsif (( $invoice->is_sales && $invoice->invoice_type eq 'credit_note' ) ||
- (!$invoice->is_sales && $invoice->invoice_type eq 'ap_transaction' )) {
- # no check for overpayment/multiple payments
-
- # 1. $invoice->open_amount is arap.amount - ararp.paid (always positive!)
- # 2. $bank_transaction->amount is negative for outgoing transactions and positive for
- # incoming transactions.
- # 1. and 2. => we have to turn the sign for invoice_amount in bank_transactions
- # for verifying expected data, check t/bank/bank_transactions.t
- $bank_transaction->invoice_amount($invoice->open_amount * -1);
+ } 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;
+ }
- $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
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,
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,
);
}