use List::UtilsBy qw(partition_by);
use List::MoreUtils qw(any);
-use List::MoreUtils qw(any none);
use List::Util qw(max);
use Rose::Object::MakeMethods::Generic
where => [
amount => {ne => \'invoice_amount'},
local_bank_account_id => $::form->{filter}{bank_account},
+ cleared => 0,
@where
],
);
$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_sellprice($open_invoice->amount*$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}++;
# 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);
}
# for testing with t/bank/banktransaction.t :
if ( $::form->{dont_render_for_test} ) {
- return $bank_transactions;
+ return ( $bank_transactions , \@proposals );
}
$::request->layout->add_javascripts("kivi.BankTransaction.js");
$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;
};
}
+ my $bank_transaction = $data{bank_transaction};
+
+ # see pod
+ if (@{ $bank_transaction->linked_invoices } || $bank_transaction->invoice_amount != 0) {
+ return {
+ %data,
+ result => 'error',
+ message => $::locale->text("Bank transaction with id #1 has already been linked to one or more record and/or some amount is already assigned.", $bank_transaction->id),
+ };
+ }
my (@warnings);
my $worker = sub {
my $bt_id = $data{bank_transaction_id};
- my $bank_transaction = $data{bank_transaction};
my $sign = $bank_transaction->amount < 0 ? -1 : 1;
my $amount_of_transaction = $sign * $bank_transaction->amount;
my $payment_received = $bank_transaction->amount > 0;
$n_invoices++ ;
- # Check if bank_transaction already has a link to the invoice, may only be linked once per invoice
- # This might be caused by the user reloading a page and resending the form
- if (_existing_record_link($bank_transaction, $invoice)) {
- return {
- %data,
- result => 'error',
- message => $::locale->text("Bank transaction with id #1 has already been linked to #2.", $bank_transaction->id, $invoice->displayable_name),
- };
- }
if (!$amount_of_transaction && $invoice->open_amount) {
return {
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
-
- # 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 =~ m/ap_transaction|purchase_invoice/) {
- # $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;
- }
+ # use the whole amount of the bank transaction for the invoice, overpay the invoice if necessary
+
+ # $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
+ # $invoice->open_amount may be negative for ap_transaction but may be positiv for negative 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->amount < 0);
+
+ # if we have a skonto case - the last invoice needs skonto
+ $amount_of_transaction = $invoice->amount_less_skonto if ($payment_type eq 'with_skonto_pt');
+
my $overpaid_amount = $amount_of_transaction - $invoice->open_amount;
$invoice->pay_invoice(chart_id => $bank_transaction->local_bank_account->chart_id,
# 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 _existing_record_link {
- my ($bt, $invoice) = @_;
-
- # check whether a record link from banktransaction $bt already exists to
- # invoice $invoice, returns 1 if that is the case
-
- die unless $bt->isa("SL::DB::BankTransaction") && ( $invoice->isa("SL::DB::Invoice") || $invoice->isa("SL::DB::PurchaseInvoice") );
-
- my $linked_record_to_table = $invoice->is_sales ? 'Invoice' : 'PurchaseInvoice';
- my $linked_records = $bt->linked_records( direction => 'to', to => $linked_record_to_table, query => [ id => $invoice->id ] );
-
- return @$linked_records ? 1 : 0;
-};
-
sub init_problems { [] }
sub init_models {
'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,
+ 'form_defaults.bt_chart_id' => $self->transaction->local_bank_account->chart->id,
);
}
C<invoice_ids>, an array ref of database IDs to purchase or sales
invoice objects).
+This method cannot handle already partly assigned bank transactions, i.e.
+a bank transaction that has a invoice_amount <> 0 but not the fully
+transaction amount (invoice_amount == amount).
+
+If the amount of the bank transaction is higher than the sum of
+the assigned invoices (1 .. n) the last invoice will be overpayed.
+
The whole function is wrapped in a database transaction. If an
exception occurs the bank transaction is not posted at all. The same
is true if the code detects an error during the execution, e.g. a bank