-use Test::More tests => 130;
+use Test::More tests => 176;
use strict;
use Test::Exception;
use List::Util qw(sum);
+use SL::DB::AccTransaction;
use SL::DB::Buchungsgruppe;
use SL::DB::Currency;
use SL::DB::Customer;
use SL::DB::PurchaseInvoice;
use SL::DB::BankTransaction;
use SL::Controller::BankTransaction;
-use SL::Dev::ALL;
+use SL::Dev::ALL qw(:ALL);
use Data::Dumper;
my ($customer, $vendor, $currency_id, $unit, $tax, $tax7, $tax_9, $payment_terms, $bank_account);
test_partial_payment();
test_credit_note();
test_ap_transaction();
-test_neg_ap_transaction();
+test_neg_ap_transaction(invoice => 0);
+test_neg_ap_transaction(invoice => 1);
test_ap_payment_transaction();
test_ap_payment_part_transaction();
test_neg_sales_invoice();
-
+test_two_neg_ap_transaction();
+test_one_inv_and_two_invoices_with_skonto_exact();
test_bt_rule1();
test_sepa_export();
name => SL::DB::Manager::Chart->find_by(description => 'Bank')->description,
)->save;
- $customer = SL::Dev::CustomerVendor::create_customer(
- name => 'Test Customer',
+ $customer = new_customer(
+ name => 'Test Customer OLÉ S.L. Årdbärg AB',
iban => 'DE12500105170648489890',
bic => 'TESTBIC',
account_number => '648489890',
customernumber => 'CUST1704',
)->save;
- $payment_terms = SL::Dev::Payment::create_payment_terms;
+ $payment_terms = create_payment_terms();
- $vendor = SL::Dev::CustomerVendor::create_vendor(
+ $vendor = new_vendor(
name => 'Test Vendor',
payment_id => $payment_terms->id,
iban => 'DE12500105170648489890',
$ar_transaction = test_ar_transaction(invnumber => 'salesinv1');
- my $bt = SL::Dev::Payment::create_bank_transaction(record => $ar_transaction) or die "Couldn't create bank_transaction";
+ my $bt = create_bank_transaction(record => $ar_transaction) or die "Couldn't create bank_transaction";
$::form->{invoice_ids} = {
$bt->id => [ $ar_transaction->id ]
payment_id => $payment_terms->id,
);
- 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";
+ my $bt = 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 ]
my $ar_transaction_1 = test_ar_transaction(invnumber => 'salesinv_1');
my $ar_transaction_2 = test_ar_transaction(invnumber => 'salesinv_2');
- 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 $bt = 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");
is($ar_transaction_2->closed , 1 , "$testname: salesinv_2 is closed");
is($bt->invoice_amount , '238.00000' , "$testname: bt invoice amount was assigned");
-};
+}
+
+sub test_one_inv_and_two_invoices_with_skonto_exact {
+
+ my $testname = 'test_two_invoices_with_skonto_exact';
+
+ my $ar_transaction_1 = test_ar_transaction(invnumber => 'salesinv 1 skonto',
+ payment_id => $payment_terms->id,
+ );
+ my $ar_transaction_2 = test_ar_transaction(invnumber => 'salesinv 2 skonto',
+ payment_id => $payment_terms->id,
+ );
+ my $ar_transaction_3 = test_ar_transaction(invnumber => 'salesinv 3 no skonto');
+
+
+
+ my $bt = create_bank_transaction(record => $ar_transaction_1,
+ bank_chart_id => $bank->id,
+ amount => $ar_transaction_1->amount_less_skonto * 2 + $ar_transaction_3->amount
+ ) or die "Couldn't create bank_transaction";
+
+ $::form->{invoice_ids} = {
+ $bt->id => [ $ar_transaction_1->id, $ar_transaction_3->id, $ar_transaction_2->id]
+ };
+ $::form->{invoice_skontos} = {
+ $bt->id => [ 'with_skonto_pt', 'without_skonto', 'with_skonto_pt' ]
+ };
+
+ save_btcontroller_to_string();
+
+ $ar_transaction_1->load;
+ $ar_transaction_2->load;
+ $ar_transaction_3->load;
+ my $skonto_1 = SL::DB::Manager::AccTransaction->find_by(trans_id => $ar_transaction_1->id, chart_id => 162);
+ my $skonto_2 = SL::DB::Manager::AccTransaction->find_by(trans_id => $ar_transaction_2->id, chart_id => 162);
+ $bt->load;
+ is($skonto_1->amount , '-5.95000' , "$testname: salesinv 1 skonto was booked");
+ is($skonto_2->amount , '-5.95000' , "$testname: salesinv 2 skonto was booked");
+ is($ar_transaction_1->paid , '119.00000' , "$testname: salesinv 1 was paid");
+ is($ar_transaction_2->paid , '119.00000' , "$testname: salesinv 2 was paid");
+ is($ar_transaction_3->paid , '119.00000' , "$testname: salesinv 3 was paid");
+ is($ar_transaction_1->closed , 1 , "$testname: salesinv 1 skonto is closed");
+ is($ar_transaction_2->closed , 1 , "$testname: salesinv 2 skonto is closed");
+ is($ar_transaction_3->closed , 1 , "$testname: salesinv 2 skonto is closed");
+ is($bt->invoice_amount , '345.10000' , "$testname: bt invoice amount was assigned");
+
+}
sub test_overpayment {
$ar_transaction = test_ar_transaction(invnumber => 'salesinv overpaid');
# amount 135 > 119
- 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";
+ my $bt = 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 ]
$ar_transaction = test_ar_transaction(invnumber => 'salesinv overpaid partial');
- 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";
+ my $bt_1 = create_bank_transaction(record => $ar_transaction,
+ bank_chart_id => $bank->id,
+ amount => 10
+ ) or die "Couldn't create bank_transaction";
+ my $bt_2 = 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 ]
$ar_transaction = test_ar_transaction(invnumber => 'salesinv partial payment');
# amount 100 < 119
- 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";
+ my $bt = 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 $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(
+ my $part1 = new_part( partnumber => 'T4254')->save;
+ my $part2 = new_service(partnumber => 'Serv1')->save;
+ my $credit_note = 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),
+ invoiceitems => [ create_invoice_item(part => $part1, qty => 3, sellprice => 70),
+ create_invoice_item(part => $part2, qty => 10, sellprice => 50),
]
);
- my $bt = SL::Dev::Payment::create_bank_transaction(record => $credit_note,
+ my $bt = create_bank_transaction(record => $credit_note,
amount => $credit_note->amount,
bank_chart_id => $bank->id,
transdate => DateTime->today->add(days => 10),
sub test_neg_ap_transaction {
my (%params) = @_;
- my $testname = 'test_neg_ap_transaction';
+ my $testname = 'test_neg_ap_transaction' . $params{invoice} ? ' invoice booking' : ' credit booking';
my $netamount = -20;
my $amount = $::form->round_amount($netamount * 1.19,2);
my $invoice = SL::DB::PurchaseInvoice->new(
- invoice => 0,
+ invoice => $params{invoice} // 0,
invnumber => $params{invnumber} || 'test_neg_ap_transaction',
amount => $amount,
netamount => $netamount,
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 $bt = 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");
return $invoice;
};
+sub test_two_neg_ap_transaction {
+ my $testname='test_two_neg_ap_transaction';
+ my $netamount = -20;
+ my $amount = $::form->round_amount($netamount * 1.19,2);
+ my $invoice = SL::DB::PurchaseInvoice->new(
+ invoice => 0,
+ 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 $netamount_two = -1.14;
+ my $amount_two = $::form->round_amount($netamount_two * 1.19,2);
+ my $invoice_two = SL::DB::PurchaseInvoice->new(
+ invoice => 0,
+ invnumber => 'test_neg_ap_transaction_two',
+ amount => $amount_two,
+ netamount => $netamount_two,
+ transdate => $transdate1,
+ taxincluded => 0,
+ vendor_id => $vendor->id,
+ taxzone_id => $vendor->taxzone_id,
+ currency_id => $currency_id,
+ transactions => [],
+ notes => 'test_neg_ap_transaction_two',
+ );
+ $invoice_two->add_ap_amount_row(
+ amount => $invoice_two->netamount,
+ chart => $ap_amount_chart,
+ tax_id => $tax_9->id,
+ );
+
+ $invoice_two->create_ap_row(chart => $ap_chart);
+ $invoice_two->save;
+
+ is($invoice_two->netamount, -1.14 , "$testname: netamount ok");
+ is($invoice_two->amount , -1.36, "$testname: amount ok");
+
+
+ my $bt = create_bank_transaction(record => $invoice_two,
+ amount => $invoice_two->amount + $invoice->amount,
+ bank_chart_id => $bank->id,
+ transdate => DateTime->today->add(days => 10),
+ );
+ # my ($agreement, $rule_matches) = $bt->get_agreement_with_invoice($invoice_two);
+ # is($agreement, 15, "points for negative ap transaction ok");
+
+ $::form->{invoice_ids} = {
+ $bt->id => [ $invoice->id, $invoice_two->id ]
+ };
+
+ save_btcontroller_to_string();
+
+ $invoice->load;
+ $invoice_two->load;
+ $bt->load;
+
+ is($invoice->amount , '-23.80000', "$testname: first inv amount ok");
+ is($invoice->netamount, '-20.00000', "$testname: first inv netamount ok");
+ is($invoice->paid , '-23.80000', "$testname: first inv paid ok");
+ is($invoice_two->amount , '-1.36000', "$testname: second inv amount ok");
+ is($invoice_two->netamount, '-1.14000', "$testname: second inv netamount ok");
+ is($invoice_two->paid , '-1.36000', "$testname: second inv paid ok");
+ is($bt->invoice_amount, '25.16000', "$testname: bt invoice amount for both invoices were assigned");
+
+
+ return ($invoice, $invoice_two);
+};
sub test_ap_payment_transaction {
my (%params) = @_;
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),
- );
+ my $bt = 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 ]
};
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-100,
- bank_chart_id => $bank->id,
- transdate => DateTime->today->add(days => 10),
- );
+ my $bt = create_bank_transaction(record => $invoice,
+ amount => $invoice->amount-100,
+ bank_chart_id => $bank->id,
+ transdate => DateTime->today->add(days => 10),
+ );
$::form->{invoice_ids} = {
$bt->id => [ $invoice->id ]
};
is($invoice->paid , '36.85000', "$testname: paid ok");
is($bt->invoice_amount, '-36.85000', "$testname: bt invoice amount for ap was assigned");
- my $bt2 = SL::Dev::Payment::create_bank_transaction(record => $invoice,
- amount => 100,
- bank_chart_id => $bank->id,
- transdate => DateTime->today->add(days => 10),
- );
+ my $bt2 = create_bank_transaction(record => $invoice,
+ amount => 100,
+ bank_chart_id => $bank->id,
+ transdate => DateTime->today->add(days => 10),
+ );
$::form->{invoice_ids} = {
$bt2->id => [ $invoice->id ]
};
my $testname = 'test_neg_sales_invoice';
- my $part1 = SL::Dev::Part::create_part( partnumber => 'Funkenhaube öhm')->save;
- my $part2 = SL::Dev::Part::create_service(partnumber => 'Service-Pauschale Pasch!')->save;
+ my $part1 = new_part( partnumber => 'Funkenhaube öhm')->save;
+ my $part2 = new_service(partnumber => 'Service-Pauschale Pasch!')->save;
- my $neg_sales_inv = SL::Dev::Record::create_sales_invoice(
+ my $neg_sales_inv = create_sales_invoice(
invnumber => '20172201',
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),
+ invoiceitems => [ create_invoice_item(part => $part1, qty => 3, sellprice => 70),
+ create_invoice_item(part => $part2, qty => 10, sellprice => -50),
]
);
- my $bt = SL::Dev::Payment::create_bank_transaction(record => $neg_sales_inv,
+ my $bt = create_bank_transaction(record => $neg_sales_inv,
amount => $neg_sales_inv->amount,
bank_chart_id => $bank->id,
transdate => DateTime->today,
$ar_transaction = test_ar_transaction(invnumber => 'bt_rule1');
- my $bt = SL::Dev::Payment::create_bank_transaction(record => $ar_transaction) or die "Couldn't create bank_transaction";
+ my $bt = create_bank_transaction(record => $ar_transaction) or die "Couldn't create bank_transaction";
$ar_transaction->load;
$bt->load;
$ar_transaction = test_ar_transaction(invnumber => 'sepa1');
- my $bt = SL::Dev::Payment::create_bank_transaction(record => $ar_transaction) or die "Couldn't create bank_transaction";
- my $se = SL::Dev::Payment::create_sepa_export();
- my $sei = SL::Dev::Payment::create_sepa_export_item(
+ my $bt = create_bank_transaction(record => $ar_transaction) or die "Couldn't create bank_transaction";
+ my $se = create_sepa_export();
+ my $sei = create_sepa_export_item(
chart_id => $bank->id,
ar_id => $ar_transaction->id,
sepa_export_id => $se->id,
vc_depositor => $customer->depositor,
amount => $ar_transaction->amount,
);
+ require SL::SEPA::XML;
+ my $sepa_xml = SL::SEPA::XML->new('company' => $customer->name,
+ 'creditor_id' => "id",
+ 'src_charset' => 'UTF-8',
+ 'message_id' => "test",
+ 'grouped' => 1,
+ 'collection' => 1,
+ );
+ is($sepa_xml->{company} , 'Test Customer OLE S.L. Ardbaerg AB');
$ar_transaction->load;
$bt->load;
projects / kivitendo-erp.git / blobdiff