X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=t%2Fdb_helper%2Fprice_tax_calculator.t;h=f7aa9ab0ae92b3a611c73a0faaf310a10310a23a;hb=45ff2497af0be84db6bf29613d1dfd54a1c7d91a;hp=a80146d7845bea984ba198d02ccb6958a01d233d;hpb=a607a2d0854ef2b2e85bff4ab9657166236129c0;p=kivitendo-erp.git diff --git a/t/db_helper/price_tax_calculator.t b/t/db_helper/price_tax_calculator.t index a80146d78..f7aa9ab0a 100644 --- a/t/db_helper/price_tax_calculator.t +++ b/t/db_helper/price_tax_calculator.t @@ -7,6 +7,7 @@ use utf8; use Carp; use Data::Dumper; +use List::MoreUtils qw(uniq); use Support::TestSetup; use Test::Exception; @@ -17,8 +18,9 @@ use SL::DB::Employee; use SL::DB::Invoice; use SL::DB::Part; use SL::DB::Unit; +use SL::DB::TaxZone; -my ($customer, $currency_id, @parts, $buchungsgruppe, $buchungsgruppe7, $unit, $employee, $tax, $tax7); +my ($customer, $currency_id, @parts, $buchungsgruppe, $buchungsgruppe7, $unit, $employee, $tax, $tax7, $taxzone); sub reset_state { my %params = @_; @@ -35,12 +37,14 @@ sub reset_state { $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"; $currency_id = $::instance_conf->get_currency_id; $customer = SL::DB::Customer->new( name => 'Test Customer', currency_id => $currency_id, + taxzone_id => $taxzone->id, %{ $params{customer} } )->save; @@ -75,7 +79,7 @@ sub new_invoice { employee_id => $employee->id, salesman_id => $employee->id, gldate => DateTime->today_local->to_kivitendo, - taxzone_id => 0, + taxzone_id => $taxzone->id, transdate => DateTime->today_local->to_kivitendo, invoice => 1, type => 'invoice', @@ -107,6 +111,8 @@ sub test_default_invoice_one_item_19_tax_not_included() { invoiceitems => [ $item ], ); + my $taxkey = $item->part->get_taxkey(date => DateTime->today_local, is_sales => 1, taxzone => $invoice->taxzone_id); + # sellprice 2.34 * qty 2.5 = 5.85 # 19%(5.85) = 1.1115; rounded = 1.11 # total rounded = 6.96 @@ -128,22 +134,30 @@ sub test_default_invoice_one_item_19_tax_not_included() { is($invoice->marge_percent, 17.4358974358974, "${title}: marge_percent"); is_deeply(\%data, { - allocated => {}, - amounts => { - $buchungsgruppe->income_accno_id_0 => { - amount => 5.85, - tax_id => $tax->id, - taxkey => 3, + allocated => {}, + amounts => { + $buchungsgruppe->income_accno_id($taxzone) => { + amount => 5.85, + tax_id => $tax->id, + taxkey => 3, }, }, - amounts_cogs => {}, - assembly_items => [ + amounts_cogs => {}, + assembly_items => [ [], ], - exchangerate => 1, - taxes => { - $tax->chart_id => 1.11, + exchangerate => 1, + taxes => { + $tax->chart_id => 1.11, }, + items => [ + { linetotal => 5.85, + linetotal_cost => 4.83, + sellprice => 2.34, + tax_amount => 1.1115, + taxkey_id => $taxkey->id, + }, + ], }, "${title}: calculated data"); } @@ -157,6 +171,9 @@ sub test_default_invoice_two_items_19_7_tax_not_included() { invoiceitems => [ $item1, $item2 ], ); + my $taxkey1 = $item1->part->get_taxkey(date => DateTime->today_local, is_sales => 1, taxzone => $invoice->taxzone_id); + my $taxkey2 = $item2->part->get_taxkey(date => DateTime->today_local, is_sales => 1, taxzone => $invoice->taxzone_id); + # item 1: # sellprice 2.34 * qty 2.5 = 5.85 # 19%(5.85) = 1.1115; rounded = 1.11 @@ -192,28 +209,42 @@ sub test_default_invoice_two_items_19_7_tax_not_included() { is($invoice->marge_percent, 34.8943460879497, "${title}: marge_percent"); is_deeply(\%data, { - allocated => {}, - amounts => { - $buchungsgruppe->income_accno_id_0 => { - amount => 5.85, - tax_id => $tax->id, - taxkey => 3, + allocated => {}, + amounts => { + $buchungsgruppe->income_accno_id($taxzone) => { + amount => 5.85, + tax_id => $tax->id, + taxkey => 3, }, - $buchungsgruppe7->income_accno_id_0 => { - amount => 11.66, - tax_id => $tax7->id, - taxkey => 2, + $buchungsgruppe7->income_accno_id($taxzone) => { + amount => 11.66, + tax_id => $tax7->id, + taxkey => 2, }, }, - amounts_cogs => {}, - assembly_items => [ + amounts_cogs => {}, + assembly_items => [ [], [], ], - exchangerate => 1, - taxes => { - $tax->chart_id => 1.11, - $tax7->chart_id => 0.82, + exchangerate => 1, + taxes => { + $tax->chart_id => 1.11, + $tax7->chart_id => 0.82, }, + items => [ + { linetotal => 5.85, + linetotal_cost => 4.83, + sellprice => 2.34, + tax_amount => 1.1115, + taxkey_id => $taxkey1->id, + }, + { linetotal => 11.66, + linetotal_cost => 6.57, + sellprice => 9.714, + tax_amount => 0.8162, + taxkey_id => $taxkey2->id, + }, + ], }, "${title}: calculated data"); } @@ -228,6 +259,8 @@ sub test_default_invoice_three_items_sellprice_rounding_discount() { invoiceitems => [ $item1, $item2, $item3 ], ); + my %taxkeys = map { ($_->id => $_->get_taxkey(date => DateTime->today_local, is_sales => 1, taxzone => $invoice->taxzone_id)) } uniq map { $_->part } ($item1, $item2, $item3); + # this is how price_tax_calculator is implemented. It differs from # the way sales_order / invoice - forms are calculating: # linetotal = sellprice 5.55 * qty 1 * (1 - 0.05) = 5.2725; rounded 5.27 @@ -294,22 +327,42 @@ sub test_default_invoice_three_items_sellprice_rounding_discount() { is($invoice->marge_percent, 62.007874015748, "${title}: marge_percent"); is_deeply(\%data, { - allocated => {}, - amounts => { - $buchungsgruppe->income_accno_id_0 => { - amount => 15.24, - tax_id => $tax->id, - taxkey => 3, + allocated => {}, + amounts => { + $buchungsgruppe->income_accno_id($taxzone) => { + amount => 15.24, + tax_id => $tax->id, + taxkey => 3, }, }, - amounts_cogs => {}, - assembly_items => [ + amounts_cogs => {}, + assembly_items => [ [], [], [], ], - exchangerate => 1, - taxes => { - $tax->chart_id => 2.9, + exchangerate => 1, + taxes => { + $tax->chart_id => 2.9, }, + items => [ + { linetotal => 5.27, + linetotal_cost => 1.93, + sellprice => 5.27, + tax_amount => 1.0013, + taxkey_id => $taxkeys{$item1->parts_id}->id, + }, + { linetotal => 5.22, + linetotal_cost => 1.93, + sellprice => 5.22, + tax_amount => 0.9918, + taxkey_id => $taxkeys{$item2->parts_id}->id, + }, + { linetotal => 4.75, + linetotal_cost => 1.93, + sellprice => 4.75, + tax_amount => 0.9025, + taxkey_id => $taxkeys{$item3->parts_id}->id, + } + ], }, "${title}: calculated data"); }