X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FOrder.pm;h=503b4d18547cce5dd8d66ec616b3e01650a3e1ea;hb=cff6e70a0659626d7af0b1c3cb14a18245fc7001;hp=e26421bd881b031f18d2ce88349957384c11a5d0;hpb=f319b065b828d7ac69ecbef68bfb16b4f3415422;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm
index e26421bd8..503b4d185 100644
--- a/SL/Controller/CsvImport/Order.pm
+++ b/SL/Controller/CsvImport/Order.pm
@@ -19,7 +19,7 @@ use SL::DB::Project;
 use SL::DB::Shipto;
 use SL::DB::TaxZone;
 use SL::DB::Unit;
-use SL::TransNumber;
+use SL::PriceSource;
 
 use parent qw(SL::Controller::CsvImport::BaseMulti);
 
@@ -271,6 +271,7 @@ sub check_objects {
 
   my $i = 0;
   my $num_data = scalar @{ $self->controller->data };
+  my $order_entry;
   foreach my $entry (@{ $self->controller->data }) {
     $self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0;
 
@@ -278,9 +279,13 @@ sub check_objects {
 
     if ($entry->{raw_data}->{datatype} eq $self->_order_column) {
       $self->handle_order($entry);
+      $order_entry = $entry;
     } elsif ($entry->{raw_data}->{datatype} eq $self->_item_column && $entry->{object}->can('part')) {
-      $self->handle_item($entry);
+      $self->handle_item($entry, $order_entry);
+    } else {
+      $order_entry = undef;
     }
+
     $self->handle_cvars($entry, sub_module => 'orderitems');
 
   } continue {
@@ -383,16 +388,17 @@ sub check_language {
 }
 
 sub handle_item {
-  my ($self, $entry) = @_;
+  my ($self, $entry, $order_entry) = @_;
+
+  return unless $order_entry;
 
   my $object = $entry->{object};
+
   return unless $self->check_part($entry);
 
   my $part_obj = SL::DB::Part->new(id => $object->parts_id)->load;
 
   $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;
@@ -405,6 +411,9 @@ sub handle_item {
   $self->check_project($entry, global => 0);
   $self->check_price_factor($entry);
   $self->check_pricegroup($entry);
+
+  $self->handle_sellprice($entry, $order_entry);
+  $self->handle_discount($entry, $order_entry);
 }
 
 sub handle_unit {
@@ -434,28 +443,63 @@ sub handle_unit {
 }
 
 sub handle_sellprice {
-  my ($self, $entry) = @_;
+  my ($self, $entry, $record_entry) = @_;
 
-  my $object = $entry->{object};
+  my $item   = $entry->{object};
+  my $record = $record_entry->{object};
+
+  return if !$record->customervendor;
 
-  # Set sellprice from part if not given. Convert with respect to unit.
-  if (!defined $object->sellprice) {
-    my $sellprice = $object->part->sellprice;
+  # If sellprice is given, set price source to pricegroup if given or to none.
+  if (exists $entry->{raw_data}->{sellprice}) {
+    my $price_source      = SL::PriceSource->new(record_item => $item, record => $record);
+    my $price_source_spec = $item->pricegroup_id ? 'pricegroup' . '/' . $item->pricegroup_id : '';
+    my $price             = $price_source->price_from_source($price_source_spec);
+    $item->active_price_source($price->source);
 
-    if ($object->unit ne $object->part->unit) {
-      $sellprice = $object->unit_obj->convert_to($sellprice, $object->part->unit_obj);
+  } else {
+    # Set sellprice the best price of price source
+    my $price_source = SL::PriceSource->new(record_item => $item, record => $record);
+    my $price        = $price_source->best_price;
+    if ($price) {
+      $item->sellprice($price->price);
+      $item->active_price_source($price->source);
+    } else {
+      $item->sellprice(0);
+      $item->active_price_source($price_source->price_from_source('')->source);
     }
-    $object->sellprice($sellprice);
   }
 }
 
 sub handle_discount {
-  my ($self, $entry) = @_;
+  my ($self, $entry, $record_entry) = @_;
 
-  my $object = $entry->{object};
+  my $item   = $entry->{object};
+  my $record = $record_entry->{object};
+
+  return if !$record->customervendor;
+
+  # If discount is given, set discount source to none.
+  if (exists $entry->{raw_data}->{discount}) {
+    $item->discount($item->discount/100.0)      if $item->discount;
+    $item->discount(0)                      unless $item->discount;
 
-  $object->discount($object->discount/100.0)     if $object->discount;
-  $object->discount(0)                       unless $object->discount;
+    my $price_source = SL::PriceSource->new(record_item => $item, record => $record);
+    my $discount     = $price_source->price_from_source('');
+    $item->active_discount_source($discount->source);
+
+  } else {
+    # Set discount the best discount of price source
+    my $price_source = SL::PriceSource->new(record_item => $item, record => $record);
+    my $discount     = $price_source->best_discount;
+    if ($discount) {
+      $item->discount($discount->discount);
+      $item->active_discount_source($discount->source);
+    } else {
+      $item->discount(0);
+      $item->active_discount_source($price_source->discount_from_source('')->source);
+    }
+  }
 }
 
 sub check_part {