X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FPart.pm;h=90d0b7115f74fa01d42dc3775291d7282bf9b53f;hb=2e8dd1d85541033e1b4f5fe2f41da528e860c6e5;hp=2ca12300a90f064d94ee27f3ca532dc5e46d217b;hpb=3063b9a83fbf516b55feebb66c2fdc8d3c349944;p=kivitendo-erp.git diff --git a/SL/Controller/CsvImport/Part.pm b/SL/Controller/CsvImport/Part.pm index 2ca12300a..90d0b7115 100644 --- a/SL/Controller/CsvImport/Part.pm +++ b/SL/Controller/CsvImport/Part.pm @@ -234,14 +234,13 @@ sub check_existing { sub handle_prices { my ($self, $entry) = @_; - foreach my $column (qw(sellprice listprice lastcost)) { - next unless $self->controller->headers->{used}->{ $column }; - + foreach my $column (qw(sellprice)) { + my $object = $entry->{object_to_save} || $entry->{object}; my $adjustment = $self->settings->{sellprice_adjustment}; - my $value = $entry->{object}->$column; + my $value = $object->$column; $value = $self->settings->{sellprice_adjustment_type} eq 'percent' ? $value * (100 + $adjustment) / 100 : $value + $adjustment; - $entry->{object}->$column($::form->round_amount($value, $self->settings->{sellprice_places})); + $object->$column($::form->round_amount($value, $self->settings->{sellprice_places})); } } @@ -486,7 +485,7 @@ sub setup_displayable_columns { { name => 'not_discountable', description => $::locale->text('Not Discountable') }, { name => 'notes', description => $::locale->text('Notes') }, { name => 'obsolete', description => $::locale->text('Obsolete') }, - { name => 'onhand', description => $::locale->text('On Hand') }, + { name => 'onhand', description => $::locale->text('On Hand') . ' [2]' }, { name => 'partnumber', description => $::locale->text('Part Number') }, { name => 'partsgroup_id', description => $::locale->text('Partsgroup (database ID)') }, { name => 'partsgroup', description => $::locale->text('Partsgroup (name)') },