Merge branch 'b-3.6.1' into mebil

[kivitendo-erp.git] / SL / DB / DeliveryOrderItem.pm

diff --git a/SL/DB/DeliveryOrderItem.pm b/SL/DB/DeliveryOrderItem.pm
index c60b2a50186c9e5ec5f47dda5219b36483106959..7850a6445576a8355885cb56631b29109a408f01 100644 (file)
--- a/SL/DB/DeliveryOrderItem.pm
+++ b/SL/DB/DeliveryOrderItem.pm
@@ -43,11 +43,17 @@ sub displayable_delivery_order_info {
 
   $dec //= 2;
 
-  return SL::Presenter->get->sales_delivery_order($self->delivery_order, display => 'inline')
+  $self->delivery_order->presenter->sales_delivery_order(display => 'inline')
          . " " . $::form->format_amount(\%::myconfig, $self->qty, $dec) . " " . $self->unit
          . " (" . $self->delivery_order->transdate->to_kivitendo . ")";
 };
 
+sub effective_project {
+  my ($self) = @_;
+
+  $self->project // $self->delivery_order->globalproject;
+}
+
 __END__
 
 =pod