From 8790e3375225f08771789888a590159f92a28232 Mon Sep 17 00:00:00 2001 From: Bernd Blessmann Date: Mon, 27 Aug 2012 12:00:22 +0200 Subject: [PATCH] =?utf8?q?fxsellprice=20and=20allocated=20nur=20f=C3=BCr?= =?utf8?q?=20Rechnungen=20setzen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/DB/Helper/PriceTaxCalculator.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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}; -- 2.20.1