From: Bernd Blessmann <bibi@online.de>
Date: Mon, 27 Aug 2012 10:00:22 +0000 (+0200)
Subject: fxsellprice and allocated nur für Rechnungen setzen
X-Git-Tag: release-3.0.0beta1~262^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8790e3375225f08771789888a590159f92a28232;p=kivitendo-erp.git

fxsellprice and allocated nur für Rechnungen setzen
---

diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm
index a8e15481d..8bd03598d 100644
--- a/SL/DB/Helper/PriceTaxCalculator.pm
+++ b/SL/DB/Helper/PriceTaxCalculator.pm
@@ -70,7 +70,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);
+  $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);
@@ -126,7 +126,9 @@ sub _calculate_item {
   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) {
-    $item->allocated(_calculate_part_item($self, $data, $item->part, $item->base_qty, $item->unit_obj->convert_to(1, $item->part->unit_obj)));
+    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};