X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FHelper%2FPriceTaxCalculator.pm;h=2478292a4245bbfe4dd3cc748914cebf66eb55e7;hb=429072104757330f631498ce97423c015cd88cf4;hp=07ef82298db959fa2e1536a13c4fa267f2814f8f;hpb=9229c5479cb1260b81cf8230fe8e5df01173aa3f;p=kivitendo-erp.git diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm index 07ef82298..2478292a4 100644 --- a/SL/DB/Helper/PriceTaxCalculator.pm +++ b/SL/DB/Helper/PriceTaxCalculator.pm @@ -7,18 +7,19 @@ our @EXPORT = qw(calculate_prices_and_taxes); use Carp; use List::Util qw(sum min); -use SL::DB::Default; -use SL::DB::PriceFactor; -use SL::DB::Unit; sub calculate_prices_and_taxes { my ($self, %params) = @_; + require SL::DB::PriceFactor; + require SL::DB::Unit; + my %units_by_name = map { ( $_->name => $_ ) } @{ SL::DB::Manager::Unit->get_all }; my %price_factors_by_id = map { ( $_->id => $_ ) } @{ SL::DB::Manager::PriceFactor->get_all }; my %data = ( lastcost_total => 0, invoicediff => 0, + last_incex_chart_id => undef, units_by_name => \%units_by_name, price_factors_by_id => \%price_factors_by_id, taxes => { }, @@ -42,13 +43,7 @@ sub calculate_prices_and_taxes { _calculate_item($self, $item, $idx, \%data, %params); } - my $tax_sum = sum map { _round($_, 2) } values %{ $data{taxes} }; - - $self->amount( _round($self->netamount + $tax_sum, 2)); - $self->netamount( _round($self->netamount, 2)); - $self->marge_percent($self->netamount ? ($self->netamount - $data{lastcost_total}) * 100 / $self->netamount : 0); - - _calculate_invoice($self, \%data, %params) if $data{is_invoice}; + _calculate_amounts($self, \%data, %params); return $self unless wantarray; @@ -57,9 +52,11 @@ sub calculate_prices_and_taxes { sub _get_exchangerate { my ($self, $data, %params) = @_; + require SL::DB::Default; - if (($self->curr || '') ne SL::DB::Default->get_default_currency) { - $data->{exchangerate} = $::form->check_exchangerate(\%::myconfig, $self->curr, $self->transdate, $data->{is_sales} ? 'buy' : 'sell'); + my $currency = $self->currency_id ? $self->currency->name || '' : ''; + if ($currency ne SL::DB::Default->get_default_currency) { + $data->{exchangerate} = $::form->check_exchangerate(\%::myconfig, $currency, $self->transdate, $data->{is_sales} ? 'buy' : 'sell'); $data->{exchangerate} ||= $params{exchangerate}; } $data->{exchangerate} ||= 1; @@ -75,6 +72,7 @@ sub _calculate_item { croak("Undefined unit " . $item->unit) if !$item_unit; $item->base_qty($item_unit->convert_to($item->qty, $part_unit)); + $item->fxsellprice($item->sellprice) if $data->{is_invoice}; my $num_dec = _num_decimal_places($item->sellprice); my $discount = _round($item->sellprice * ($item->discount || 0), $num_dec); @@ -85,20 +83,21 @@ sub _calculate_item { my $linetotal = _round($sellprice * $item->qty / $item->price_factor, 2) * $data->{exchangerate}; $linetotal = _round($linetotal, 2); - $data->{invoicediff} += $sellprice * $item->qty * $data->{exchangerate} / $item->price_factor - $linetotal; + $data->{invoicediff} += $sellprice * $item->qty * $data->{exchangerate} / $item->price_factor - $linetotal if $self->taxincluded; if (!$linetotal) { $item->marge_total( 0); $item->marge_percent(0); } else { - my $lastcost = ! ($item->lastcost * 1) ? ($item->part->lastcost || 0) : $item->lastcost; + my $lastcost = ! ($item->lastcost * 1) ? ($item->part->lastcost || 0) : $item->lastcost; + my $linetotal_cost = _round($lastcost * $item->qty / $item->marge_price_factor, 2); - $item->marge_total( $linetotal - $lastcost / $item->marge_price_factor); + $item->marge_total( $linetotal - $linetotal_cost); $item->marge_percent($item->marge_total * 100 / $linetotal); $self->marge_total( $self->marge_total + $item->marge_total); - $data->{lastcost_total} += $lastcost; + $data->{lastcost_total} += $linetotal_cost; } my $taxkey = $item->part->get_taxkey(date => $self->transdate, is_sales => $data->{is_sales}, taxzone => $self->taxzone_id); @@ -113,48 +112,89 @@ sub _calculate_item { $tax_amount = $linetotal * $tax_rate; } - $data->{taxes}->{ $taxkey->chart_id } ||= 0; - $data->{taxes}->{ $taxkey->chart_id } += $tax_amount; + if ($taxkey->tax->chart_id) { + $data->{taxes}->{ $taxkey->tax->chart_id } ||= 0; + $data->{taxes}->{ $taxkey->tax->chart_id } += $tax_amount; + } elsif ($tax_amount) { + die "tax_amount != 0 but no chart_id for taxkey " . $taxkey->id . " tax " . $taxkey->tax->id; + } $self->netamount($self->netamount + $sellprice * $item->qty / $item->price_factor); my $chart = $item->part->get_chart(type => $data->{is_sales} ? 'income' : 'expense', taxzone => $self->taxzone_id); - $data->{amounts}->{$chart->id} += $linetotal; + $data->{amounts}->{ $chart->id } ||= { taxkey => $taxkey->taxkey_id, tax_id => $taxkey->tax_id, amount => 0 }; + $data->{amounts}->{ $chart->id }->{amount} += $linetotal; + $data->{amounts}->{ $chart->id }->{amount} -= $tax_amount if $self->taxincluded; push @{ $data->{assembly_items} }, []; - $item->allocated(_calculate_assembly_item($self, $data, $item->part, $item->base_qty, $item->unit_obj->convert_to(1, $item->part->unit_obj))); + if ($item->part->is_assembly) { + _calculate_assembly_item($self, $data, $item->part, $item->base_qty, $item->unit_obj->convert_to(1, $item->part->unit_obj)); + } elsif ($item->part->is_part) { + if ($data->{is_invoice}) { + $item->allocated(_calculate_part_item($self, $data, $item->part, $item->base_qty, $item->unit_obj->convert_to(1, $item->part->unit_obj))); + } + } + + $data->{last_incex_chart_id} = $chart->id if $data->{is_sales}; - $::lxdebug->message(0, "CALCULATE! ${idx} i.qty " . $item->qty . " i.sellprice " . $item->sellprice . " sellprice $sellprice taxamount $tax_amount " . - "i.linetotal $linetotal netamount " . $self->netamount . " marge_total " . $item->marge_total . " marge_percent " . $item->marge_percent); + _dbg("CALCULATE! ${idx} i.qty " . $item->qty . " i.sellprice " . $item->sellprice . " sellprice $sellprice num_dec $num_dec taxamount $tax_amount " . + "i.linetotal $linetotal netamount " . $self->netamount . " marge_total " . $item->marge_total . " marge_percent " . $item->marge_percent); } -sub _calculate_invoice { +sub _calculate_amounts { my ($self, $data, %params) = @_; - return unless $data->{invoice}; + my $tax_diff = 0; + foreach my $chart_id (keys %{ $data->{taxes} }) { + my $rounded = _round($data->{taxes}->{$chart_id} * $data->{exchangerate}, 2); + $tax_diff += $data->{taxes}->{$chart_id} * $data->{exchangerate} - $rounded if $self->taxincluded; + $data->{taxes}->{$chart_id} = $rounded; + } + + my $amount = _round(($self->netamount + $tax_diff) * $data->{exchangerate}, 2); + my $diff = $amount - ($self->netamount + $tax_diff) * $data->{exchangerate}; + my $netamount = $amount; + + if ($self->taxincluded) { + $data->{invoicediff} += $diff; + $data->{amounts}->{ $data->{last_incex_chart_id} }->{amount} += $data->{invoicediff} if $data->{last_incex_chart_id}; + } + + _dbg("Sna " . $self->netamount . " idiff " . $data->{invoicediff} . " tdiff ${tax_diff}"); + + my $tax = sum values %{ $data->{taxes} }; + $data->{arap_amount} = $netamount + $tax; + + $self->netamount( $netamount); + $self->amount( $netamount + $tax); + $self->marge_percent($self->netamount ? ($self->netamount - $data->{lastcost_total}) * 100 / $self->netamount : 0); } sub _calculate_assembly_item { my ($self, $data, $part, $total_qty, $base_factor) = @_; - return 0 unless $::eur && $data->{is_invoice}; - return _calculate_part_service_item($self, $data, $part, $total_qty) unless $part->is_assembly; + return 0 if $::instance_conf->get_inventory_system eq 'periodic' || !$data->{is_invoice}; - my $allocated = 0; foreach my $assembly_entry (@{ $part->assemblies }) { - push @{ $data->{assembly_items}->[-1] }, { part => $assembly_entry->part, qty => $total_qty * $assembly_entry->qty }; - $allocated += _calculate_assembly_item($self, $data, $assembly_entry->part, $total_qty * $assembly_entry->qty); + push @{ $data->{assembly_items}->[-1] }, { part => $assembly_entry->part, + qty => $total_qty * $assembly_entry->qty, + allocated => 0 }; + + if ($assembly_entry->part->is_assembly) { + _calculate_assembly_item($self, $data, $assembly_entry->part, $total_qty * $assembly_entry->qty); + } elsif ($assembly_entry->part->is_part) { + my $allocated = _calculate_part_item($self, $data, $assembly_entry->part, $total_qty * $assembly_entry->qty); + $data->{assembly_items}->[-1]->[-1]->{allocated} = $allocated; + } } - - return $allocated; } -sub _calculate_part_service_item { +sub _calculate_part_item { my ($self, $data, $part, $total_qty, $base_factor) = @_; - $::lxdebug->message(0, "cpsi tq " . $total_qty); + _dbg("cpsi tq " . $total_qty); - return 0 unless $::eur && $data->{is_invoice} && $total_qty; + return 0 if $::instance_conf->get_inventory_system eq 'periodic' || !$data->{is_invoice} || !$total_qty; my ($entry); $base_factor ||= 1; @@ -166,8 +206,8 @@ sub _calculate_part_service_item { \'(base_qty + allocated) < 0' ] ]); while (($remaining_qty > 0) && ($entry = $iterator->next)) { - my $qty = min($remaining_qty, $entry->base_qty * -1 - $entry->allocated - $data->{allocated}->{$part->id}); - $::lxdebug->message(0, "qty $qty"); + my $qty = min($remaining_qty, $entry->base_qty * -1 - $entry->allocated - $data->{allocated}->{ $entry->id }); + _dbg("qty $qty"); next unless $qty; @@ -176,9 +216,9 @@ sub _calculate_part_service_item { $data->{amounts_cogs}->{ $expense_income_chart->id } -= $linetotal; $data->{amounts_cogs}->{ $inventory_chart->id } += $linetotal; - $data->{allocated}->{ $part->id } ||= 0; - $data->{allocated}->{ $part->id } += $qty; - $remaining_qty -= $qty; + $data->{allocated}->{ $entry->id } ||= 0; + $data->{allocated}->{ $entry->id } += $qty; + $remaining_qty -= $qty; } $iterator->finish; @@ -191,7 +231,11 @@ sub _round { } sub _num_decimal_places { - return length( (split(/\./, '' . shift, 2))[1] || '' ); + return length( (split(/\./, '' . ($_[0] * 1), 2))[1] || '' ); +} + +sub _dbg { + # $::lxdebug->message(0, join(' ', @_)); } 1; @@ -213,8 +257,10 @@ amounts and taxes of orders, quotations, invoices =item C Calculates the prices, amounts and taxes for an order, a quotation or -an invoice. The function assumes that the mixing package has a certain -layout and provides certain functions: +an invoice. + +The function assumes that the mixing package has a certain layout and +provides certain functions: =over 2 @@ -249,10 +295,6 @@ In array context a hash with the following keys is returned: =over 2 -=item C - -The object itself. - =item C A hash reference with the calculated taxes. The keys are chart IDs, @@ -261,7 +303,31 @@ the values the calculated taxes. =item C A hash reference with the calculated amounts. The keys are chart IDs, -the values the calculated amounts. +the values are hash references containing the two keys C and +C. + +=item C + +A hash reference with the calculated amounts for costs of goods +sold. The keys are chart IDs, the values the calculated amounts. + +=item C + +An array reference with as many entries as there are items in the +record. Each entry is again an array reference of hash references with +the keys C (an instance of L), C and +C. Is only valid for invoices and can be used to populate +the C table with entries for assemblies. + +=item C + +A hash reference. The keys are IDs of entries in the C +table. The values are the new values for the entry's C +column. Only valid for invoices. + +=item C + +The exchangerate used for the calculation. =back