From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 11 Jul 2013 14:59:55 +0000 (+0200)
Subject: SL::DB::Helper::PriceTaxCalculator: Margenberechnung gefixt
X-Git-Tag: release-3.1.0beta1~175^2~10
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=99dd63d7c2b8b12db2ecd00db93eadab8490dd50;p=kivitendo-erp.git

SL::DB::Helper::PriceTaxCalculator: Margenberechnung gefixt

Die Margenberechnung hat die Stückzahl nicht bei der Kostenberechnung
berücksichtigt.
---

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);