X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FHelper%2FPriceTaxCalculator.pm;h=a3c42d2e9bee457bbb164dc9c95a8a71daefc996;hb=b24dfcbb7755c7c2d3389185091f951755de463c;hp=2a81586fc49f379700a45f1f5d8222284b5d90ba;hpb=fa5d2a24fc338e4c50951bbf3946b2b9a9f99ec2;p=kivitendo-erp.git

diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm
index 2a81586fc..a3c42d2e9 100644
--- a/SL/DB/Helper/PriceTaxCalculator.pm
+++ b/SL/DB/Helper/PriceTaxCalculator.pm
@@ -56,7 +56,7 @@ sub calculate_prices_and_taxes {
   SL::DB::Manager::Chart->cache_taxkeys(date => $self->transdate);
 
   my $idx = 0;
-  foreach my $item ($self->items) {
+  foreach my $item (@{ $self->items_sorted }) {
     $idx++;
     _calculate_item($self, $item, $idx, \%data, %params);
   }
@@ -83,7 +83,7 @@ sub _calculate_item {
   my ($self, $item, $idx, $data, %params) = @_;
 
   my $part       = SL::DB::Part->load_cached($item->parts_id);
-  return unless $item->part;
+  return unless $part;
 
   my $part_unit  = $data->{units_by_name}->{ $part->unit };
   my $item_unit  = $data->{units_by_name}->{ $item->unit };
@@ -96,7 +96,9 @@ sub _calculate_item {
 
   my $num_dec   = max 2, _num_decimal_places($item->sellprice);
 
-  # don't include rounded discount into sellprice
+  $item->discount(0) if !$item->discount;
+
+  # don't include rounded discount into sellprice for calculation
   # any time the sellprice is multiplied with qty discount has to be considered as part of the multiplication
   my $sellprice = $item->sellprice;
 
@@ -107,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;
@@ -143,13 +128,29 @@ sub _calculate_item {
     die "tax_amount != 0 but no chart_id for taxkey " . $taxkey->id . " tax " . $taxkey->tax->id;
   }
 
-  $self->netamount($self->netamount + $sellprice * (1 - $item->discount) * $item->qty / $item->price_factor);
-
   my $chart = $part->get_chart(type => $data->{is_sales} ? 'income' : 'expense', taxzone => $self->taxzone_id);
   $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;
 
+  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));
@@ -161,10 +162,12 @@ sub _calculate_item {
 
   $data->{last_incex_chart_id} = $chart->id if $data->{is_sales};
 
+  my $item_sellprice = _round($sellprice * (1 - $item->discount), $num_dec);
+
   push @{ $data->{items} }, {
     linetotal      => $linetotal,
     linetotal_cost => $linetotal_cost,
-    sellprice      => $sellprice,
+    sellprice      => $item_sellprice,
     tax_amount     => $tax_amount,
     taxkey_id      => $taxkey->id,
   };
@@ -183,6 +186,8 @@ sub _calculate_amounts {
     $data->{taxes}->{$chart_id}  = $rounded;
   }
 
+  $self->netamount(sum map { $_->{amount} } values %{ $data->{amounts} });
+
   my $amount    = _round(($self->netamount + $tax_diff) * $data->{exchangerate}, 2);
   my $diff      = $amount - ($self->netamount + $tax_diff) * $data->{exchangerate};
   my $netamount = $amount;