X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FOrder.pm;h=e26421bd881b031f18d2ce88349957384c11a5d0;hb=4874214f33115e49dce29501d615848fa9df11ce;hp=484f5b87c9b7cec169f360f1f25547409793df99;hpb=9ca0da81731536fd78983f92f4f491c34bebb7e6;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm
index 484f5b87c..e26421bd8 100644
--- a/SL/Controller/CsvImport/Order.pm
+++ b/SL/Controller/CsvImport/Order.pm
@@ -344,6 +344,7 @@ sub handle_order {
     foreach (qw(payment_id delivery_term_id language_id taxzone_id currency_id)) {
       $object->$_($vc_obj->$_) unless $object->$_;
     }
+    $object->intnotes($vc_obj->notes) unless $object->intnotes;
   }
 
   $self->handle_salesman($entry);
@@ -391,6 +392,7 @@ sub handle_item {
 
   $self->handle_unit($entry);
   $self->handle_sellprice($entry);
+  $self->handle_discount($entry);
 
   # copy from part if not given
   $object->description($part_obj->description) unless $object->description;
@@ -398,7 +400,6 @@ sub handle_item {
   $object->lastcost($part_obj->lastcost)       unless defined $object->lastcost;
 
   # set to 0 if not given
-  $object->discount(0) unless $object->discount;
   $object->ship(0)     unless $object->ship;
 
   $self->check_project($entry, global => 0);
@@ -448,6 +449,15 @@ sub handle_sellprice {
   }
 }
 
+sub handle_discount {
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+
+  $object->discount($object->discount/100.0)     if $object->discount;
+  $object->discount(0)                       unless $object->discount;
+}
+
 sub check_part {
   my ($self, $entry) = @_;