From 99dd63d7c2b8b12db2ecd00db93eadab8490dd50 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 11 Jul 2013 16:59:55 +0200 Subject: [PATCH] SL::DB::Helper::PriceTaxCalculator: Margenberechnung gefixt MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Die Margenberechnung hat die Stückzahl nicht bei der Kostenberechnung berücksichtigt. --- SL/DB/Helper/PriceTaxCalculator.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm index e4a91807b..af5664694 100644 --- a/SL/DB/Helper/PriceTaxCalculator.pm +++ b/SL/DB/Helper/PriceTaxCalculator.pm @@ -90,13 +90,14 @@ sub _calculate_item { $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); -- 2.20.1