From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Thu, 23 Mar 2017 22:37:59 +0000 (+0100)
Subject: CsvImport Aufträge: Rabatt richtig für Datenbank aufbereiten.
X-Git-Tag: release-3.5.4~1171
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=fd840a7b95ace54ec5e865afea6ef806cb81c23d;p=kivitendo-erp.git

CsvImport Aufträge: Rabatt richtig für Datenbank aufbereiten.

In der DB steht der Rabatt als Hundertstel.
---

diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm
index 484f5b87c..35f4fb40c 100644
--- a/SL/Controller/CsvImport/Order.pm
+++ b/SL/Controller/CsvImport/Order.pm
@@ -391,6 +391,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 +399,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 +448,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) = @_;