X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FInventory.pm;h=238abf33add0cca6565f087e86d7ab48f1f3d957;hb=1cbc459da604c31d21593df298a522e6cbe69e2b;hp=cecb92bc59d54af6502e6c2f9d884f93188f243f;hpb=1d7143e9a364a438f828dd31c48a1e1fc3d89903;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Inventory.pm b/SL/Controller/CsvImport/Inventory.pm
index cecb92bc5..238abf33a 100644
--- a/SL/Controller/CsvImport/Inventory.pm
+++ b/SL/Controller/CsvImport/Inventory.pm
@@ -28,11 +28,15 @@ sub init_class {
   $self->class('SL::DB::Inventory');
 }
 
+sub set_profile_defaults {
+};
+
 sub init_profile {
   my ($self) = @_;
 
   my $profile = $self->SUPER::init_profile;
-  delete @{$profile}{qw(trans_id oe_id delivery_order_items_stock_id bestbefore trans_type_id project_id)};
+  delete @{$profile}{qw(trans_id oe_id delivery_order_items_stock_id trans_type_id project_id)};
+  delete @{$profile}{qw(bestbefore)}    if !$::instance_conf->get_show_bestbefore;
 
   return $profile;
 }
@@ -113,6 +117,9 @@ sub setup_displayable_columns {
                                  { name => 'warehouse',    description => $::locale->text('Warehouse')               },
                                  { name => 'warehouse_id', description => $::locale->text('Warehouse (database ID)') },
                                 );
+  if ($::instance_conf->get_show_bestbefore) {
+    $self->add_displayable_columns({ name => 'bestbefore', description => $::locale->text('Best Before') });
+  }
 }
 
 sub check_warehouse {
@@ -145,7 +152,7 @@ sub check_warehouse {
     $object->warehouse_id($wh->id);
   }
 
-  # Check wether or not warehouse ID is valid.
+  # Check whether or not warehouse ID is valid.
   if ($object->warehouse_id && !$self->warehouses_by->{id}->{ $object->warehouse_id }) {
     push @{ $entry->{errors} }, $::locale->text('Error: Invalid warehouse');
     return 0;
@@ -203,12 +210,12 @@ sub check_bin {
     $object->bin_id($bin->id);
   }
 
-  # Check wether or not bin ID is valid.
+  # Check whether or not bin ID is valid.
   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_and_description_ident()}->{ _wh_id_and_description_maker($object->warehouse_id, $entry->{raw_data}->{bin}) };
@@ -235,7 +242,7 @@ sub check_part {
 
   my $object = $entry->{object};
 
-  # Check wether or non part ID is valid.
+  # Check whether or not part ID is valid.
   if ($object->parts_id && !$self->parts_by->{id}->{ $object->parts_id }) {
     push @{ $entry->{errors} }, $::locale->text('Error: Invalid part');
     return 0;
@@ -286,18 +293,13 @@ sub check_qty{
   }
 
   # Actual quantity is read from stock or is the result of transfers for the
-  # same part, warehouse, bin and chargenumber done before.
+  # same part, warehouse, bin, chargenumber and bestbefore date (if
+  # show_bestbefore is enabled) done before.
   my $key = join '+', $object->parts_id, $object->warehouse_id, $object->bin_id, $object->chargenumber;
-  if (!exists $self->{resulting_quantities}->{$key}) {
-    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
+  $key   .= join '+', $key, $object->bestbefore    if $::instance_conf->get_show_bestbefore;
 
-    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;
+  if (!exists $self->{resulting_quantities}->{$key}) {
+    $self->{resulting_quantities}->{$key} = _get_stocked_qty($object);
   }
   my $actual_qty = $self->{resulting_quantities}->{$key};
 
@@ -393,19 +395,46 @@ sub save_objects {
   my $data = $params{data} || $self->controller->data;
 
   foreach my $entry (@{ $data }) {
-    my ($trans_id) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT nextval('id')|);
+    my ($trans_id) = selectrow_query($::form,$entry->{object}->db->dbh, qq|SELECT nextval('id')|);
     $entry->{object}->trans_id($trans_id);
   }
 
   $self->SUPER::save_objects(%params);
 }
 
+sub _get_stocked_qty {
+  my ($object) = @_;
+
+  my $bestbefore_filter  = '';
+  my $bestbefore_val_cnt = 0;
+  if ($::instance_conf->get_show_bestbefore) {
+    $bestbefore_filter  = ($object->bestbefore) ? 'AND bestbefore = ?' : 'AND bestbefore IS NULL';
+    $bestbefore_val_cnt = ($object->bestbefore) ? 1                    : 0;
+  }
+
+  my $query = <<SQL;
+    SELECT sum(qty) FROM inventory
+      WHERE parts_id = ? AND warehouse_id = ? AND bin_id = ? AND chargenumber = ? $bestbefore_filter
+      GROUP BY warehouse_id, bin_id, chargenumber
+SQL
+
+  my @values = ($object->parts_id,
+                $object->warehouse_id,
+                $object->bin_id,
+                $object->chargenumber);
+  push @values, $object->bestbefore if $bestbefore_val_cnt;
+
+  my ($stocked_qty) = selectrow_query($::form, $object->db->dbh, $query, @values);
+
+  return $stocked_qty;
+}
+
 sub _wh_id_and_description_ident {
   return 'wh_id+description';
 }
 
 sub _wh_id_and_description_maker {
-    return join '+', $_[0], $_[1]
+  return join '+', $_[0], $_[1]
 }
 
 sub _wh_id_and_id_ident {
@@ -413,7 +442,7 @@ sub _wh_id_and_id_ident {
 }
 
 sub _wh_id_and_id_maker {
-    return join '+', $_[0], $_[1]
+  return join '+', $_[0], $_[1]
 }
 
 1;