X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=t%2Fdb_helper%2Fpayment.t;h=508bfc9b8c3a4bf800fab825012d0d42856aaa45;hb=1edebcf0aed748b75fa68e46aad70dbeeadfdd85;hp=9eb2d9d77270c7ba1e04799f06703ca80ba5aeda;hpb=98b64fe1e380c232428d63cea0eb5f44b1d1a2c3;p=kivitendo-erp.git diff --git a/t/db_helper/payment.t b/t/db_helper/payment.t index 9eb2d9d77..508bfc9b8 100644 --- a/t/db_helper/payment.t +++ b/t/db_helper/payment.t @@ -1,4 +1,5 @@ -use Test::More; +use strict; +use Test::More tests => 197; use strict; @@ -10,6 +11,9 @@ use Support::TestSetup; use Test::Exception; use List::Util qw(sum); +use SL::Dev::Record qw(create_invoice_item create_sales_invoice create_credit_note); +use SL::Dev::CustomerVendor qw(new_customer new_vendor); +use SL::Dev::Part qw(new_part); use SL::DB::Buchungsgruppe; use SL::DB::Currency; use SL::DB::Exchangerate; @@ -29,11 +33,64 @@ my ($customer, $vendor, $currency_id, @parts, $buchungsgruppe, $buchungsgruppe7, my ($transdate1, $transdate2, $transdate3, $transdate4, $currency, $exchangerate, $exchangerate2, $exchangerate3, $exchangerate4); my ($ar_chart,$bank,$ar_amount_chart, $ap_chart, $ap_amount_chart, $fxloss_chart, $fxgain_chart); -my $ALWAYS_RESET = 1; +my $purchase_invoice_counter = 0; # used for generating purchase invnumber -my $reset_state_counter = 0; +Support::TestSetup::login(); + +init_state(); + +# test cases: without_skonto +test_default_invoice_one_item_19_without_skonto(); +test_default_invoice_two_items_19_7_tax_with_skonto(); +test_default_invoice_two_items_19_7_without_skonto(); +test_default_invoice_two_items_19_7_without_skonto_incomplete_payment(); +test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments(); +test_default_purchase_invoice_two_charts_19_7_without_skonto(); +test_default_purchase_invoice_two_charts_19_7_tax_partial_unrounded_payment_without_skonto(); +test_default_invoice_one_item_19_without_skonto_overpaid(); +test_credit_note_two_items_19_7_tax_tax_not_included(); + +# test cases: difference_as_skonto +test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto(); +test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto_1cent(); +test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto_2cent(); +test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto(); +test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto_1cent(); +test_default_purchase_invoice_two_charts_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto(); + +# test cases: with_skonto_pt +test_default_invoice_two_items_19_7_tax_with_skonto_50_50(); +test_default_invoice_four_items_19_7_tax_with_skonto_4x_25(); +test_default_invoice_four_items_19_7_tax_with_skonto_4x_25_multiple(); +test_default_purchase_invoice_two_charts_19_7_with_skonto(); +test_default_invoice_four_items_19_7_tax_with_skonto_4x_25_tax_included(); +test_default_invoice_two_items_19_7_tax_with_skonto_tax_included(); + +# test payment of ar and ap transactions with currency and tax included/not included +# exchangerate = 1.33333 +test_ar_currency_tax_not_included_and_payment(); +test_ar_currency_tax_included(); +test_ap_currency_tax_not_included_and_payment(); +test_ap_currency_tax_included(); + +test_ar_currency_tax_not_included_and_payment_2(); # exchangerate 0.8 +test_ar_currency_tax_not_included_and_payment_2_credit_note(); # exchangerate 0.8 + +test_ap_currency_tax_not_included_and_payment_2(); # two exchangerates, with fx_gain_loss +test_ap_currency_tax_not_included_and_payment_2_credit_note(); # two exchangerates, with fx_gain_loss + +is(SL::DB::Manager::Invoice->get_all_count(), 21, "number of invoices at end of tests ok"); +TODO: { + local $TODO = "currently this test fails because the code writing the invoice is buggy, the calculation of skonto is correct"; + my ($acc_trans_sum) = selectfirst_array_query($::form, $currency->db->dbh, 'SELECT SUM(amount) FROM acc_trans'); + is($acc_trans_sum, '0.00000', "sum of all acc_trans at end of all tests is 0"); +} + +# remove all created data at end of test +clear_up(); + +done_testing(); -my $purchase_invoice_counter = 0; # used for generating purchase invnumber sub clear_up { SL::DB::Manager::InvoiceItem->delete_all(all => 1); @@ -48,13 +105,9 @@ sub clear_up { SL::DB::Manager::Currency->delete_all(where => [ name => 'CUR' ]); }; -sub reset_state { +sub init_state { my %params = @_; - return if $reset_state_counter; - - $params{$_} ||= {} for qw(buchungsgruppe unit customer part tax vendor); - clear_up(); $transdate1 = DateTime->today; @@ -62,15 +115,15 @@ sub reset_state { $transdate3 = DateTime->today->add(days => 2); $transdate4 = DateTime->today->add(days => 3); - $buchungsgruppe = SL::DB::Manager::Buchungsgruppe->find_by(description => 'Standard 19%', %{ $params{buchungsgruppe} }) || croak "No accounting group"; - $buchungsgruppe7 = SL::DB::Manager::Buchungsgruppe->find_by(description => 'Standard 7%') || croak "No accounting group for 7\%"; - $unit = SL::DB::Manager::Unit->find_by(name => 'kg', %{ $params{unit} }) || croak "No unit"; - $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"; - # $tax7 = SL::DB::Manager::Tax->find_by(taxkey => 2, rate => 0.07) || croak "No tax for 7\%"; + $buchungsgruppe = SL::DB::Manager::Buchungsgruppe->find_by(description => 'Standard 19%') || croak "No accounting group"; + $buchungsgruppe7 = SL::DB::Manager::Buchungsgruppe->find_by(description => 'Standard 7%') || croak "No accounting group for 7\%"; + $unit = SL::DB::Manager::Unit->find_by(name => 'kg') || croak "No unit"; + $employee = SL::DB::Manager::Employee->current || croak "No employee"; + $tax = SL::DB::Manager::Tax->find_by(taxkey => 3, rate => 0.19) || 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) || croak "No tax"; + # $tax7 = SL::DB::Manager::Tax->find_by(taxkey => 2, rate => 0.07) || croak "No tax for 7\%"; $currency_id = $::instance_conf->get_currency_id; @@ -106,11 +159,10 @@ sub reset_state { currency_id => $currency->id, )->save; - $customer = SL::DB::Customer->new( + $customer = new_customer( name => 'Test Customer', currency_id => $currency_id, taxzone_id => $taxzone->id, - %{ $params{customer} } )->save; $bank_account = SL::DB::BankAccount->new( @@ -132,53 +184,48 @@ sub reset_state { auto_calculation => 1, )->save; - $vendor = SL::DB::Vendor->new( + $vendor = new_vendor( name => 'Test Vendor', currency_id => $currency_id, taxzone_id => $taxzone->id, payment_id => $payment_terms->id, - %{ $params{vendor} } )->save; @parts = (); - push @parts, SL::DB::Part->new( + push @parts, new_part( partnumber => 'T4254', description => 'Fourty-two fifty-four', lastcost => 1.93, sellprice => 2.34, - part_type => 'part', buchungsgruppen_id => $buchungsgruppe->id, unit => $unit->name, %{ $params{part1} } )->save; - push @parts, SL::DB::Part->new( + push @parts, new_part( partnumber => 'T0815', description => 'Zero EIGHT fifteeN @ 7%', lastcost => 5.473, sellprice => 9.714, - part_type => 'part', buchungsgruppen_id => $buchungsgruppe7->id, unit => $unit->name, %{ $params{part2} } )->save; - push @parts, SL::DB::Part->new( + push @parts, new_part( partnumber => '19%', description => 'Testware 19%', lastcost => 0, sellprice => 50, - part_type => 'part', buchungsgruppen_id => $buchungsgruppe->id, unit => $unit->name, %{ $params{part3} } )->save; - push @parts, SL::DB::Part->new( + push @parts, new_part( partnumber => '7%', description => 'Testware 7%', lastcost => 0, sellprice => 50, - part_type => 'part', buchungsgruppen_id => $buchungsgruppe7->id, unit => $unit->name, %{ $params{part4} } @@ -189,26 +236,6 @@ sub reset_state { $bank = SL::DB::Manager::Chart->find_by( accno => '1200' ); # Bank $ar_amount_chart = SL::DB::Manager::Chart->find_by( accno => '8400' ); # Erlöse $ap_amount_chart = SL::DB::Manager::Chart->find_by( accno => '3400' ); # Wareneingang 19% - - $reset_state_counter++; -} - -sub new_invoice { - my %params = @_; - - return SL::DB::Invoice->new( - customer_id => $customer->id, - currency_id => $currency_id, - employee_id => $employee->id, - salesman_id => $employee->id, - gldate => $transdate1, - taxzone_id => $taxzone->id, - transdate => $transdate1, - invoice => 1, - type => 'invoice', - %params, - ); - } sub new_purchase_invoice { @@ -295,21 +322,6 @@ sub new_purchase_invoice { return $purchase_invoice; } -sub new_item { - my (%params) = @_; - - my $part = delete($params{part}) || $parts[0]; - - return SL::DB::InvoiceItem->new( - parts_id => $part->id, - lastcost => $part->lastcost, - sellprice => $part->sellprice, - description => $part->description, - unit => $part->unit, - %params, - ); -} - sub number_of_payments { my $invoice = shift; @@ -336,19 +348,16 @@ sub total_amount { # test 1 sub test_default_invoice_one_item_19_without_skonto() { - reset_state() if $ALWAYS_RESET; - - my $item = new_item(qty => 2.5); - my $invoice = new_invoice( + my $title = 'default invoice, one item, 19% tax, without_skonto'; + my $item = create_invoice_item(part => $parts[0], qty => 2.5); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item ], payment_id => $payment_terms->id, ); - $invoice->post; my $purchase_invoice = new_purchase_invoice(); - # default values my %params = ( chart_id => $bank_account->chart_id, transdate => DateTime->today_local->to_kivitendo @@ -362,8 +371,6 @@ sub test_default_invoice_one_item_19_without_skonto() { my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, one item, 19% tax, without_skonto'; - is($invoice->netamount, 5.85, "${title}: netamount"); is($invoice->amount, 6.96, "${title}: amount"); is($paid_amount, -6.96, "${title}: paid amount"); @@ -374,15 +381,14 @@ sub test_default_invoice_one_item_19_without_skonto() { } sub test_default_invoice_one_item_19_without_skonto_overpaid() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, one item, 19% tax, without_skonto'; - my $item = new_item(qty => 2.5); - my $invoice = new_invoice( + my $item = create_invoice_item(part => $parts[0], qty => 2.5); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item ], payment_id => $payment_terms->id, ); - $invoice->post; my $purchase_invoice = new_purchase_invoice(); @@ -402,8 +408,6 @@ sub test_default_invoice_one_item_19_without_skonto_overpaid() { my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, one item, 19% tax, without_skonto'; - is($invoice->netamount, 5.85, "${title}: netamount"); is($invoice->amount, 6.96, "${title}: amount"); is($paid_amount, -6.96, "${title}: paid amount"); @@ -416,16 +420,15 @@ sub test_default_invoice_one_item_19_without_skonto_overpaid() { # test 2 sub test_default_invoice_two_items_19_7_tax_with_skonto() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, two items, 19/7% tax with_skonto_pt'; - my $item1 = new_item(qty => 2.5); - my $item2 = new_item(qty => 1.2, part => $parts[1]); - my $invoice = new_invoice( + my $item1 = create_invoice_item(part => $parts[0], qty => 2.5); + my $item2 = create_invoice_item(part => $parts[1], qty => 1.2); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item1, $item2 ], - payment_id => $payment_terms->id, + payment_id => $payment_terms->id, ); - $invoice->post; # default values my %params = ( chart_id => $bank_account->chart_id, @@ -440,8 +443,6 @@ sub test_default_invoice_two_items_19_7_tax_with_skonto() { my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, two items, 19/7% tax with_skonto_pt'; - is($invoice->netamount, 5.85 + 11.66, "${title}: netamount"); is($invoice->amount, 6.96 + 12.48, "${title}: amount"); is($paid_amount, -19.44, "${title}: paid amount"); @@ -451,16 +452,15 @@ sub test_default_invoice_two_items_19_7_tax_with_skonto() { } sub test_default_invoice_two_items_19_7_tax_with_skonto_tax_included() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, two items, 19/7% tax with_skonto_pt'; - my $item1 = new_item(qty => 2.5); - my $item2 = new_item(qty => 1.2, part => $parts[1]); - my $invoice = new_invoice( + my $item1 = create_invoice_item(part => $parts[0], qty => 2.5); + my $item2 = create_invoice_item(part => $parts[1], qty => 1.2); + my $invoice = create_sales_invoice( taxincluded => 1, invoiceitems => [ $item1, $item2 ], - payment_id => $payment_terms->id, + payment_id => $payment_terms->id, ); - $invoice->post; # default values my %params = ( chart_id => $bank_account->chart_id, @@ -475,30 +475,29 @@ sub test_default_invoice_two_items_19_7_tax_with_skonto_tax_included() { my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, two items, 19/7% tax with_skonto_pt'; - is($invoice->netamount, 15.82, "${title}: netamount"); is($invoice->amount, 17.51, "${title}: amount"); is($paid_amount, -17.51, "${title}: paid amount"); is($invoice->paid, 17.51, "${title}: paid"); is($number_of_payments, 3, "${title}: 3 AR_paid bookings"); - { local $TODO = "currently this test fails because the code writing the invoice is buggy, the calculation of skonto is correct"; + +TODO: { + local $TODO = "currently this test fails because the code writing the invoice is buggy, the calculation of skonto is correct"; is($total, 0, "${title}: even balance"); } } # test 3 : two items, without skonto sub test_default_invoice_two_items_19_7_without_skonto() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, two items, 19/7% tax without skonto'; - my $item1 = new_item(qty => 2.5); - my $item2 = new_item(qty => 1.2, part => $parts[1]); - my $invoice = new_invoice( + my $item1 = create_invoice_item(part => $parts[0], qty => 2.5); + my $item2 = create_invoice_item(part => $parts[1], qty => 1.2); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item1, $item2 ], - payment_id => $payment_terms->id, + payment_id => $payment_terms->id, ); - $invoice->post; # default values my %params = ( chart_id => $bank_account->chart_id, @@ -513,8 +512,6 @@ sub test_default_invoice_two_items_19_7_without_skonto() { my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, two items, 19/7% tax without skonto'; - is($invoice->netamount, 5.85 + 11.66, "${title}: netamount"); is($invoice->amount, 6.96 + 12.48, "${title}: amount"); is($paid_amount, -19.44, "${title}: paid amount"); @@ -525,16 +522,15 @@ sub test_default_invoice_two_items_19_7_without_skonto() { # test 4 sub test_default_invoice_two_items_19_7_without_skonto_incomplete_payment() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, two items, 19/7% tax without skonto incomplete payment'; - my $item1 = new_item(qty => 2.5); - my $item2 = new_item(qty => 1.2, part => $parts[1]); - my $invoice = new_invoice( + my $item1 = create_invoice_item(part => $parts[0], qty => 2.5); + my $item2 = create_invoice_item(part => $parts[1], qty => 1.2); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item1, $item2 ], - payment_id => $payment_terms->id, + payment_id => $payment_terms->id, ); - $invoice->post; $invoice->pay_invoice( amount => '9.44', payment_type => 'without_skonto', @@ -545,8 +541,6 @@ sub test_default_invoice_two_items_19_7_without_skonto_incomplete_payment() { my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, two items, 19/7% tax without skonto incomplete payment'; - is($invoice->netamount, 5.85 + 11.66, "${title}: netamount"); is($invoice->amount, 6.96 + 12.48, "${title}: amount"); is($paid_amount, -9.44, "${title}: paid amount"); @@ -557,16 +551,15 @@ sub test_default_invoice_two_items_19_7_without_skonto_incomplete_payment() { # test 5 sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, two items, 19/7% tax not included'; - my $item1 = new_item(qty => 2.5); - my $item2 = new_item(qty => 1.2, part => $parts[1]); - my $invoice = new_invoice( + my $item1 = create_invoice_item(part => $parts[0], qty => 2.5); + my $item2 = create_invoice_item(part => $parts[1], qty => 1.2); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item1, $item2 ], - payment_id => $payment_terms->id, + payment_id => $payment_terms->id, ); - $invoice->post; $invoice->pay_invoice( amount => '9.44', payment_type => 'without_skonto', @@ -581,8 +574,6 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments() { my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, two items, 19/7% tax not included'; - is($invoice->netamount, 5.85 + 11.66, "${title}: netamount"); is($invoice->amount, 6.96 + 12.48, "${title}: amount"); is($paid_amount, -19.44, "${title}: paid amount"); @@ -594,16 +585,15 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments() { # test 6 sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, two items, 19/7% tax not included'; - my $item1 = new_item(qty => 2.5); - my $item2 = new_item(qty => 1.2, part => $parts[1]); - my $invoice = new_invoice( + my $item1 = create_invoice_item(part => $parts[0], qty => 2.5); + my $item2 = create_invoice_item(part => $parts[1], qty => 1.2); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item1, $item2 ], - payment_id => $payment_terms->id, + payment_id => $payment_terms->id, ); - $invoice->post; $invoice->pay_invoice( amount => '9.44', payment_type => 'without_skonto', @@ -624,8 +614,6 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fin my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, two items, 19/7% tax not included'; - is($invoice->netamount, 5.85 + 11.66, "${title}: netamount"); is($invoice->amount, 6.96 + 12.48, "${title}: amount"); is($paid_amount, -19.44, "${title}: paid amount"); @@ -636,21 +624,20 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fin } sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto_1cent() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, two items, 19/7% tax not included'; # if there is only one cent left there can only be one skonto booking, the # error handling should choose the highest amount, which is the 7% account # (11.66) rather than the 19% account (5.85). The actual tax amount is # higher for the 19% case, though (1.11 compared to 0.82) - my $item1 = new_item(qty => 2.5); - my $item2 = new_item(qty => 1.2, part => $parts[1]); - my $invoice = new_invoice( + my $item1 = create_invoice_item(part => $parts[0], qty => 2.5); + my $item2 = create_invoice_item(part => $parts[1], qty => 1.2); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item1, $item2 ], - payment_id => $payment_terms->id, + payment_id => $payment_terms->id, ); - $invoice->post; $invoice->pay_invoice( amount => '19.42', payment_type => 'without_skonto', @@ -666,8 +653,6 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fi my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, two items, 19/7% tax not included'; - is($invoice->netamount, 5.85 + 11.66, "${title}: netamount"); is($invoice->amount, 6.96 + 12.48, "${title}: amount"); is($paid_amount, -19.44, "${title}: paid amount"); @@ -678,17 +663,16 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fi } sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto_2cent() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, two items, 19/7% tax not included'; # if there are two cents left there will be two skonto bookings, 1 cent each - my $item1 = new_item(qty => 2.5); - my $item2 = new_item(qty => 1.2, part => $parts[1]); - my $invoice = new_invoice( + my $item1 = create_invoice_item(part => $parts[0], qty => 2.5); + my $item2 = create_invoice_item(part => $parts[1], qty => 1.2); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item1, $item2 ], - payment_id => $payment_terms->id, + payment_id => $payment_terms->id, ); - $invoice->post; $invoice->pay_invoice( amount => '19.42', payment_type => 'without_skonto', @@ -704,8 +688,6 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fin my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, two items, 19/7% tax not included'; - is($invoice->netamount, 5.85 + 11.66, "${title}: netamount"); is($invoice->amount, 6.96 + 12.48, "${title}: amount"); is($paid_amount, -19.44, "${title}: paid amount"); @@ -716,15 +698,14 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fin } sub test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, one item, 19% tax, without_skonto'; - my $item = new_item(qty => 2.5); - my $invoice = new_invoice( + my $item = create_invoice_item(part => $parts[0], qty => 2.5); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item ], payment_id => $payment_terms->id, ); - $invoice->post; # default values my %params = ( chart_id => $bank_account->chart_id, @@ -746,8 +727,6 @@ sub test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, one item, 19% tax, without_skonto'; - is($invoice->netamount, 5.85, "${title}: netamount"); is($invoice->amount, 6.96, "${title}: amount"); is($paid_amount, -6.96, "${title}: paid amount"); @@ -758,15 +737,14 @@ sub test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto } sub test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto_1cent() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, one item, 19% tax, without_skonto'; - my $item = new_item(qty => 2.5); - my $invoice = new_invoice( + my $item = create_invoice_item(part => $parts[0], qty => 2.5); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item ], payment_id => $payment_terms->id, ); - $invoice->post; # default values my %params = ( chart_id => $bank_account->chart_id, @@ -784,8 +762,6 @@ sub test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, one item, 19% tax, without_skonto'; - is($invoice->netamount, 5.85, "${title}: netamount"); is($invoice->amount, 6.96, "${title}: amount"); is($paid_amount, -6.96, "${title}: paid amount"); @@ -797,7 +773,7 @@ sub test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto # test 3 : two items, without skonto sub test_default_purchase_invoice_two_charts_19_7_without_skonto() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, two items, 19/7% tax without skonto'; my $purchase_invoice = new_purchase_invoice(); @@ -813,8 +789,6 @@ sub test_default_purchase_invoice_two_charts_19_7_without_skonto() { my ($number_of_payments, $paid_amount) = number_of_payments($purchase_invoice); my $total = total_amount($purchase_invoice); - my $title = 'default invoice, two items, 19/7% tax without skonto'; - is($paid_amount, 226, "${title}: paid amount"); is($number_of_payments, 1, "${title}: 1 AP_paid bookings"); is($total, 0, "${title}: even balance"); @@ -822,7 +796,7 @@ sub test_default_purchase_invoice_two_charts_19_7_without_skonto() { } sub test_default_purchase_invoice_two_charts_19_7_with_skonto() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, two items, 19/7% tax without skonto'; my $purchase_invoice = new_purchase_invoice(); @@ -838,8 +812,6 @@ sub test_default_purchase_invoice_two_charts_19_7_with_skonto() { my ($number_of_payments, $paid_amount) = number_of_payments($purchase_invoice); my $total = total_amount($purchase_invoice); - my $title = 'default invoice, two items, 19/7% tax without skonto'; - is($paid_amount, 226, "${title}: paid amount"); is($number_of_payments, 3, "${title}: 1 AP_paid bookings"); is($total, 0, "${title}: even balance"); @@ -847,8 +819,9 @@ sub test_default_purchase_invoice_two_charts_19_7_with_skonto() { } sub test_default_purchase_invoice_two_charts_19_7_tax_partial_unrounded_payment_without_skonto() { + my $title = 'default purchase_invoice, two charts, 19/7% tax multiple payments with final difference as skonto'; + # check whether unrounded amounts passed via $params{amount} are rounded for without_skonto case - reset_state() if $ALWAYS_RESET; my $purchase_invoice = new_purchase_invoice(); $purchase_invoice->pay_invoice( amount => ( $purchase_invoice->amount / 3 * 2), @@ -859,8 +832,6 @@ sub test_default_purchase_invoice_two_charts_19_7_tax_partial_unrounded_payment_ my ($number_of_payments, $paid_amount) = number_of_payments($purchase_invoice); my $total = total_amount($purchase_invoice); - my $title = 'default purchase_invoice, two charts, 19/7% tax multiple payments with final difference as skonto'; - is($paid_amount, 150.67, "${title}: paid amount"); is($number_of_payments, 1, "${title}: 1 AP_paid bookings"); is($total, 0, "${title}: even balance"); @@ -868,7 +839,7 @@ sub test_default_purchase_invoice_two_charts_19_7_tax_partial_unrounded_payment_ sub test_default_purchase_invoice_two_charts_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto() { - reset_state() if $ALWAYS_RESET; + my $title = 'default purchase_invoice, two charts, 19/7% tax multiple payments with final difference as skonto'; my $purchase_invoice = new_purchase_invoice(); @@ -894,8 +865,6 @@ sub test_default_purchase_invoice_two_charts_19_7_tax_without_skonto_multiple_pa my ($number_of_payments, $paid_amount) = number_of_payments($purchase_invoice); my $total = total_amount($purchase_invoice); - my $title = 'default purchase_invoice, two charts, 19/7% tax multiple payments with final difference as skonto'; - is($paid_amount, 226, "${title}: paid amount"); is($number_of_payments, 4, "${title}: 1 AP_paid bookings"); is($total, 0, "${title}: even balance"); @@ -904,16 +873,15 @@ sub test_default_purchase_invoice_two_charts_19_7_tax_without_skonto_multiple_pa # test sub test_default_invoice_two_items_19_7_tax_with_skonto_50_50() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, two items, 19/7% tax with_skonto_pt 50/50'; - my $item1 = new_item(qty => 1, part => $parts[2]); - my $item2 = new_item(qty => 1, part => $parts[3]); - my $invoice = new_invoice( + my $item1 = create_invoice_item(part => $parts[2], qty => 1); + my $item2 = create_invoice_item(part => $parts[3], qty => 1); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item1, $item2 ], - payment_id => $payment_terms->id, + payment_id => $payment_terms->id, ); - $invoice->post; # default values my %params = ( chart_id => $bank_account->chart_id, @@ -928,8 +896,6 @@ sub test_default_invoice_two_items_19_7_tax_with_skonto_50_50() { my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, two items, 19/7% tax with_skonto_pt 50/50'; - is($invoice->netamount, 100, "${title}: netamount"); is($invoice->amount, 113, "${title}: amount"); is($paid_amount, -113, "${title}: paid amount"); @@ -940,18 +906,17 @@ sub test_default_invoice_two_items_19_7_tax_with_skonto_50_50() { # test sub test_default_invoice_four_items_19_7_tax_with_skonto_4x_25() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, four items, 19/7% tax with_skonto_pt 4x25'; - my $item1 = new_item(qty => 0.5, part => $parts[2]); - my $item2 = new_item(qty => 0.5, part => $parts[3]); - my $item3 = new_item(qty => 0.5, part => $parts[2]); - my $item4 = new_item(qty => 0.5, part => $parts[3]); - my $invoice = new_invoice( + my $item1 = create_invoice_item(part => $parts[2], qty => 0.5); + my $item2 = create_invoice_item(part => $parts[3], qty => 0.5); + my $item3 = create_invoice_item(part => $parts[2], qty => 0.5); + my $item4 = create_invoice_item(part => $parts[3], qty => 0.5); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item1, $item2, $item3, $item4 ], - payment_id => $payment_terms->id, + payment_id => $payment_terms->id, ); - $invoice->post; # default values my %params = ( chart_id => $bank_account->chart_id, @@ -966,8 +931,6 @@ sub test_default_invoice_four_items_19_7_tax_with_skonto_4x_25() { my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, four items, 19/7% tax with_skonto_pt 4x25'; - is($invoice->netamount , 100 , "${title}: netamount"); is($invoice->amount , 113 , "${title}: amount"); is($paid_amount , -113 , "${title}: paid amount"); @@ -977,18 +940,17 @@ sub test_default_invoice_four_items_19_7_tax_with_skonto_4x_25() { } sub test_default_invoice_four_items_19_7_tax_with_skonto_4x_25_tax_included() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, four items, 19/7% tax with_skonto_pt 4x25'; - my $item1 = new_item(qty => 0.5, part => $parts[2]); - my $item2 = new_item(qty => 0.5, part => $parts[3]); - my $item3 = new_item(qty => 0.5, part => $parts[2]); - my $item4 = new_item(qty => 0.5, part => $parts[3]); - my $invoice = new_invoice( + my $item1 = create_invoice_item(part => $parts[2], qty => 0.5); + my $item2 = create_invoice_item(part => $parts[3], qty => 0.5); + my $item3 = create_invoice_item(part => $parts[2], qty => 0.5); + my $item4 = create_invoice_item(part => $parts[3], qty => 0.5); + my $invoice = create_sales_invoice( taxincluded => 1, invoiceitems => [ $item1, $item2, $item3, $item4 ], - payment_id => $payment_terms->id, + payment_id => $payment_terms->id, ); - $invoice->post; # default values my %params = ( chart_id => $bank_account->chart_id, @@ -1003,31 +965,29 @@ sub test_default_invoice_four_items_19_7_tax_with_skonto_4x_25_tax_included() { my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, four items, 19/7% tax with_skonto_pt 4x25'; - is($invoice->netamount, 88.75, "${title}: netamount"); is($invoice->amount, 100, "${title}: amount"); is($paid_amount, -100, "${title}: paid amount"); is($invoice->paid, 100, "${title}: paid"); is($number_of_payments, 3, "${title}: 3 AR_paid bookings"); - { local $TODO = "currently this test fails because the code writing the invoice is buggy, the calculation of skonto is correct"; +TODO: { + local $TODO = "currently this test fails because the code writing the invoice is buggy, the calculation of skonto is correct"; is($total, 0, "${title}: even balance"); } } sub test_default_invoice_four_items_19_7_tax_with_skonto_4x_25_multiple() { - reset_state() if $ALWAYS_RESET; + my $title = 'default invoice, four items, 19/7% tax with_skonto_pt 4x25'; - my $item1 = new_item(qty => 0.5, part => $parts[2]); - my $item2 = new_item(qty => 0.5, part => $parts[3]); - my $item3 = new_item(qty => 0.5, part => $parts[2]); - my $item4 = new_item(qty => 0.5, part => $parts[3]); - my $invoice = new_invoice( + my $item1 = create_invoice_item(part => $parts[2], qty => 0.5); + my $item2 = create_invoice_item(part => $parts[3], qty => 0.5); + my $item3 = create_invoice_item(part => $parts[2], qty => 0.5); + my $item4 = create_invoice_item(part => $parts[3], qty => 0.5); + my $invoice = create_sales_invoice( taxincluded => 0, invoiceitems => [ $item1, $item2, $item3, $item4 ], - payment_id => $payment_terms->id, + payment_id => $payment_terms->id, ); - $invoice->post; $invoice->pay_invoice( amount => '90', payment_type => 'without_skonto', @@ -1042,8 +1002,6 @@ sub test_default_invoice_four_items_19_7_tax_with_skonto_4x_25_multiple() { my ($number_of_payments, $paid_amount) = number_of_payments($invoice); my $total = total_amount($invoice); - my $title = 'default invoice, four items, 19/7% tax with_skonto_pt 4x25'; - is($invoice->netamount, 100, "${title}: netamount"); is($invoice->amount, 113, "${title}: amount"); is($paid_amount, -113, "${title}: paid amount"); @@ -1053,6 +1011,8 @@ sub test_default_invoice_four_items_19_7_tax_with_skonto_4x_25_multiple() { } sub test_ar_currency_tax_not_included_and_payment { + my $title = 'test_ar_currency_tax_not_included_and_payment_2'; + my $netamount = $::form->round_amount(75 * $exchangerate->sell,2); # 75 in CUR, 100.00 in EUR my $amount = $::form->round_amount($netamount * 1.19,2); # 100 in CUR, 119.00 in EUR my $invoice = SL::DB::Invoice->new( @@ -1103,6 +1063,8 @@ sub test_ar_currency_tax_not_included_and_payment { }; sub test_ar_currency_tax_included { + my $title = 'test_ar_currency_tax_included'; + # we want the acc_trans amount to be 100 my $amount = $::form->round_amount(75 * $exchangerate->sell * 1.19); my $netamount = $::form->round_amount($amount / 1.19,2); @@ -1142,6 +1104,8 @@ sub test_ar_currency_tax_included { }; sub test_ap_currency_tax_not_included_and_payment { + my $title = 'test_ap_currency_tax_not_included_and_payment'; + my $netamount = $::form->round_amount(75 * $exchangerate->buy,2); # 75 in CUR, 100.00 in EUR my $amount = $::form->round_amount($netamount * 1.19,2); # 100 in CUR, 119.00 in EUR my $invoice = SL::DB::PurchaseInvoice->new( @@ -1188,6 +1152,8 @@ sub test_ap_currency_tax_not_included_and_payment { }; sub test_ap_currency_tax_included { + my $title = 'test_ap_currency_tax_included'; + # we want the acc_trans amount to be 100 my $amount = $::form->round_amount(75 * $exchangerate->buy * 1.19); my $netamount = $::form->round_amount($amount / 1.19,2); @@ -1229,6 +1195,7 @@ sub test_ap_currency_tax_included { sub test_ar_currency_tax_not_included_and_payment_2 { my $title = 'test_ar_currency_tax_not_included_and_payment_2'; + my $netamount = $::form->round_amount(125 * $exchangerate2->sell,2); # 125.00 in CUR, 100.00 in EUR my $amount = $::form->round_amount($netamount * 1.19,2); # 148.75 in CUR, 119.00 in EUR my $invoice = SL::DB::Invoice->new( @@ -1288,6 +1255,8 @@ sub test_ar_currency_tax_not_included_and_payment_2 { }; sub test_ar_currency_tax_not_included_and_payment_2_credit_note { + my $title = 'test_ar_currency_tax_not_included_and_payment_2_credit_note'; + my $netamount = $::form->round_amount(-125 * $exchangerate2->sell,2); # 125.00 in CUR, 100.00 in EUR my $amount = $::form->round_amount($netamount * 1.19,2); # 148.75 in CUR, 119.00 in EUR my $invoice = SL::DB::Invoice->new( @@ -1339,6 +1308,7 @@ sub test_ar_currency_tax_not_included_and_payment_2_credit_note { sub test_ap_currency_tax_not_included_and_payment_2 { my $title = 'test_ap_currency_tax_not_included_and_payment_2'; + my $netamount = $::form->round_amount(125 * $exchangerate2->sell,2); # 125.00 in CUR, 100.00 in EUR my $amount = $::form->round_amount($netamount * 1.19,2); # 148.75 in CUR, 119.00 in EUR my $invoice = SL::DB::PurchaseInvoice->new( @@ -1403,6 +1373,7 @@ sub test_ap_currency_tax_not_included_and_payment_2 { sub test_ap_currency_tax_not_included_and_payment_2_credit_note { my $title = 'test_ap_currency_tax_not_included_and_payment_2_credit_note'; + my $netamount = $::form->round_amount(-125 * $exchangerate2->sell,2); # 125.00 in CUR, 100.00 in EUR my $amount = $::form->round_amount($netamount * 1.19,2); # 148.75 in CUR, 119.00 in EUR my $invoice = SL::DB::PurchaseInvoice->new( @@ -1463,54 +1434,35 @@ sub test_ap_currency_tax_not_included_and_payment_2_credit_note { is(total_amount($invoice), 0, "$title: even balance"); }; -Support::TestSetup::login(); +sub test_credit_note_two_items_19_7_tax_tax_not_included { + my $title = 'test_credit_note_two_items_19_7_tax_tax_not_included'; -# test cases: without_skonto -test_default_invoice_one_item_19_without_skonto(); -test_default_invoice_two_items_19_7_tax_with_skonto(); -test_default_invoice_two_items_19_7_without_skonto(); -test_default_invoice_two_items_19_7_without_skonto_incomplete_payment(); -test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments(); -test_default_purchase_invoice_two_charts_19_7_without_skonto(); -test_default_purchase_invoice_two_charts_19_7_tax_partial_unrounded_payment_without_skonto(); -test_default_invoice_one_item_19_without_skonto_overpaid(); - -# test cases: difference_as_skonto -test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto(); -test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto_1cent(); -test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto_2cent(); -test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto(); -test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto_1cent(); -test_default_purchase_invoice_two_charts_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto(); + my $item1 = create_invoice_item(part => $parts[0], qty => 5); + my $item2 = create_invoice_item(part => $parts[1], qty => 3); + my $invoice = create_credit_note( + invnumber => 'cn1', + taxincluded => 0, + invoiceitems => [ $item1, $item2 ], + ); -# test cases: with_skonto_pt -test_default_invoice_two_items_19_7_tax_with_skonto_50_50(); -test_default_invoice_four_items_19_7_tax_with_skonto_4x_25(); -test_default_invoice_four_items_19_7_tax_with_skonto_4x_25_multiple(); -test_default_purchase_invoice_two_charts_19_7_with_skonto(); -test_default_invoice_four_items_19_7_tax_with_skonto_4x_25_tax_included(); -test_default_invoice_two_items_19_7_tax_with_skonto_tax_included(); + # default values + my %params = ( chart_id => $bank_account->chart_id, + transdate => DateTime->today_local->to_kivitendo, + ); -# test payment of ar and ap transactions with currency and tax included/not included -# exchangerate = 1.33333 -test_ar_currency_tax_not_included_and_payment(); -test_ar_currency_tax_included(); -test_ap_currency_tax_not_included_and_payment(); -test_ap_currency_tax_included(); + $params{amount} = $invoice->amount, -test_ar_currency_tax_not_included_and_payment_2(); # exchangerate 0.8 -test_ar_currency_tax_not_included_and_payment_2_credit_note(); # exchangerate 0.8 + $invoice->pay_invoice( %params ); -test_ap_currency_tax_not_included_and_payment_2(); # two exchangerates, with fx_gain_loss -test_ap_currency_tax_not_included_and_payment_2_credit_note(); # two exchangerates, with fx_gain_loss + my ($number_of_payments, $paid_amount) = number_of_payments($invoice); + my $total = total_amount($invoice); -{ local $TODO = "currently this test fails because the code writing the invoice is buggy, the calculation of skonto is correct"; - my ($acc_trans_sum) = selectfirst_array_query($::form, $currency->db->dbh, 'SELECT SUM(amount) FROM acc_trans'); is($acc_trans_sum, '0.00000', "sum of all acc_trans is 0"); + is($invoice->netamount, -40.84, "${title}: netamount"); + is($invoice->amount, -45.10, "${title}: amount"); + is($paid_amount, 45.10, "${title}: paid amount according to acc_trans is positive (Haben)"); + is($invoice->paid, -45.10, "${title}: paid"); + is($number_of_payments, 1, "${title}: 1 AR_paid bookings"); + is($total, 0, "${title}: even balance"); } -# remove all created data at end of test -clear_up(); - -done_testing(); - 1;