From 612d23d1bf4615b77a18c3f9e791e3f8ff75c38e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Mon, 29 Jul 2019 16:23:47 +0200 Subject: [PATCH] PTC: zur Margenberechnung die Nettozeilensumme nehmen. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit So ist der Verhalten in den anderen (alten) Masken. Sonst ergeben sich unterschiedliche Werte in den verschiedenen Masken, wenn "Steuer im Preis inbegriffen" gewählt ist. --- SL/DB/Helper/PriceTaxCalculator.pm | 35 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm index cadc09676..a3c42d2e9 100644 --- a/SL/DB/Helper/PriceTaxCalculator.pm +++ b/SL/DB/Helper/PriceTaxCalculator.pm @@ -109,23 +109,6 @@ sub _calculate_item { $data->{invoicediff} += $sellprice * (1 - $item->discount) * $item->qty * $data->{exchangerate} / $item->price_factor - $linetotal if $self->taxincluded; - my $linetotal_cost = 0; - - if (!$linetotal) { - $item->marge_total( 0); - $item->marge_percent(0); - - } else { - my $lastcost = !(($item->lastcost // 0) * 1) ? ($part->lastcost || 0) : $item->lastcost; - $linetotal_cost = _round($lastcost * $item->qty / $item->marge_price_factor, 2); - - $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} += $linetotal_cost; - } - my $taxkey = $part->get_taxkey(date => $self->transdate, is_sales => $data->{is_sales}, taxzone => $self->taxzone_id); my $tax_rate = $taxkey->tax->rate; my $tax_amount = undef; @@ -150,6 +133,24 @@ sub _calculate_item { $data->{amounts}->{ $chart->id }->{amount} += $linetotal; $data->{amounts}->{ $chart->id }->{amount} -= $tax_amount if $self->taxincluded; + my $linetotal_cost = 0; + + if (!$linetotal) { + $item->marge_total( 0); + $item->marge_percent(0); + + } else { + my $lastcost = !(($item->lastcost // 0) * 1) ? ($part->lastcost || 0) : $item->lastcost; + $linetotal_cost = _round($lastcost * $item->qty / $item->marge_price_factor, 2); + my $linetotal_net = $self->taxincluded ? $linetotal - $tax_amount : $linetotal; + + $item->marge_total( $linetotal_net - $linetotal_cost); + $item->marge_percent($item->marge_total * 100 / $linetotal_net); + + $self->marge_total( $self->marge_total + $item->marge_total); + $data->{lastcost_total} += $linetotal_cost; + } + push @{ $data->{assembly_items} }, []; if ($part->is_assembly) { _calculate_assembly_item($self, $data, $part, $item->base_qty, $item_unit->convert_to(1, $part_unit)); -- 2.20.1