X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FPart.pm;h=df0169d9c701e479628261bc5ba530dc98b905ec;hb=ac9129294850cbe9f04119b3cbcf2a475ad8f4ba;hp=32571276b9acc4d924dd8ab3354153f67561a0ec;hpb=2fd17923352490ab2c797c641a9c1fd19f8320f4;p=kivitendo-erp.git

diff --git a/SL/DB/Part.pm b/SL/DB/Part.pm
index 32571276b..df0169d9c 100644
--- a/SL/DB/Part.pm
+++ b/SL/DB/Part.pm
@@ -68,11 +68,32 @@ sub _before_save_set_partnumber {
   return 1;
 }
 
+sub items {
+  my ($self) = @_;
+
+  if ( $self->part_type eq 'assembly' ) {
+    return $self->assemblies;
+  } elsif ( $self->part_type eq 'assortment' ) {
+    return $self->assortment_items;
+  } else {
+    return undef;
+  }
+}
+
+sub items_checksum {
+  my ($self) = @_;
+
+  # for detecting if the items of an (orphaned) assembly or assortment have
+  # changed when saving
+
+  return join(' ', sort map { $_->part->id } @{$self->items});
+};
+
 sub validate {
   my ($self) = @_;
 
   my @errors;
-  push @errors, $::locale->text('The partnumber is missing.')     unless $self->partnumber;
+  push @errors, $::locale->text('The partnumber is missing.')     if $self->id and !$self->partnumber;
   push @errors, $::locale->text('The unit is missing.')           unless $self->unit;
   push @errors, $::locale->text('The buchungsgruppe is missing.') unless $self->buchungsgruppen_id or $self->buchungsgruppe;
 
@@ -80,7 +101,8 @@ sub validate {
     push @errors, $::locale->text('The partnumber already exists.') if SL::DB::Manager::Part->get_all_count(where => [ partnumber => $self->partnumber ]);
   };
 
-  if ($self->is_assortment && scalar @{$self->assortment_items} == 0) {
+  if ($self->is_assortment && $self->orphaned && scalar @{$self->assortment_items} == 0) {
+    # when assortment isn't orphaned form doesn't contain any items
     push @errors, $::locale->text('The assortment doesn\'t have any items.');
   }
 
@@ -140,18 +162,20 @@ sub new_assortment {
 
 sub last_modification {
   my ($self) = @_;
-  return $self->mtime or $self->itime;
+  return $self->mtime // $self->itime;
 };
 
 sub orphaned {
   my ($self) = @_;
   die 'not an accessor' if @_ > 1;
 
+  return 1 unless $self->id;
+
   my @relations = qw(
     SL::DB::InvoiceItem
     SL::DB::OrderItem
+    SL::DB::DeliveryOrderItem
     SL::DB::Inventory
-    SL::DB::Assembly
     SL::DB::AssortmentItem
   );
 
@@ -238,6 +262,36 @@ sub get_chart {
   return $charts->{$taxzone}->{$type};
 }
 
+sub get_stock {
+  my ($self, %params) = @_;
+
+  return undef unless $self->id;
+
+  my $query = 'SELECT SUM(qty) FROM inventory WHERE parts_id = ?';
+  my @values = ($self->id);
+
+  if ( $params{bin_id} ) {
+    $query .= ' AND bin_id = ?';
+    push(@values, $params{bin_id});
+  }
+
+  if ( $params{warehouse_id} ) {
+    $query .= ' AND warehouse_id = ?';
+    push(@values, $params{warehouse_id});
+  }
+
+  if ( $params{shippingdate} ) {
+    die unless ref($params{shippingdate}) eq 'DateTime';
+    $query .= ' AND shippingdate <= ?';
+    push(@values, $params{shippingdate});
+  }
+
+  my ($stock) = selectrow_query($::form, $self->db->dbh, $query, @values);
+
+  return $stock || 0; # never return undef
+};
+
+
 # this is designed to ignore chargenumbers, expiration dates and just give a list of how much <-> where
 sub get_simple_stock {
   my ($self, %params) = @_;
@@ -265,14 +319,13 @@ sub clone_and_reset_deep {
   my ($self) = @_;
 
   my $clone = $self->clone_and_reset; # resets id and partnumber (primary key and unique constraint)
-  $clone->makemodels(       map { $_->clone_and_reset } @{$self->makemodels});
-  $clone->translations(     map { $_->clone_and_reset } @{$self->translations});
+  $clone->makemodels(   map { $_->clone_and_reset } @{$self->makemodels}   ) if @{$self->makemodels};
+  $clone->translations( map { $_->clone_and_reset } @{$self->translations} ) if @{$self->translations};
 
   if ( $self->is_assortment ) {
+    # use clone rather than reset_and_clone because the unique constraint would also remove parts_id
     $clone->assortment_items( map { $_->clone } @{$self->assortment_items} );
-      foreach my $ai ( @{ $clone->assortment_items } ) {
-        $ai->assortment_id(undef);
-      };
+    $_->assortment_id(undef) foreach @{ $clone->assortment_items }
   };
 
   if ( $self->is_assembly ) {
@@ -292,32 +345,54 @@ sub clone_and_reset_deep {
   return $clone;
 }
 
-sub assembly_sellprice_sum {
-  my ($self) = @_;
+sub item_diffs {
+  my ($self, $comparison_part) = @_;
 
-  return unless $self->is_assembly;
-  sum map { $_->linetotal } @{$self->part->assemblies};
-};
+  die "item_diffs needs a part object" unless ref($comparison_part) eq 'SL::DB::Part';
+  die "part and comparison_part need to be of the same part_type" unless
+        ( $self->part_type eq 'assembly' or $self->part_type eq 'assortment' )
+    and ( $comparison_part->part_type eq 'assembly' or $comparison_part->part_type eq 'assortment' )
+    and $self->part_type eq $comparison_part->part_type;
 
-sub assembly_lastcost_sum {
-  my ($self) = @_;
+  # return [], [] if $self->items_checksum eq $comparison_part->items_checksum;
+  my @self_part_ids       = map { $_->parts_id } $self->items;
+  my @comparison_part_ids = map { $_->parts_id } $comparison_part->items;
+
+  my %orig       = map{ $_ => 1 } @self_part_ids;
+  my %comparison = map{ $_ => 1 } @comparison_part_ids;
+  my (@additions, @removals);
+  @additions = grep { !exists( $orig{$_}       ) } @comparison_part_ids if @comparison_part_ids;
+  @removals  = grep { !exists( $comparison{$_} ) } @self_part_ids       if @self_part_ids;
 
-  return unless $self->is_assembly;
-  sum map { $_->linetotal } @{$self->part->assemblies};
+  return \@additions, \@removals;
 };
 
-sub assortment_sellprice_sum {
+sub items_sellprice_sum {
+  my ($self, %params) = @_;
+
+  return unless $self->is_assortment or $self->is_assembly;
+  return unless $self->items;
+
+  if ($self->is_assembly) {
+    return sum map { $_->linetotal_sellprice          } @{$self->items};
+  } else {
+    return sum map { $_->linetotal_sellprice(%params) } grep { $_->charge } @{$self->items};
+  }
+}
+
+sub items_lastcost_sum {
   my ($self) = @_;
 
-  return unless $self->is_assortment;
-  sum map { $_->linetotal } @{$self->part->assortment_items};
+  return unless $self->is_assortment or $self->is_assembly;
+  return unless $self->items;
+  sum map { $_->linetotal_lastcost } @{$self->items};
 };
 
 sub assortment_lastcost_sum {
   my ($self) = @_;
 
   return unless $self->is_assortment;
-  sum map { $_->linetotal } @{$self->part->assortment_items};
+  sum map { $_->linetotal_lastcost } @{$self->assortment_items};
 };
 
 1;
@@ -350,7 +425,7 @@ flavours called:
 
 =item Assembly - a collection of both parts and services
 
-=item Assortment - a collection of parts
+=item Assortment - a collection of items (parts or assemblies)
 
 =back
 
@@ -474,6 +549,20 @@ Non-recursive lastcost sum of all the assembly item lastcosts.
 
 Non-recursive lastcost sum of all the assortment item lastcosts.
 
+=item C<get_stock %params>
+
+Fetches stock qty in the default unit for a part.
+
+bin_id and warehouse_id may be passed as params. If only a bin_id is passed,
+the stock qty for that bin is returned. If only a warehouse_id is passed, the
+stock qty for all bins in that warehouse is returned.  If a shippingdate is
+passed the stock qty for that date is returned.
+
+Examples:
+ my $qty = $part->get_stock(bin_id => 52);
+
+ $part->get_stock(shippingdate => DateTime->today->add(days => -5));
+
 =back
 
 =head1 AUTHORS