X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FInventory.pm;h=cecb92bc59d54af6502e6c2f9d884f93188f243f;hb=f143a10a13313bca78b97e107bd3b870e5db7d98;hp=593185eb2beadd24f852ba76de9566e05f8bc51b;hpb=11c945f26a44f4cb5c36ee1f013e7583562e7651;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Inventory.pm b/SL/Controller/CsvImport/Inventory.pm
index 593185eb2..cecb92bc5 100644
--- a/SL/Controller/CsvImport/Inventory.pm
+++ b/SL/Controller/CsvImport/Inventory.pm
@@ -32,7 +32,7 @@ sub init_profile {
   my ($self) = @_;
 
   my $profile = $self->SUPER::init_profile;
-  delete @{$profile}{qw(trans_id oe_id orderitems_id bestbefore trans_type_id project_id)};
+  delete @{$profile}{qw(trans_id oe_id delivery_order_items_stock_id bestbefore trans_type_id project_id)};
 
   return $profile;
 }
@@ -64,8 +64,8 @@ sub init_bins_by {
 
   my $all_bins = SL::DB::Manager::Bin->get_all();
   my $bins_by;
-  $bins_by->{'wh_id+id'}          = { map { ( $_->warehouse_id . '+' . $_->id          => $_ ) } @{ $all_bins } };
-  $bins_by->{'wh_id+description'} = { map { ( $_->warehouse_id . '+' . $_->description => $_ ) } @{ $all_bins } };
+  $bins_by->{_wh_id_and_id_ident()}          = { map { ( _wh_id_and_id_maker($_->warehouse_id, $_->id)                   => $_ ) } @{ $all_bins } };
+  $bins_by->{_wh_id_and_description_ident()} = { map { ( _wh_id_and_description_maker($_->warehouse_id, $_->description) => $_ ) } @{ $all_bins } };
 
   return $bins_by;
 }
@@ -172,7 +172,7 @@ sub check_warehouse {
   return 1;
 }
 
-# Check bin fior given warehouse, so check_warehouse must be called first.
+# Check bin for given warehouse, so check_warehouse must be called first.
 sub check_bin {
   my ($self, $entry) = @_;
 
@@ -181,7 +181,7 @@ sub check_bin {
   # If bin from front-end is enforced for all transfers, use this, if valid.
   if ($self->settings->{apply_bin} eq 'all') {
     $object->bin_id(undef);
-    my $bin = $self->bins_by->{'wh_id+description'}->{ $object->warehouse_id . '+' . $self->settings->{bin} };
+    my $bin = $self->bins_by->{_wh_id_and_description_ident()}->{ _wh_id_and_description_maker($object->warehouse_id, $self->settings->{bin}) };
     if (!$bin) {
       push @{ $entry->{errors} }, $::locale->text('Error: Invalid bin');
       return 0;
@@ -194,7 +194,7 @@ sub check_bin {
   if (    $self->settings->{apply_bin} eq 'missing'
        && ! $object->bin_id
        && ! $entry->{raw_data}->{bin} ) {
-    my $bin = $self->bins_by->{'wh_id+description'}->{ $object->warehouse_id . '+' . $self->settings->{bin} };
+    my $bin = $self->bins_by->{_wh_id_and_description_ident()}->{ _wh_id_and_description_maker($object->warehouse_id, $self->settings->{bin}) };
     if (!$bin) {
       push @{ $entry->{errors} }, $::locale->text('Error: Invalid bin');
       return 0;
@@ -204,14 +204,14 @@ sub check_bin {
   }
 
   # Check wether or not bin ID is valid.
-  if ($object->bin_id && !$self->bins_by->{'wh_id+id'}->{ $object->warehouse_id . '+' . $object->bin_id }) {
+  if ($object->bin_id && !$self->bins_by->{_wh_id_and_id_ident()}->{ _wh_id_and_id_maker($object->warehouse_id, $object->bin_id) }) {
     push @{ $entry->{errors} }, $::locale->text('Error: Invalid bin');
     return 0;
   }
   
   # Map description to ID if given.
   if (!$object->bin_id && $entry->{raw_data}->{bin}) {
-    my $bin = $self->bins_by->{'wh_id+description'}->{ $object->warehouse_id . '+' . $entry->{raw_data}->{bin} };
+    my $bin = $self->bins_by->{_wh_id_and_description_ident()}->{ _wh_id_and_description_maker($object->warehouse_id, $entry->{raw_data}->{bin}) };
     if (!$bin) {
       push @{ $entry->{errors} }, $::locale->text('Error: Invalid bin');
       return 0;
@@ -221,7 +221,7 @@ sub check_bin {
   }
 
   if ($object->bin_id) {
-    $entry->{info_data}->{bin} = $self->bins_by->{'wh_id+id'}->{ $object->warehouse_id . '+' . $object->bin_id }->description;
+    $entry->{info_data}->{bin} = $self->bins_by->{_wh_id_and_id_ident()}->{ _wh_id_and_id_maker($object->warehouse_id, $object->bin_id) }->description;
   } else {
     push @{ $entry->{errors} }, $::locale->text('Error: Bin not found');
     return 0;
@@ -286,15 +286,17 @@ sub check_qty{
   }
 
   # Actual quantity is read from stock or is the result of transfers for the
-  # same part, warehouse and bin done before.
-  my $key = $object->parts_id . '+' . $object->warehouse_id . '+' . $object->bin_id;
+  # same part, warehouse, bin and chargenumber done before.
+  my $key = join '+', $object->parts_id, $object->warehouse_id, $object->bin_id, $object->chargenumber;
   if (!exists $self->{resulting_quantities}->{$key}) {
-    my $stock = $object->part->get_simple_stock;
-    my @stocked = grep { $_->{warehouse_id} == $object->warehouse_id && $_->{bin_id} == $object->bin_id } @$stock;
-    my $stocked_qty = 0;
-    foreach (@stocked) {
-      $stocked_qty += $stocked[0]->{sum} * 1;
-    }
+    my $query = <<SQL;
+      SELECT sum(qty) FROM inventory
+        WHERE parts_id = ? AND warehouse_id = ? AND bin_id = ? AND chargenumber = ?
+        GROUP BY warehouse_id, bin_id, chargenumber
+SQL
+
+    my ($stocked_qty) = selectrow_query($::form, $::form->get_standard_dbh, $query,
+                                        $object->parts_id, $object->warehouse_id, $object->bin_id, $object->chargenumber);
     $self->{resulting_quantities}->{$key} = $stocked_qty;
   }
   my $actual_qty = $self->{resulting_quantities}->{$key};
@@ -398,4 +400,20 @@ sub save_objects {
   $self->SUPER::save_objects(%params);
 }
 
+sub _wh_id_and_description_ident {
+  return 'wh_id+description';
+}
+
+sub _wh_id_and_description_maker {
+    return join '+', $_[0], $_[1]
+}
+
+sub _wh_id_and_id_ident {
+  return 'wh_id+id';
+}
+
+sub _wh_id_and_id_maker {
+    return join '+', $_[0], $_[1]
+}
+
 1;