-use Test::More tests => 208;
+use Test::More tests => 289;
use strict;
use List::Util qw(sum);
use SL::DB::AccTransaction;
+use SL::DB::BankTransactionAccTrans;
use SL::DB::Buchungsgruppe;
use SL::DB::Currency;
use SL::DB::Customer;
+use SL::DB::Default;
use SL::DB::Vendor;
use SL::DB::Invoice;
use SL::DB::Unit;
use SL::DB::PurchaseInvoice;
use SL::DB::BankTransaction;
use SL::Controller::BankTransaction;
+use SL::Controller::Reconciliation;
use SL::Dev::ALL qw(:ALL);
use Data::Dumper;
sub clear_up {
+ SL::DB::Manager::BankTransactionAccTrans->delete_all(all => 1);
SL::DB::Manager::BankTransaction->delete_all(all => 1);
SL::DB::Manager::InvoiceItem->delete_all(all => 1);
SL::DB::Manager::InvoiceItem->delete_all(all => 1);
SL::DB::Manager::BankAccount->delete_all(all => 1);
SL::DB::Manager::PaymentTerm->delete_all(all => 1);
SL::DB::Manager::Currency->delete_all(where => [ name => 'CUR' ]);
+ # SL::DB::Manager::Default->delete_all(all => 1);
};
my $bt_controller;
test_two_neg_ap_transaction();
test_one_inv_and_two_invoices_with_skonto_exact();
test_bt_error();
-
+test_full_workflow_ar_multiple_inv_skonto_reconciliate_and_undo();
reset_state();
test_sepa_export();
reset_state();
test_two_banktransactions();
# remove all created data at end of test
+test_closedto();
clear_up();
done_testing();
$ar_transaction->load;
$bt->load;
- is($ar_transaction->paid , '135.00000' , "$testname: 'salesinv overpaid' was overpaid");
- is($bt->invoice_amount , '135.00000' , "$testname: bt invoice amount was assigned overpaid amount");
+ is($ar_transaction->paid , '119.00000' , "$testname: 'salesinv overpaid' was not overpaid");
+ is($bt->invoice_amount , '119.00000' , "$testname: bt invoice amount was not fully assigned with the overpaid amount");
{ local $TODO = 'this currently fails because closed ignores over-payments, see commit d90966c7';
is($ar_transaction->closed , 0 , "$testname: 'salesinv overpaid' is open (via 'closed' method')");
}
- is($ar_transaction->open_amount == 0 ? 1 : 0 , 0 , "$testname: 'salesinv overpaid is open (via amount-paid)");
+ is($ar_transaction->open_amount == 0 ? 1 : 0 , 1 , "$testname: 'salesinv overpaid is closed (via amount-paid)");
};
sub test_overpayment_with_partialpayment {
- # two payments on different days, 10 and 119. If there is only one invoice we want it be overpaid.
+ # two payments on different days, 10 and 119. If there is only one invoice we
+ # don't want it to be overpaid.
my $testname = 'test_overpayment_with_partialpayment';
$ar_transaction = test_ar_transaction(invnumber => 'salesinv overpaid partial');
};
save_btcontroller_to_string();
+ $bt_1->load;
+ is($bt_1->invoice_amount , '10.00000' , "$testname: bt_1 invoice amount was fully assigned");
$::form->{invoice_ids} = {
$bt_2->id => [ $ar_transaction->id ]
};
save_btcontroller_to_string();
$ar_transaction->load;
- $bt_1->load;
$bt_2->load;
- is($ar_transaction->paid , '129.00000' , "$testname: 'salesinv overpaid partial' was overpaid");
- is($bt_1->invoice_amount , '10.00000' , "$testname: bt_1 invoice amount was assigned overpaid amount");
- is($bt_2->invoice_amount , '119.00000' , "$testname: bt_2 invoice amount was assigned overpaid amount");
+ is($bt_1->invoice_amount , '10.00000' , "$testname: bt_1 invoice amount was fully assigned");
+ is($ar_transaction->paid , '119.00000' , "$testname: 'salesinv overpaid partial' was not overpaid");
+ is($bt_2->invoice_amount , '109.00000' , "$testname: bt_2 invoice amount was partly assigned");
};
};
+sub test_full_workflow_ar_multiple_inv_skonto_reconciliate_and_undo {
+
+ my $testname = 'test_partial_payment';
+
+ $ar_transaction = test_ar_transaction(invnumber => 'salesinv partial payment two');
+ my $ar_transaction_2 = test_ar_transaction(invnumber => 'salesinv 2 22d2', amount => 22);
+
+ # amount 299.29 > 119
+ my $bt = create_bank_transaction(record => $ar_transaction,
+ bank_chart_id => $bank->id,
+ amount => 299.29
+ ) or die "Couldn't create bank_transaction";
+
+ $::form->{invoice_ids} = {
+ $bt->id => [ $ar_transaction->id ]
+ };
+
+ save_btcontroller_to_string();
+
+ $ar_transaction->load;
+ $bt->load;
+
+ is($ar_transaction->paid , '119.00000' , "$testname: 'salesinv partial payment' was fully paid");
+ is($bt->invoice_amount , '119.00000' , "$testname: bt invoice amount was assigned partially paid amount");
+ is($bt->amount , '299.29000' , "$testname: bt amount is stil there");
+ # next invoice, same bank transaction
+ $::form->{invoice_ids} = {
+ $bt->id => [ $ar_transaction_2->id ]
+ };
+
+ save_btcontroller_to_string();
+
+ $ar_transaction_2->load;
+ $bt->load;
+ is($ar_transaction_2->paid , '26.18000' , "$testname: 'salesinv partial payment' was fully paid");
+ is($bt->invoice_amount , '145.18000' , "$testname: bt invoice amount was assigned partially paid amount");
+ is($bt->amount , '299.29000' , "$testname: bt amount is stil there");
+ is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )}, 4, "$testname 4 acc_trans entries created");
+
+ # now check all 4 entries done so far and save paid acc_trans_ids for later use with reconcile
+ foreach my $acc_trans_id_entry (@{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )}) {
+ isnt($acc_trans_id_entry->ar_id, undef, "$testname: bt linked with acc_trans and trans_id set");
+ my $rl = SL::DB::Manager::RecordLink->get_all(where => [ from_id => $bt->id, from_table => 'bank_transactions', to_id => $acc_trans_id_entry->ar_id ]);
+ is (ref $rl->[0], 'SL::DB::RecordLink', "$testname record link created");
+ my $acc_trans = SL::DB::Manager::AccTransaction->get_all(where => [acc_trans_id => $acc_trans_id_entry->acc_trans_id]);
+ foreach my $entry (@{ $acc_trans }) {
+ like(abs($entry->amount), qr/(119|26.18)/, "$testname: abs amount correct");
+ like($entry->chart_link, qr/(paid|AR)/, "$testname chart_link correct");
+ push @{ $::form->{bb_ids} }, $entry->acc_trans_id if $entry->chart_link =~ m/paid/;
+ }
+ }
+ # great we need one last booking to clear the whole bank transaction - we include skonto
+ my $ar_transaction_skonto = test_ar_transaction(invnumber => 'salesinv skonto last case',
+ payment_id => $payment_terms->id,
+ amount => 136.32,
+ );
+
+ $::form->{invoice_ids} = {
+ $bt->id => [ $ar_transaction_skonto->id ]
+ };
+ $::form->{invoice_skontos} = {
+ $bt->id => [ 'with_skonto_pt' ]
+ };
+
+ save_btcontroller_to_string();
+
+ $ar_transaction_skonto->load;
+ $bt->load;
+ is($ar_transaction_skonto->paid , '162.22000' , "$testname: 'salesinv skonto fully paid");
+ is($bt->invoice_amount , '299.29000' , "$testname: bt invoice amount was assigned partially paid amount");
+ is($bt->amount , '299.29000' , "$testname: bt amount is stil there");
+ is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )},
+ 7, "$testname 7 acc_trans entries created");
+
+ # same loop as above, but only for the 3rd ar_id
+ foreach my $acc_trans_id_entry (@{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [ar_id => $ar_transaction_skonto->id ] )}) {
+ isnt($acc_trans_id_entry->ar_id, '', "$testname: bt linked with acc_trans and trans_id set");
+ my $rl = SL::DB::Manager::RecordLink->get_all(where => [ from_id => $bt->id, from_table => 'bank_transactions', to_id => $acc_trans_id_entry->ar_id ]);
+ is (ref $rl->[0], 'SL::DB::RecordLink', "$testname record link created");
+ my $acc_trans = SL::DB::Manager::AccTransaction->get_all(where => [acc_trans_id => $acc_trans_id_entry->acc_trans_id]);
+ foreach my $entry (@{ $acc_trans }) {
+ like($entry->chart_link, qr/(paid|AR)/, "$testname chart_link correct");
+ is ($entry->amount, '162.22000', "$testname full amont") if $entry->chart_link eq 'AR'; # full amount
+ like(abs($entry->amount), qr/(154.11|8.11)/, "$testname: abs amount correct") if $entry->chart_link =~ m/paid/;
+ push @{ $::form->{bb_ids} }, $entry->acc_trans_id if ($entry->chart_link =~ m/paid/ && $entry->amount == -154.11);
+ }
+ }
+ # done, now reconciliate all bookings
+ $::form->{bt_ids} = [ $bt->id ];
+ my $rec_controller = SL::Controller::Reconciliation->new;
+ my @errors = $rec_controller->_get_elements_and_validate;
+
+ is (scalar @errors, 0, "$testname unsuccesfull reconciliation with error: " . Dumper(@errors));
+ $rec_controller->_reconcile;
+ $bt->load;
+
+ # and check the cleared state of bt and the acc_transactions
+ is($bt->cleared, '1' , "$testname: bt cleared");
+ foreach (@{ $::form->{bb_ids} }) {
+ my $acc_trans = SL::DB::Manager::AccTransaction->find_by(acc_trans_id => $_);
+ is($acc_trans->cleared, '1' , "$testname: acc_trans entry cleared");
+ }
+ # now, this was a really bad idea and in general a major mistake. better undo and redo the whole bank transactions
+
+ $::form->{ids} = [ $bt->id ];
+ $bt_controller = SL::Controller::BankTransaction->new;
+ $bt_controller->action_unlink_bank_transaction('testcase' => 1);
+
+ $bt->load;
+
+ # and check the cleared state of bt and the acc_transactions
+ is($bt->cleared, '0' , "$testname: bt undo cleared");
+ is($bt->invoice_amount, '0.00000' , "$testname: bt undo invoice amount");
+ foreach (@{ $::form->{bb_ids} }) {
+ my $acc_trans = SL::DB::Manager::AccTransaction->find_by(acc_trans_id => $_);
+ is($acc_trans, undef , "$testname: cleared acc_trans entry completely removed");
+ }
+ # this was for data integrity for reconcile, now all the other options
+ is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )},
+ 0, "$testname 7 acc_trans entries deleted");
+ my $rl = SL::DB::Manager::RecordLink->get_all(where => [ from_id => $bt->id, from_table => 'bank_transactions' ]);
+ is (ref $rl->[0], '', "$testname record link removed");
+ # double safety and check ar.paid
+ # load all three invoices and check for paid-link via acc_trans and paid in general
+
+ $ar_transaction->load;
+ $ar_transaction_2->load;
+ $ar_transaction_skonto->load;
+
+ is(scalar @{ SL::DB::Manager::AccTransaction->get_all(
+ where => [ trans_id => $ar_transaction->id, chart_link => { like => '%paid%' } ])},
+ 0, "$testname no more paid entries in acc_trans for ar_transaction");
+ is(scalar @{ SL::DB::Manager::AccTransaction->get_all(
+ where => [ trans_id => $ar_transaction_2->id, chart_link => { like => '%paid%' } ])},
+ 0, "$testname no more paid entries in acc_trans for ar_transaction_2");
+ is(scalar @{ SL::DB::Manager::AccTransaction->get_all(
+ where => [ trans_id => $ar_transaction_skonto->id, chart_link => { like => '%paid%' } ])},
+ 0, "$testname no more paid entries in acc_trans for ar_transaction_skonto");
+
+ is($ar_transaction->paid , '0.00000' , "$testname: 'salesinv fully unpaid");
+ is($ar_transaction_2->paid , '0.00000' , "$testname: 'salesinv 2 fully unpaid");
+ is($ar_transaction_skonto->paid , '0.00000' , "$testname: 'salesinv skonto fully unpaid");
+
+ # whew. w(h)a(n)t a whole lotta test
+}
+
+
sub test_credit_note {
my $testname = 'test_credit_note';
bank_chart_id => $bank->id,
transdate => DateTime->today->add(days => 10),
);
+
my ($agreement, $rule_matches) = $bt->get_agreement_with_invoice($invoice);
is($agreement, 15, "points for negative ap transaction ok");
is($invoice->netamount, '-20.00000', "$testname: netamount ok");
is($invoice->paid , '-23.80000', "$testname: paid ok");
is($bt->invoice_amount, '23.80000', "$testname: bt invoice amount for ap was assigned");
+ is($bt->amount, '23.80000', "$testname: bt amount for ap was assigned");
return $invoice;
};
is($invoice->amount , '136.85000', "$testname: amount ok");
is($invoice->netamount, '115.00000', "$testname: netamount ok");
- is($bt->amount, '-136.85000', "$testname: bt amount ok");
+ is($bt->amount, '-136.85000', "$testname: bt amount ok");
is($invoice->paid , '136.85000', "$testname: paid ok");
is($bt->invoice_amount, '-136.85000', "$testname: bt invoice amount for ap was assigned");
is($bt->invoice_amount , '0.00000' , "$testname: bt invoice amount was not assigned");
my $bt_controller = SL::Controller::BankTransaction->new;
- $::form->{dont_render_for_test} = 1;
- $::form->{filter}{bank_account} = $bank_account->id;
- my ( $bt_transactions, $proposals ) = $bt_controller->action_list;
+ my ( $bt_transactions, $proposals ) = $bt_controller->gather_bank_transactions_and_proposals(bank_account => $bank_account);
is(scalar(@$bt_transactions) , 1 , "$testname: one bank_transaction");
is($bt_transactions->[0]->{agreement}, 20 , "$testname: agreement == 20");
is($sei->amount , '119.00000' , "$testname: sepa export amount ok");
my $bt_controller = SL::Controller::BankTransaction->new;
- $::form->{dont_render_for_test} = 1;
- $::form->{filter}{bank_account} = $bank_account->id;
- my ( $bt_transactions, $proposals ) = $bt_controller->action_list;
+ my ( $bt_transactions, $proposals ) = $bt_controller->gather_bank_transactions_and_proposals(bank_account => $bank_account);
is(scalar(@$bt_transactions) , 1 , "$testname: one bank_transaction");
is($bt_transactions->[0]->{agreement}, 25 , "$testname: agreement == 25");
#nun sollten zwei gleichwertige Rechnungen $ar_transaction_1 und $ar_transaction_3 für $bt1 gefunden werden
#aber es darf keine Proposals geben mit mehreren Rechnungen
my $bt_controller = SL::Controller::BankTransaction->new;
- $::form->{dont_render_for_test} = 1;
- $::form->{filter}{bank_account} = $bank_account->id;
- my ( $bt_transactions, $proposals ) = $bt_controller->action_list;
+ my ( $bt_transactions, $proposals ) = $bt_controller->gather_bank_transactions_and_proposals(bank_account => $bank_account);
is(scalar(@$bt_transactions) , 2 , "$testname: two bank_transaction");
is(scalar(@$proposals) , 0 , "$testname: no proposals");
# Jetzt gibt es zwei Kontobewegungen mit gleichen Punkten für eine Rechnung.
# hier darf es auch keine Proposals geben
- ( $bt_transactions, $proposals ) = $bt_controller->action_list;
+ ( $bt_transactions, $proposals ) = $bt_controller->gather_bank_transactions_and_proposals(bank_account => $bank_account);
is(scalar(@$bt_transactions) , 2 , "$testname: two bank_transaction");
# odyn testfall - anforderungen so (noch) nicht in kivi
# hier darf es auch keine Proposals geben
$bt3->update_attributes( purpose => "fuer Rechnung salesinv10000");
- ( $bt_transactions, $proposals ) = $bt_controller->action_list;
+ ( $bt_transactions, $proposals ) = $bt_controller->gather_bank_transactions_and_proposals(bank_account => $bank_account);
is(scalar(@$bt_transactions) , 2 , "$testname: two bank_transaction");
# odyn testfall - anforderungen so (noch) nicht in kivi
# is(scalar(@$proposals) , 1 , "$testname: one proposal");
};
+sub test_closedto {
+ my $testname = 'closedto';
+
+ my $ar_transaction_1 = test_ar_transaction(invnumber => 'salesinv10000' , amount => 2912.00 );
+ my $bt1 = create_bank_transaction(record => $ar_transaction_1,
+ amount => $ar_transaction_1->amount,
+ purpose => "Rechnung10000 beinahe",
+ bank_chart_id => $bank->id,
+ ) or die "Couldn't create bank_transaction";
+
+ $bt1->valutadate(DateTime->new(year => 2019, month => 12, day => 30));
+ $bt1->save();
+
+ is($bt1->closed_period, 0, "$testname undefined closedto");
+
+ my $defaults = SL::DB::Manager::Default->get_all(limit => 1)->[0];
+ $defaults->closedto(DateTime->new(year => 2019, month => 12, day => 31));
+ $defaults->save();
+ $::instance_conf->reload->data;
+ $bt1->load();
+ is($bt1->closed_period, 1, "$testname defined and next date closedto");
+
+ $bt1->valutadate(DateTime->new(year => 2020, month => 1, day => 1));
+ $bt1->save();
+ $bt1->load();
+
+ is($bt1->closed_period, 0, "$testname defined closedto and next date valuta");
+ $defaults->closedto(undef);
+ $defaults->save();
+
+}
1;
projects / kivitendo-erp.git / blobdiff