Merge branch 'master' into dev

[kivitendo-erp.git] / SL / DB / MetaSetup / DeliveryOrder.pm

diff --git a/SL/DB/MetaSetup/DeliveryOrder.pm b/SL/DB/MetaSetup/DeliveryOrder.pm
index 806c963..5233121 100644 (file)
--- a/SL/DB/MetaSetup/DeliveryOrder.pm
+++ b/SL/DB/MetaSetup/DeliveryOrder.pm
@@ -36,11 +36,10 @@ __PACKAGE__->meta->setup(
     is_sales                => { type => 'boolean' },
     itime                   => { type => 'timestamp', default => 'now()' },
     mtime                   => { type => 'timestamp' },
-    notes_bottom            => { type => 'text' },
     taxzone_id              => { type => 'integer' },
     taxincluded             => { type => 'boolean' },
     terms                   => { type => 'integer' },
-    curr                    => { type => 'character', length => 3 },
+    curr                    => { type => 'text' },
   ],
 
   primary_key_columns => [ 'id' ],
@@ -58,6 +57,11 @@ __PACKAGE__->meta->setup(
       key_columns => { customer_id => 'id' },
     },
 
+    department => {
+      class       => 'SL::DB::Department',
+      key_columns => { department_id => 'id' },
+    },
+
     employee => {
       class       => 'SL::DB::Employee',
       key_columns => { employee_id => 'id' },
@@ -78,6 +82,11 @@ __PACKAGE__->meta->setup(
       key_columns => { salesman_id => 'id' },
     },
 
+    shipto => {
+      class       => 'SL::DB::Shipto',
+      key_columns => { shipto_id => 'shipto_id' },
+    },
+
     vendor => {
       class       => 'SL::DB::Vendor',
       key_columns => { vendor_id => 'id' },