-use Test::More tests => 176;
+use Test::More tests => 210;
use strict;
use SL::Dev::ALL qw(:ALL);
use Data::Dumper;
-my ($customer, $vendor, $currency_id, $unit, $tax, $tax7, $tax_9, $payment_terms, $bank_account);
+my ($customer, $vendor, $currency_id, $unit, $tax, $tax0, $tax7, $tax_9, $payment_terms, $bank_account);
my ($transdate1, $transdate2, $currency);
my ($ar_chart,$bank,$ar_amount_chart, $ap_chart, $ap_amount_chart);
my ($ar_transaction, $ap_transaction);
SL::DB::Manager::Currency->delete_all(where => [ name => 'CUR' ]);
};
+my $bt_controller;
+
sub save_btcontroller_to_string {
my $output;
open(my $outputFH, '>', \$output) or die;
my $oldFH = select $outputFH;
- my $bt_controller = SL::Controller::BankTransaction->new;
+ $bt_controller = SL::Controller::BankTransaction->new;
$bt_controller->action_save_invoices;
select $oldFH;
test_overpayment_with_partialpayment();
test_overpayment();
+reset_state();
test_skonto_exact();
test_two_invoices();
test_partial_payment();
test_neg_sales_invoice();
test_two_neg_ap_transaction();
test_one_inv_and_two_invoices_with_skonto_exact();
-test_bt_rule1();
+test_bt_error();
+
+reset_state();
test_sepa_export();
+reset_state();
+test_bt_rule1();
+reset_state();
+test_two_banktransactions();
# remove all created data at end of test
clear_up();
$tax = SL::DB::Manager::Tax->find_by(taxkey => 3, rate => 0.19, %{ $params{tax} }) || croak "No tax";
$tax7 = SL::DB::Manager::Tax->find_by(taxkey => 2, rate => 0.07) || croak "No tax for 7\%";
- $tax_9 = SL::DB::Manager::Tax->find_by(taxkey => 9, rate => 0.19, %{ $params{tax} }) || croak "No tax";
+ $tax_9 = SL::DB::Manager::Tax->find_by(taxkey => 9, rate => 0.19, %{ $params{tax} }) || croak "No tax for 19\%";
+ $tax0 = SL::DB::Manager::Tax->find_by(taxkey => 0, rate => 0.0) || croak "No tax for 0\%";
$currency_id = $::instance_conf->get_currency_id;
sub test_ar_transaction {
my (%params) = @_;
- my $netamount = 100;
- my $amount = $params{amount} || $::form->round_amount(100 * 1.19,2);
+ my $netamount = $params{amount} || 100;
+ my $amount = $::form->round_amount($netamount * 1.19,2);
my $invoice = SL::DB::Invoice->new(
invoice => 0,
invnumber => $params{invnumber} || undef, # let it use its own invnumber
amount => $amount,
netamount => $netamount,
transdate => $transdate1,
- taxincluded => 0,
+ taxincluded => $params{taxincluded } || 0,
customer_id => $customer->id,
taxzone_id => $customer->taxzone_id,
currency_id => $currency_id,
$invoice->add_ar_amount_row(
amount => $invoice->netamount,
chart => $ar_amount_chart,
- tax_id => $tax->id,
+ tax_id => $params{tax_id} || $tax->id,
);
$invoice->create_ar_row(chart => $ar_chart);
$invoice->save;
is($invoice->currency_id , $currency_id , 'currency_id has been saved');
- is($invoice->netamount , 100 , 'ar amount has been converted');
- is($invoice->amount , 119 , 'ar amount has been converted');
+ is($invoice->netamount , $netamount , 'ar amount has been converted');
+ is($invoice->amount , $amount , 'ar amount has been converted');
is($invoice->taxincluded , 0 , 'ar transaction doesn\'t have taxincluded');
- is(SL::DB::Manager::AccTransaction->find_by(chart_id => $ar_amount_chart->id , trans_id => $invoice->id)->amount , '100.00000' , $ar_amount_chart->accno . ': has been converted for currency');
- is(SL::DB::Manager::AccTransaction->find_by(chart_id => $ar_chart->id , trans_id => $invoice->id)->amount , '-119.00000' , $ar_chart->accno . ': has been converted for currency');
-
+ if ( $netamount == 100 ) {
+ is(SL::DB::Manager::AccTransaction->find_by(chart_id => $ar_amount_chart->id , trans_id => $invoice->id)->amount , '100.00000' , $ar_amount_chart->accno . ': has been converted for currency');
+ is(SL::DB::Manager::AccTransaction->find_by(chart_id => $ar_chart->id , trans_id => $invoice->id)->amount , '-119.00000' , $ar_chart->accno . ': has been converted for currency');
+ }
return $invoice;
};
$invoice->add_ap_amount_row(
amount => $invoice->netamount,
chart => $ap_amount_chart,
- tax_id => $tax_9->id,
+ tax_id => $params{tax_id} || $tax_9->id,
);
$invoice->create_ap_row(chart => $ap_chart);
};
+sub test_bt_error {
+
+ my $testname = 'test_rollback_error';
+ # without type with_free_skonto the helper function (Payment.pm) looks ugly but not
+ # breakable
+
+ $ar_transaction = test_ar_transaction(invnumber => 'salesinv skonto',
+ payment_id => $payment_terms->id,
+ taxincluded => 0,
+ amount => 168.58 / 1.19,
+ );
+
+ my $bt = create_bank_transaction(record => $ar_transaction,
+ bank_chart_id => $bank->id,
+ amount => 160.15,
+ ) or die "Couldn't create bank_transaction";
+ $::form->{invoice_ids} = {
+ $bt->id => [ $ar_transaction->id ]
+ };
+ $::form->{invoice_skontos} = {
+ $bt->id => [ 'with_skonto_pt' ]
+ };
+
+ is($ar_transaction->paid , '0' , "$testname: salesinv is not paid");
+
+ # generate an error for testing rollback mechanism
+ my $saved_skonto_sales_chart_id = $tax->skonto_sales_chart_id;
+ $tax->skonto_sales_chart_id(undef);
+ $tax->save;
+
+ save_btcontroller_to_string();
+ my @bt_errors = @{ $bt_controller->problems };
+ is(substr($bt_errors[0]->{message},0,38), 'Kein Skontokonto für Steuerschlüssel 3', "$testname: Fehlermeldung ok");
+ # set original value
+ $tax->skonto_sales_chart_id($saved_skonto_sales_chart_id);
+ $tax->save;
+
+ $ar_transaction->load;
+ $bt->load;
+ is($ar_transaction->paid , '0.00000' , "$testname: salesinv was not paid");
+ is($bt->invoice_amount , '0.00000' , "$testname: bt invoice amount was not assigned");
+
+};
+
sub test_two_invoices {
my $testname = 'test_two_invoices';
$ar_transaction_2->load;
$bt->load;
- is($ar_transaction_1->paid , '119.00000' , "$testname: salesinv_1 was paid");
+ is($ar_transaction_1->paid , '119.00000' , "$testname: salesinv_1 wcsv_import_reportsas paid");
is($ar_transaction_1->closed , 1 , "$testname: salesinv_1 is closed");
is($ar_transaction_2->paid , '119.00000' , "$testname: salesinv_2 was paid");
is($ar_transaction_2->closed , 1 , "$testname: salesinv_2 is closed");
my $bt_controller = SL::Controller::BankTransaction->new;
$::form->{dont_render_for_test} = 1;
$::form->{filter}{bank_account} = $bank_account->id;
- my $bt_transactions = $bt_controller->action_list;
+ my ( $bt_transactions, $proposals ) = $bt_controller->action_list;
is(scalar(@$bt_transactions) , 1 , "$testname: one bank_transaction");
is($bt_transactions->[0]->{agreement}, 20 , "$testname: agreement == 20");
my $match = join ( ' ',@{$bt_transactions->[0]->{rule_matches}});
#print "rule_matches='".$match."'\n";
is($match,
- "remote_account_number(3) exact_amount(4) own_invnumber_in_purpose(5) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus0(3) ",
+ "remote_account_number(3) exact_amount(4) own_invoice_in_purpose(5) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus0(3) ",
"$testname: rule_matches ok");
$bt->invoice_amount($bt->amount);
$bt->save;
my $bt_controller = SL::Controller::BankTransaction->new;
$::form->{dont_render_for_test} = 1;
$::form->{filter}{bank_account} = $bank_account->id;
- my $bt_transactions = $bt_controller->action_list;
+ my ( $bt_transactions, $proposals ) = $bt_controller->action_list;
is(scalar(@$bt_transactions) , 1 , "$testname: one bank_transaction");
is($bt_transactions->[0]->{agreement}, 25 , "$testname: agreement == 25");
my $match = join ( ' ',@{$bt_transactions->[0]->{rule_matches}});
is($match,
- "remote_account_number(3) exact_amount(4) own_invnumber_in_purpose(5) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus0(3) sepa_export_item(5) ",
+ "remote_account_number(3) exact_amount(4) own_invoice_in_purpose(5) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus0(3) sepa_export_item(5) ",
+ "$testname: rule_matches ok");
+};
+
+sub test_two_banktransactions {
+
+ my $testname = 'two_banktransactions';
+
+ 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";
+
+ my $bt2 = create_bank_transaction(record => $ar_transaction_1,
+ amount => $ar_transaction_1->amount + 0.01,
+ purpose => "sicher salesinv20000 vielleicht",
+ bank_chart_id => $bank->id,
+ ) or die "Couldn't create bank_transaction";
+
+ my ($agreement1, $rule_matches1) = $bt1->get_agreement_with_invoice($ar_transaction_1);
+ is($agreement1, 19, "bt1 19 points for ar_transaction_1 in $testname ok");
+ #print "rule_matches1=".$rule_matches1."\n";
+ is($rule_matches1,
+ "remote_account_number(3) exact_amount(4) own_invnumber_in_purpose(4) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus0(3) ",
"$testname: rule_matches ok");
+ my ($agreement2, $rule_matches2) = $bt2->get_agreement_with_invoice($ar_transaction_1);
+ is($agreement2, 11, "bt2 11 points for ar_transaction_1 in $testname ok");
+ is($rule_matches2,
+ "remote_account_number(3) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus0(3) ",
+ "$testname: rule_matches ok");
+
+ my $ar_transaction_2 = test_ar_transaction(invnumber => 'salesinv20000' , amount => 2912.01 );
+ my $ar_transaction_3 = test_ar_transaction(invnumber => 'zweitemit10000', amount => 2912.00 );
+ ($agreement1, $rule_matches1) = $bt1->get_agreement_with_invoice($ar_transaction_2);
+
+ is($agreement1, 11, "bt1 11 points for ar_transaction_2 in $testname ok");
+
+ ($agreement2, $rule_matches2) = $bt2->get_agreement_with_invoice($ar_transaction_2);
+ is($agreement2, 20, "bt2 20 points for ar_transaction_2 in $testname ok");
+
+ ($agreement2, $rule_matches2) = $bt2->get_agreement_with_invoice($ar_transaction_1);
+ is($agreement2, 11, "bt2 11 points for ar_transaction_1 in $testname ok");
+
+ my $bt3 = create_bank_transaction(record => $ar_transaction_3,
+ amount => $ar_transaction_3->amount,
+ purpose => "sicher Rechnung10000 vielleicht",
+ bank_chart_id => $bank->id,
+ ) or die "Couldn't create bank_transaction";
+
+ my ($agreement3, $rule_matches3) = $bt3->get_agreement_with_invoice($ar_transaction_3);
+ is($agreement3, 19, "bt3 19 points for ar_transaction_3 in $testname ok");
+
+ $bt2->delete;
+ $ar_transaction_2->delete;
+
+ #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;
+
+ is(scalar(@$bt_transactions) , 2 , "$testname: two bank_transaction");
+ is(scalar(@$proposals) , 0 , "$testname: no proposals");
+
+ $ar_transaction_3->delete;
+
+ # 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;
+
+ is(scalar(@$bt_transactions) , 2 , "$testname: two bank_transaction");
+ is(scalar(@$proposals) , 0 , "$testname: no proposals");
+
+ # Jetzt gibt es zwei Kontobewegungen für eine Rechnung.
+ # eine Bewegung bekommt mehr Punkte
+ # hier darf es auch keine Proposals geben
+ $bt3->update_attributes( purpose => "fuer Rechnung salesinv10000");
+
+ ( $bt_transactions, $proposals ) = $bt_controller->action_list;
+
+ is(scalar(@$bt_transactions) , 2 , "$testname: two bank_transaction");
+ is(scalar(@$proposals) , 1 , "$testname: one proposal");
+
};
projects / kivitendo-erp.git / blobdiff