-use Test::More;
+use Test::More tests => 89;
use strict;
use SL::DB::Buchungsgruppe;
use SL::DB::Currency;
-use SL::DB::Exchangerate;
use SL::DB::Customer;
use SL::DB::Vendor;
-use SL::DB::Employee;
use SL::DB::Invoice;
-use SL::DB::Part;
use SL::DB::Unit;
+use SL::DB::Part;
use SL::DB::TaxZone;
use SL::DB::BankAccount;
use SL::DB::PaymentTerm;
use SL::DB::PurchaseInvoice;
use SL::DB::BankTransaction;
use SL::Controller::BankTransaction;
+use SL::Dev::ALL;
use Data::Dumper;
-my ($customer, $vendor, $currency_id, @parts, $unit, $employee, $tax, $tax7, $tax_9, $taxzone, $payment_terms, $bank_account);
+my ($customer, $vendor, $currency_id, $unit, $tax, $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);
sub clear_up {
-
+
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::Currency->delete_all(where => [ name => 'CUR' ]);
};
+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->action_save_invoices;
+
+ select $oldFH;
+ close $outputFH;
+ return $output;
+}
# starting test:
Support::TestSetup::login();
+clear_up();
reset_state(); # initialise customers/vendors/bank/currency/...
test1();
test_skonto_exact();
test_two_invoices();
test_partial_payment();
-
+test_credit_note();
+test_neg_ap_transaction();
+test_ap_transaction();
+test_ap_payment_transaction();
# remove all created data at end of test
-# clear_up();
+clear_up();
done_testing();
sub reset_state {
my %params = @_;
- $params{$_} ||= {} for qw(unit customer part tax vendor);
+ $params{$_} ||= {} for qw(unit customer tax vendor);
clear_up();
$transdate1 = DateTime->today;
$transdate2 = DateTime->today->add(days => 5);
- $employee = SL::DB::Manager::Employee->current || croak "No employee";
$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\%";
- $taxzone = SL::DB::Manager::TaxZone->find_by( description => 'Inland') || croak "No taxzone";
$tax_9 = SL::DB::Manager::Tax->find_by(taxkey => 9, rate => 0.19, %{ $params{tax} }) || croak "No tax";
$currency_id = $::instance_conf->get_currency_id;
name => SL::DB::Manager::Chart->find_by(description => 'Bank')->description,
)->save;
- $customer = SL::DB::Customer->new(
+ $customer = SL::Dev::CustomerVendor::create_customer(
name => 'Test Customer',
- currency_id => $currency_id,
- taxzone_id => $taxzone->id,
iban => 'DE12500105170648489890',
bic => 'TESTBIC',
account_number => '648489890',
mandate_date_of_signature => $transdate1,
mandator_id => 'foobar',
bank => 'Geizkasse',
+ bank_code => 'G1235',
depositor => 'Test Customer',
- %{ $params{customer} }
)->save;
- $payment_terms = SL::DB::PaymentTerm->new(
- description => 'payment',
- description_long => 'payment',
- terms_netto => '30',
- terms_skonto => '5',
- percent_skonto => '0.05',
- auto_calculation => 1,
- )->save;
-
- $vendor = SL::DB::Vendor->new(
- name => 'Test Vendor',
- currency_id => $currency_id,
- taxzone_id => $taxzone->id,
- payment_id => $payment_terms->id,
- iban => 'DE12500105170648489890',
- bic => 'TESTBIC',
- account_number => '648489890',
- bank => 'Geizkasse',
- depositor => 'Test Vendor',
- %{ $params{vendor} }
+ $payment_terms = SL::Dev::Payment::create_payment_terms;
+
+ $vendor = SL::Dev::CustomerVendor::create_vendor(
+ name => 'Test Vendor',
+ payment_id => $payment_terms->id,
+ iban => 'DE12500105170648489890',
+ bic => 'TESTBIC',
+ account_number => '648489890',
+ bank => 'Geizkasse',
+ bank_code => 'G1235',
+ depositor => 'Test Vendor',
)->save;
$ar_chart = SL::DB::Manager::Chart->find_by( accno => '1400' ); # Forderungen
my $netamount = 100;
my $amount = $::form->round_amount($netamount * 1.19,2);
my $invoice = SL::DB::PurchaseInvoice->new(
- invoice => 0,
- invnumber => $params{invnumber} || 'test_ap_transaction',
- amount => $amount,
- netamount => $netamount,
- transdate => $transdate1,
- taxincluded => 0,
- vendor_id => $vendor->id,
- taxzone_id => $vendor->taxzone_id,
- currency_id => $currency_id,
- transactions => [],
- notes => 'test_ap_transaction',
+ invoice => 0,
+ invnumber => $params{invnumber} || 'test_ap_transaction',
+ amount => $amount,
+ netamount => $netamount,
+ transdate => $transdate1,
+ taxincluded => 0,
+ vendor_id => $vendor->id,
+ taxzone_id => $vendor->taxzone_id,
+ currency_id => $currency_id,
+ transactions => [],
+ notes => 'test_ap_transaction',
);
$invoice->add_ap_amount_row(
amount => $invoice->netamount,
$ar_transaction = test_ar_transaction(invnumber => 'salesinv1');
- my $bt = $ar_transaction->create_bank_transaction or die "Couldn't create bank_transaction";
+ my $bt = SL::Dev::Payment::create_bank_transaction(record => $ar_transaction) or die "Couldn't create bank_transaction";
$::form->{invoice_ids} = {
- $bt->id => [ $ar_transaction->id ]
- };
-
- my $bt_controller = SL::Controller::BankTransaction->new;
- $bt_controller->action_save_invoices;
+ $bt->id => [ $ar_transaction->id ]
+ };
+
+ save_btcontroller_to_string();
$ar_transaction->load;
$bt->load;
payment_id => $payment_terms->id,
);
- my $bt = $ar_transaction->create_bank_transaction(amount => $ar_transaction->amount_less_skonto) or die "Couldn't create bank_transaction";
+ my $bt = SL::Dev::Payment::create_bank_transaction(record => $ar_transaction,
+ bank_chart_id => $bank->id,
+ amount => $ar_transaction->amount_less_skonto
+ ) or die "Couldn't create bank_transaction";
$::form->{invoice_ids} = {
- $bt->id => [ $ar_transaction->id ]
- };
+ $bt->id => [ $ar_transaction->id ]
+ };
$::form->{invoice_skontos} = {
- $bt->id => [ 'with_skonto_pt' ]
- };
-
- my $bt_controller = SL::Controller::BankTransaction->new;
- $bt_controller->action_save_invoices;
+ $bt->id => [ 'with_skonto_pt' ]
+ };
+
+ save_btcontroller_to_string();
$ar_transaction->load;
$bt->load;
my $ar_transaction_1 = test_ar_transaction(invnumber => 'salesinv_1');
my $ar_transaction_2 = test_ar_transaction(invnumber => 'salesinv_2');
- my $bt = $ar_transaction_1->create_bank_transaction(amount => ($ar_transaction_1->amount + $ar_transaction_2->amount),
- purpose => "Rechnungen " . $ar_transaction_1->invnumber . " und " . $ar_transaction_2->invnumber,
- ) or die "Couldn't create bank_transaction";
+ my $bt = SL::Dev::Payment::create_bank_transaction(record => $ar_transaction_1,
+ amount => ($ar_transaction_1->amount + $ar_transaction_2->amount),
+ purpose => "Rechnungen " . $ar_transaction_1->invnumber . " und " . $ar_transaction_2->invnumber,
+ bank_chart_id => $bank->id,
+ ) or die "Couldn't create bank_transaction";
+
+ my ($agreement, $rule_matches) = $bt->get_agreement_with_invoice($ar_transaction_1);
+ is($agreement, 16, "points for ar_transaction_1 in test_two_invoices ok");
$::form->{invoice_ids} = {
- $bt->id => [ $ar_transaction_1->id, $ar_transaction_2->id ]
- };
-
- my $bt_controller = SL::Controller::BankTransaction->new;
- $bt_controller->action_save_invoices;
+ $bt->id => [ $ar_transaction_1->id, $ar_transaction_2->id ]
+ };
+
+ save_btcontroller_to_string();
$ar_transaction_1->load;
$ar_transaction_2->load;
$ar_transaction = test_ar_transaction(invnumber => 'salesinv overpaid');
# amount 135 > 119
- my $bt = $ar_transaction->create_bank_transaction(amount => 135) or die "Couldn't create bank_transaction";
+ my $bt = SL::Dev::Payment::create_bank_transaction(record => $ar_transaction,
+ bank_chart_id => $bank->id,
+ amount => 135
+ ) or die "Couldn't create bank_transaction";
$::form->{invoice_ids} = {
- $bt->id => [ $ar_transaction->id ]
- };
-
- my $bt_controller = SL::Controller::BankTransaction->new;
- $bt_controller->action_save_invoices;
+ $bt->id => [ $ar_transaction->id ]
+ };
+
+ save_btcontroller_to_string();
$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");
+{ 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)");
};
$ar_transaction = test_ar_transaction(invnumber => 'salesinv overpaid partial');
- my $bt_1 = $ar_transaction->create_bank_transaction(amount => 10) or die "Couldn't create bank_transaction";
- my $bt_2 = $ar_transaction->create_bank_transaction(amount => 119,
- transdate => DateTime->today->add(days => 5),
- ) or die "Couldn't create bank_transaction";
+ my $bt_1 = SL::Dev::Payment::create_bank_transaction(record => $ar_transaction,
+ bank_chart_id => $bank->id,
+ amount => 10
+ ) or die "Couldn't create bank_transaction";
+ my $bt_2 = SL::Dev::Payment::create_bank_transaction(record => $ar_transaction,
+ amount => 119,
+ transdate => DateTime->today->add(days => 5),
+ bank_chart_id => $bank->id,
+ ) or die "Couldn't create bank_transaction";
$::form->{invoice_ids} = {
- $bt_1->id => [ $ar_transaction->id ]
- };
- my $bt_controller_1 = SL::Controller::BankTransaction->new;
- $bt_controller_1->action_save_invoices;
+ $bt_1->id => [ $ar_transaction->id ]
+ };
+ save_btcontroller_to_string();
$::form->{invoice_ids} = {
- $bt_2->id => [ $ar_transaction->id ]
- };
- my $bt_controller_2 = SL::Controller::BankTransaction->new;
- $bt_controller_2->action_save_invoices;
+ $bt_2->id => [ $ar_transaction->id ]
+ };
+ save_btcontroller_to_string();
$ar_transaction->load;
$bt_1->load;
$ar_transaction = test_ar_transaction(invnumber => 'salesinv partial payment');
# amount 100 < 119
- my $bt = $ar_transaction->create_bank_transaction(amount => 100) or die "Couldn't create bank_transaction";
+ my $bt = SL::Dev::Payment::create_bank_transaction(record => $ar_transaction,
+ bank_chart_id => $bank->id,
+ amount => 100
+ ) or die "Couldn't create bank_transaction";
$::form->{invoice_ids} = {
- $bt->id => [ $ar_transaction->id ]
- };
-
- my $bt_controller = SL::Controller::BankTransaction->new;
- $bt_controller->action_save_invoices;
+ $bt->id => [ $ar_transaction->id ]
+ };
+
+ save_btcontroller_to_string();
$ar_transaction->load;
$bt->load;
};
+sub test_credit_note {
+
+ my $testname = 'test_credit_note';
+
+ my $part1 = SL::Dev::Part::create_part( partnumber => 'T4254')->save;
+ my $part2 = SL::Dev::Part::create_service(partnumber => 'Serv1')->save;
+ my $credit_note = SL::Dev::Record::create_credit_note(
+ invnumber => 'cn 1',
+ customer => $customer,
+ taxincluded => 0,
+ invoiceitems => [ SL::Dev::Record::create_invoice_item(part => $part1, qty => 3, sellprice => 70),
+ SL::Dev::Record::create_invoice_item(part => $part2, qty => 10, sellprice => 50),
+ ]
+ );
+ my $bt = SL::Dev::Payment::create_bank_transaction(record => $credit_note,
+ amount => $credit_note->amount,
+ bank_chart_id => $bank->id,
+ transdate => DateTime->today->add(days => 10),
+ );
+ my ($agreement, $rule_matches) = $bt->get_agreement_with_invoice($credit_note);
+ is($agreement, 13, "points for credit note ok");
+ is($rule_matches, 'remote_account_number(3) exact_amount(4) wrong_sign(-1) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus14(2) ', "rules_matches for credit note ok");
+
+ $::form->{invoice_ids} = {
+ $bt->id => [ $credit_note->id ]
+ };
+
+ save_btcontroller_to_string();
+
+ $credit_note->load;
+ $bt->load;
+ is($credit_note->amount , '-844.90000', "$testname: amount ok");
+ is($credit_note->netamount, '-710.00000', "$testname: netamount ok");
+ is($credit_note->paid , '-844.90000', "$testname: paid ok");
+}
+
+sub test_neg_ap_transaction {
+ my (%params) = @_;
+ my $testname = 'test_neg_ap_transaction';
+ my $netamount = -20;
+ my $amount = $::form->round_amount($netamount * 1.19,2);
+ my $invoice = SL::DB::PurchaseInvoice->new(
+ invoice => 0,
+ invnumber => $params{invnumber} || 'test_neg_ap_transaction',
+ amount => $amount,
+ netamount => $netamount,
+ transdate => $transdate1,
+ taxincluded => 0,
+ vendor_id => $vendor->id,
+ taxzone_id => $vendor->taxzone_id,
+ currency_id => $currency_id,
+ transactions => [],
+ notes => 'test_neg_ap_transaction',
+ );
+ $invoice->add_ap_amount_row(
+ amount => $invoice->netamount,
+ chart => $ap_amount_chart,
+ tax_id => $tax_9->id,
+ );
+
+ $invoice->create_ap_row(chart => $ap_chart);
+ $invoice->save;
+
+ is($invoice->netamount, -20 , "$testname: netamount ok");
+ is($invoice->amount , -23.8, "$testname: amount ok");
+
+ my $bt = SL::Dev::Payment::create_bank_transaction(record => $invoice,
+ amount => $invoice->amount,
+ 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");
+
+ $::form->{invoice_ids} = {
+ $bt->id => [ $invoice->id ]
+ };
+
+ save_btcontroller_to_string();
+
+ $invoice->load;
+ $bt->load;
+
+ is($invoice->amount , '-23.80000', "$testname: amount 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");
+
+ return $invoice;
+};
+
+sub test_ap_payment_transaction {
+ my (%params) = @_;
+ my $testname = 'test_ap_two_transaction';
+ my $netamount = 115;
+ my $amount = $::form->round_amount($netamount * 1.19,2);
+ my $invoice = SL::DB::PurchaseInvoice->new(
+ invoice => 0,
+ invnumber => $params{invnumber} || 'test_ap_two_transaction',
+ amount => $amount,
+ netamount => $netamount,
+ transdate => $transdate1,
+ taxincluded => 0,
+ vendor_id => $vendor->id,
+ taxzone_id => $vendor->taxzone_id,
+ currency_id => $currency_id,
+ transactions => [],
+ notes => 'test_ap_transaction',
+ );
+ $invoice->add_ap_amount_row(
+ amount => $invoice->netamount,
+ chart => $ap_amount_chart,
+ tax_id => $tax_9->id,
+ );
+
+ $invoice->create_ap_row(chart => $ap_chart);
+ $invoice->save;
+
+ is($invoice->netamount, 115 , "$testname: netamount ok");
+ is($invoice->amount , 136.85, "$testname: amount ok");
+
+ my $bt = SL::Dev::Payment::create_bank_transaction(record => $invoice,
+ amount => $invoice->amount,
+ bank_chart_id => $bank->id,
+ transdate => DateTime->today->add(days => 10),
+ );
+ $::form->{invoice_ids} = {
+ $bt->id => [ $invoice->id ]
+ };
+
+ save_btcontroller_to_string();
+
+ $invoice->load;
+ $bt->load;
+
+ 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($invoice->paid , '136.85000', "$testname: paid ok");
+ is($bt->invoice_amount, '-136.85000', "$testname: bt invoice amount for ap was assigned");
+
+ return $invoice;
+};
1;
projects / kivitendo-erp.git / blobdiff