X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDB%2FHelper%2FPriceTaxCalculator.pm;h=8bd03598dbe11251361340a38a72938436cfd55a;hb=af0023e07e144ca31d465b098c36c45971269438;hp=a8e15481db00918b85d234db9046838e7541e2c9;hpb=43f9b1c512be9bc2199369c2f5accea32b8bd423;p=kivitendo-erp.git 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};