LinkedRecords: with_objects erlauben für shipped_qty

diff --git a/SL/DB/Helper/LinkedRecords.pm b/SL/DB/Helper/LinkedRecords.pm
index c7de25b743c66a5454954db8e063054fb58578a7..2ed5d20363a4354487f379ae6bf856ec63c941c2 100644 (file)
--- a/SL/DB/Helper/LinkedRecords.pm
+++ b/SL/DB/Helper/LinkedRecords.pm
@@ -85,7 +85,12 @@ sub _linked_records_implementation {
       $_->{_record_link_direction} = $wanted;
       $_->{_record_link}           = $link;
       $_
       $_->{_record_link_direction} = $wanted;
       $_->{_record_link}           = $link;
       $_

-    } @{ $manager_class->get_all(query => [ id => $link->$sub_wanted_id, @get_objects_query ]) };
+    } @{
+      $manager_class->get_all(
+        query         => [ id => $link->$sub_wanted_id, @get_objects_query ],
+        (with_objects => $params{with_objects}) x !!$params{with_objects},
+      )
+    };

   };
 
   # If no 'via' is given then use a simple(r) method for querying the wanted objects.
   };
 
   # If no 'via' is given then use a simple(r) method for querying the wanted objects.

diff --git a/SL/DB/OrderItem.pm b/SL/DB/OrderItem.pm
index d46fdcc369191340fe0712a71b7a15efb06c86ab..e7b9179f64592b97f9d8487e4440c369658a7363 100644 (file)
--- a/SL/DB/OrderItem.pm
+++ b/SL/DB/OrderItem.pm
@@ -33,10 +33,9 @@ sub is_price_update_available {
 sub shipped_qty {
   my ($self) = @_;
 
 sub shipped_qty {
   my ($self) = @_;
 

-  my $d_orders = $self->order->linked_records(direction => 'to', to => 'SL::DB::DeliveryOrder');
+  my $d_orders = $self->order->linked_records(direction => 'to', to => 'SL::DB::DeliveryOrder', with_objects => [ 'orderitems' ]);

   my @doi      = grep { $_->parts_id == $self->parts_id } map { $_->orderitems } @$d_orders;
 
   my @doi      = grep { $_->parts_id == $self->parts_id } map { $_->orderitems } @$d_orders;
 

-  require SL::AM;

   return sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @doi);
 }
 
   return sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @doi);
 }