X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=t%2Fbank%2Fbank_transactions.t;h=0220c951e441a033c40a56a8b06b026249827a77;hb=421ed1f7d71c242bf8286919dc00e4ae879a56fe;hp=d2376a22ac59e1b63aa5d2cf6afb6fc55260faa8;hpb=503fabbf4b2c77b2aab2dc1940f1eec0842cd490;p=kivitendo-erp.git diff --git a/t/bank/bank_transactions.t b/t/bank/bank_transactions.t index d2376a22a..0220c951e 100644 --- a/t/bank/bank_transactions.t +++ b/t/bank/bank_transactions.t @@ -1,4 +1,4 @@ -use Test::More tests => 130; +use Test::More tests => 138; use strict; @@ -23,7 +23,7 @@ use SL::DB::PaymentTerm; 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); @@ -76,7 +76,8 @@ test_two_invoices(); 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(); @@ -117,8 +118,8 @@ sub reset_state { 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', @@ -130,9 +131,9 @@ sub reset_state { 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', @@ -237,7 +238,7 @@ sub test1 { $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 ] @@ -261,10 +262,10 @@ sub test_skonto_exact { 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 ] @@ -290,11 +291,11 @@ sub test_two_invoices { 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"); @@ -324,10 +325,10 @@ 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 ] @@ -354,15 +355,15 @@ sub test_overpayment_with_partialpayment { $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 ] @@ -391,10 +392,10 @@ sub test_partial_payment { $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 ] @@ -414,17 +415,17 @@ 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( + 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), @@ -448,11 +449,11 @@ sub test_credit_note { 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, @@ -476,10 +477,10 @@ sub test_neg_ap_transaction { 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"); @@ -531,11 +532,11 @@ sub test_ap_payment_transaction { 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 ] }; @@ -584,11 +585,11 @@ sub test_ap_payment_part_transaction { 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 ] }; @@ -604,11 +605,11 @@ sub test_ap_payment_part_transaction { 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 ] }; @@ -630,18 +631,18 @@ sub test_neg_sales_invoice { 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, @@ -667,7 +668,7 @@ sub test_bt_rule1 { $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; @@ -697,9 +698,9 @@ sub test_sepa_export { $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, @@ -709,6 +710,15 @@ sub test_sepa_export { 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;