X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FDeliveryOrder.pm;h=372a5cc3a60df0cca375478ab6dc949378e68bb5;hb=ffb54c7e12b01c82598a724fe67579a45572327c;hp=c00bcaf612102db77ace9c2799d29986bee08d3b;hpb=56b91fb4030432fde4159c11a0ca97a7571535f3;p=kivitendo-erp.git

diff --git a/SL/DB/DeliveryOrder.pm b/SL/DB/DeliveryOrder.pm
index c00bcaf61..372a5cc3a 100644
--- a/SL/DB/DeliveryOrder.pm
+++ b/SL/DB/DeliveryOrder.pm
@@ -8,7 +8,6 @@ use SL::DB::MetaSetup::DeliveryOrder;
 use SL::DB::Manager::DeliveryOrder;
 use SL::DB::Helper::LinkedRecords;
 use SL::DB::Helper::TransNumberGenerator;
-use SL::DB::Order;
 
 use List::Util qw(first);
 
@@ -21,6 +20,18 @@ __PACKAGE__->meta->add_relationship(orderitems => { type         => 'one to many
 
 __PACKAGE__->meta->initialize;
 
+__PACKAGE__->before_save('_before_save_set_donumber');
+
+# hooks
+
+sub _before_save_set_donumber {
+  my ($self) = @_;
+
+  $self->create_trans_number if !$self->donumber;
+
+  return 1;
+}
+
 # methods
 
 sub items { goto &orderitems; }
@@ -28,14 +39,15 @@ sub items { goto &orderitems; }
 sub items_sorted {
   my ($self) = @_;
 
-  my @sorted =  sort {$a->id <=> $b->id } @{ $self->items };
-  return wantarray ? @sorted : \@sorted;
+  return [ sort {$a->id <=> $b->id } @{ $self->items } ];
 }
 
 sub sales_order {
   my $self   = shift;
   my %params = @_;
 
+
+  require SL::DB::Order;
   my $orders = SL::DB::Manager::Order->get_all(
     query => [
       ordnumber => $self->ordnumber,