X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FDeliveryOrder.pm;h=9c860bf7e6c7f69c96b1420e4992836b2a5c55b3;hb=55af6244bd721f294ff5eee7e9357a3217318e5e;hp=724a01d7bbf9f02bcf8066435a8cdd224e7953df;hpb=f9c7abfae65b79945beb7e9260942bc94876248a;p=kivitendo-erp.git

diff --git a/SL/DB/DeliveryOrder.pm b/SL/DB/DeliveryOrder.pm
index 724a01d7b..9c860bf7e 100644
--- a/SL/DB/DeliveryOrder.pm
+++ b/SL/DB/DeliveryOrder.pm
@@ -12,8 +12,16 @@ use List::Util qw(first);
 
 __PACKAGE__->meta->add_relationship(orderitems => { type         => 'one to many',
                                                     class        => 'SL::DB::DeliveryOrderItem',
-                                                    column_map   => { id => 'trans_id' },
-                                                    manager_args => { with_objects => [ 'part' ] }
+                                                    column_map   => { id => 'delivery_order_id' },
+                                                    manager_args => { with_objects => [ 'parts' ] }
+                                                  },
+                                    shipto => { type       => 'one to one',
+                                                class      => 'SL::DB::Shipto',
+                                                column_map => { shipto_id => 'shipto_id' },
+                                              },
+                                    department => { type       => 'one to one',
+                                                    class      => 'SL::DB::Department',
+                                                    column_map => { department_id => 'id' },
                                                   },
                                    );
 
@@ -37,4 +45,16 @@ sub sales_order {
   return first { $_->is_type('sales_order') } @{ $orders };
 }
 
+sub type {
+  return shift->customer_id ? 'sales_delivery_order' : 'purchase_delivery_order';
+}
+
+sub displayable_state {
+  my ($self) = @_;
+
+  return join '; ',
+    ($self->closed    ? $::locale->text('closed')    : $::locale->text('open')),
+    ($self->delivered ? $::locale->text('delivered') : $::locale->text('not delivered'));
+}
+
 1;