X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=t%2Fdb_helper%2Fpayment.t;h=154e48c290258079f4d5f61ff34bd46780fb5f8b;hb=e6d132a190fc0777413850d82a807babf944bba0;hp=f165b476a497c94a7525b59f5d7d0bdf1be378d7;hpb=da35c4e72d4cace5cc7e423ef769a140053c8515;p=kivitendo-erp.git

diff --git a/t/db_helper/payment.t b/t/db_helper/payment.t
index f165b476a..154e48c29 100644
--- a/t/db_helper/payment.t
+++ b/t/db_helper/payment.t
@@ -14,6 +14,8 @@ use List::Util qw(sum);
 use SL::Dev::Record qw(create_invoice_item create_sales_invoice create_credit_note create_ap_transaction);
 use SL::Dev::CustomerVendor qw(new_customer new_vendor);
 use SL::Dev::Part qw(new_part);
+use SL::DB::BankTransaction;
+use SL::DB::BankTransactionAccTrans;
 use SL::DB::Buchungsgruppe;
 use SL::DB::Currency;
 use SL::DB::Exchangerate;
@@ -29,7 +31,8 @@ use SL::DB::PaymentTerm;
 use SL::DBUtils qw(selectfirst_array_query);
 use Data::Dumper;
 
-my ($customer, $vendor, $currency_id, @parts, $buchungsgruppe, $buchungsgruppe7, $unit, $employee, $tax, $tax7, $tax_9, $taxzone, $payment_terms, $bank_account);
+my ($customer, $vendor, $currency_id, @parts, $buchungsgruppe, $buchungsgruppe7, $unit, $employee, $tax, $tax7, $tax_9, $taxzone, $payment_terms,
+    $bank_account, $bt);
 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);
 
@@ -50,13 +53,13 @@ test_default_ap_transaction_two_charts_19_7_tax_partial_unrounded_payment_withou
 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_ap_transaction_two_charts_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto();
+# test cases: free_skonto
+test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_free_skonto();
+test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_free_skonto_1cent();
+test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_free_skonto_2cent();
+test_default_invoice_one_item_19_multiple_payment_final_free_skonto();
+test_default_invoice_one_item_19_multiple_payment_final_free_skonto_1cent();
+test_default_ap_transaction_two_charts_19_7_tax_without_skonto_multiple_payments_final_free_skonto();
 
 # test cases: with_skonto_pt
 test_default_invoice_two_items_19_7_tax_with_skonto_50_50();
@@ -99,6 +102,8 @@ sub clear_up {
   SL::DB::Manager::Part->delete_all(all => 1);
   SL::DB::Manager::Customer->delete_all(all => 1);
   SL::DB::Manager::Vendor->delete_all(all => 1);
+  SL::DB::Manager::BankTransactionAccTrans->delete_all(all => 1);
+  SL::DB::Manager::BankTransaction->delete_all(all => 1);
   SL::DB::Manager::BankAccount->delete_all(all => 1);
   SL::DB::Manager::PaymentTerm->delete_all(all => 1);
   SL::DB::Manager::Exchangerate->delete_all(all => 1);
@@ -237,6 +242,17 @@ sub init_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%
+
+  $bt = SL::DB::BankTransaction->new(
+    local_bank_account_id => $bank_account->id,
+    transdate             => $transdate1,
+    valutadate            => $transdate1,
+    amount                => 27332.32,
+    purpose               => 'dummy',
+    currency              => $currency,
+  );
+  $bt->save || die $@;
+
 }
 
 sub new_ap_transaction {
@@ -273,7 +289,7 @@ sub number_of_payments {
   my $paid_amount;
   foreach my $transaction ( @{ $invoice->transactions } ) {
     if ( $transaction->chart_link =~ /(AR_paid|AP_paid)/ ) {
-      $paid_amount += $transaction->amount ;
+      $paid_amount += $transaction->amount;
       $number_of_payments++;
     }
   };
@@ -378,8 +394,9 @@ sub test_default_invoice_two_items_19_7_tax_with_skonto {
   );
 
   # default values
-  my %params = ( chart_id => $bank_account->chart_id,
+  my %params = ( chart_id  => $bank_account->chart_id,
                  transdate => $transdate1,
+                 bt_id     => $bt->id,
                );
 
   $params{payment_type} = 'with_skonto_pt';
@@ -411,8 +428,9 @@ sub test_default_invoice_two_items_19_7_tax_with_skonto_tax_included {
   );
 
   # default values
-  my %params = ( chart_id => $bank_account->chart_id,
+  my %params = ( chart_id  => $bank_account->chart_id,
                  transdate => $transdate1,
+                 bt_id     => $bt->id,
                );
 
   $params{payment_type} = 'with_skonto_pt';
@@ -535,7 +553,7 @@ 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 {
+sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_free_skonto {
   my $title = 'default invoice, two items, 19/7% tax not included';
 
   my $item1   = create_invoice_item(part => $parts[0], qty => 2.5);
@@ -557,15 +575,21 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fin
                          chart_id     => $bank_account->chart_id,
                          transdate    => $transdate1,
                        );
-  $invoice->pay_invoice( amount       => $invoice->open_amount,
-                         payment_type => 'difference_as_skonto',
-                         chart_id     => $bank_account->chart_id,
-                         transdate    => $transdate1,
+  # free_skonto does:
+  #  my $open_amount = $payment_type eq 'with_skonto_pt' ? $invoice->amount_less_skonto : $invoice->open_amount;
+  #  $open_amount    = abs($open_amount);
+  #  $open_amount   -= $free_skonto_amount if ($payment_type eq 'free_skonto');
+
+  $invoice->pay_invoice( skonto_amount => $invoice->open_amount,
+                         amount        => 0,
+                         payment_type  => 'free_skonto',
+                         chart_id      => $bank_account->chart_id,
+                         transdate     => $transdate1,
+                         bt_id         => $bt->id,
                        );
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
-
   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");
@@ -575,13 +599,15 @@ 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 {
+sub  test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_free_skonto_1cent {
   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)
+  #
+  # -> wrong: sub name. two cents are still left. one cent for each tax case. no tax correction
 
   my $item1   = create_invoice_item(part => $parts[0], qty => 2.5);
   my $item2   = create_invoice_item(part => $parts[1], qty => 1.2);
@@ -597,12 +623,13 @@ sub  test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fi
                          chart_id     => $bank_account->chart_id,
                          transdate    => $transdate1,
                        );
-  $invoice->pay_invoice( amount       => $invoice->open_amount,
-                         payment_type => 'difference_as_skonto',
+  $invoice->pay_invoice( skonto_amount => $invoice->open_amount,
+                         amount       => 0,
+                         payment_type => 'free_skonto',
                          chart_id     => $bank_account->chart_id,
                          transdate    => $transdate1,
+                         bt_id        => $bt->id,
                        );
-
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
 
@@ -610,12 +637,11 @@ sub  test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fi
   is($invoice->amount,           6.96 + 12.48,     "${title}: amount");
   is($paid_amount,                     -19.44,     "${title}: paid amount");
   is($invoice->paid,                    19.44,     "${title}: paid");
-  is($number_of_payments,                   3,     "${title}: 2 AR_paid bookings");
+  is($number_of_payments,                   3,     "${title}: 3 AR_paid bookings");
   is($total,                                0,     "${title}: even balance");
-
 }
 
-sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto_2cent {
+sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_final_free_skonto_2cent {
   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
@@ -633,10 +659,12 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fin
                          chart_id     => $bank_account->chart_id,
                          transdate    => $transdate1,
                        );
-  $invoice->pay_invoice( amount       => $invoice->open_amount,
-                         payment_type => 'difference_as_skonto',
+  $invoice->pay_invoice( skonto_amount => $invoice->open_amount,
+                         amount       => 0,
+                         payment_type => 'free_skonto',
                          chart_id     => $bank_account->chart_id,
                          transdate    => $transdate1,
+                         bt_id        => $bt->id,
                        );
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
@@ -651,7 +679,7 @@ 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 {
+sub test_default_invoice_one_item_19_multiple_payment_final_free_skonto {
   my $title = 'default invoice, one item, 19% tax, without_skonto';
 
   my $item    = create_invoice_item(part => $parts[0], qty => 2.5);
@@ -665,6 +693,7 @@ sub test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto
   # default values
   my %params = ( chart_id  => $bank_account->chart_id,
                  transdate => $transdate1,
+                 bt_id     => $bt->id,
                );
 
   $params{amount}       = '2.32';
@@ -675,8 +704,9 @@ sub test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto
   $params{payment_type} = 'without_skonto';
   $invoice->pay_invoice( %params );
 
-  $params{amount}       = $invoice->open_amount; # set amount, otherwise previous 3.81 is used
-  $params{payment_type} = 'difference_as_skonto';
+  $params{skonto_amount} = $invoice->open_amount; # set amount, otherwise previous 3.81 is used
+  $params{amount}        = 0,
+  $params{payment_type}  = 'free_skonto';
   $invoice->pay_invoice( %params );
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
@@ -691,7 +721,7 @@ 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 {
+sub test_default_invoice_one_item_19_multiple_payment_final_free_skonto_1cent {
   my $title = 'default invoice, one item, 19% tax, without_skonto';
 
   my $item    = create_invoice_item(part => $parts[0], qty => 2.5);
@@ -705,14 +735,16 @@ sub test_default_invoice_one_item_19_multiple_payment_final_difference_as_skonto
   # default values
   my %params = ( chart_id  => $bank_account->chart_id,
                  transdate => $transdate1,
+                 bt_id     => $bt->id,
                );
 
   $params{amount}       = '6.95';
   $params{payment_type} = 'without_skonto';
   $invoice->pay_invoice( %params );
 
-  $params{amount}       = $invoice->open_amount; # set amount, otherwise previous value 6.95 is used
-  $params{payment_type} = 'difference_as_skonto';
+  $params{skonto_amount} = $invoice->open_amount;
+  $params{amount}        = 0,
+  $params{payment_type} = 'free_skonto';
   $invoice->pay_invoice( %params );
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
@@ -756,11 +788,14 @@ sub test_default_ap_transaction_two_charts_19_7_with_skonto {
 
   my $ap_transaction = new_ap_transaction();
 
-  my %params = ( chart_id => $bank_account->chart_id,
+  my %params = ( chart_id  => $bank_account->chart_id,
                  transdate => $transdate1,
+                 bt_id     => $bt->id,
                );
-
-  # $params{amount} = '226'; # pass full amount
+  # BankTransaction-Controller __always__ calcs amount:
+  # my $open_amount = $payment_type eq 'with_skonto_pt' ? $invoice->amount_less_skonto : $invoice->open_amount;
+  $ap_transaction->payment_terms($ap_transaction->vendor->payment);
+  $params{amount}       = $ap_transaction->amount_less_skonto; # pass calculated skonto amount
   $params{payment_type} = 'with_skonto_pt';
 
   $ap_transaction->pay_invoice( %params );
@@ -794,8 +829,8 @@ sub test_default_ap_transaction_two_charts_19_7_tax_partial_unrounded_payment_wi
 };
 
 
-sub test_default_ap_transaction_two_charts_19_7_tax_without_skonto_multiple_payments_final_difference_as_skonto {
-  my $title = 'default ap_transaction, two charts, 19/7% tax multiple payments with final difference as skonto';
+sub test_default_ap_transaction_two_charts_19_7_tax_without_skonto_multiple_payments_final_free_skonto {
+  my $title = 'default ap_transaction, two charts, 19/7% tax multiple payments with final free skonto';
 
   my $ap_transaction = new_ap_transaction();
 
@@ -813,16 +848,19 @@ sub test_default_ap_transaction_two_charts_19_7_tax_without_skonto_multiple_paym
                           transdate    => $transdate1,
                          );
   $ap_transaction->pay_invoice(
-                          payment_type => 'difference_as_skonto',
+                          payment_type => 'free_skonto',
+                          skonto_amount => $ap_transaction->open_amount,
+                          amount       => 0,
                           chart_id     => $bank_account->chart_id,
                           transdate    => $transdate1,
+                          bt_id        => $bt->id,
                          );
 
   my ($number_of_payments, $paid_amount) = number_of_payments($ap_transaction);
   my $total = total_amount($ap_transaction);
 
   is($paid_amount,         226, "${title}: paid amount");
-  is($number_of_payments,    4, "${title}: 1 AP_paid bookings");
+  is($number_of_payments,    4, "${title}: 4 AP_paid bookings");
   is($total,                 0, "${title}: even balance");
 
 }
@@ -843,6 +881,7 @@ sub test_default_invoice_two_items_19_7_tax_with_skonto_50_50 {
   # default values
   my %params = ( chart_id => $bank_account->chart_id,
                  transdate => $transdate1,
+                 bt_id     => $bt->id,
                );
 
   $params{amount} = $invoice->amount_less_skonto;
@@ -879,6 +918,7 @@ sub test_default_invoice_four_items_19_7_tax_with_skonto_4x_25 {
   # default values
   my %params = ( chart_id => $bank_account->chart_id,
                  transdate => $transdate1,
+                 bt_id     => $bt->id,
                );
 
   $params{amount} = $invoice->amount_less_skonto;
@@ -914,6 +954,7 @@ sub test_default_invoice_four_items_19_7_tax_with_skonto_4x_25_tax_included {
   # default values
   my %params = ( chart_id => $bank_account->chart_id,
                  transdate => $transdate1,
+                 bt_id     => $bt->id,
                );
 
   $params{amount} = $invoice->amount_less_skonto;
@@ -954,9 +995,12 @@ sub test_default_invoice_four_items_19_7_tax_with_skonto_4x_25_multiple {
                          chart_id     => $bank_account->chart_id,
                          transdate => $transdate1,
                        );
-  $invoice->pay_invoice( payment_type => 'difference_as_skonto',
+  $invoice->pay_invoice( payment_type => 'free_skonto',
                          chart_id     => $bank_account->chart_id,
                          transdate    => $transdate1,
+                         bt_id        => $bt->id,
+                         skonto_amount => $invoice->open_amount,
+                         amount        => 0,
                        );
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);