X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FMetaSetup%2FDeliveryOrder.pm;h=994fa96d7faebf6245cf8deb442b6fd1441be885;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=523312160efbac71f3586b4448bd01ae6dff8b0f;hpb=4f15333b8cc0ae1b0b4089adc2e516ba002b298b;p=kivitendo-erp.git

diff --git a/SL/DB/MetaSetup/DeliveryOrder.pm b/SL/DB/MetaSetup/DeliveryOrder.pm
index 523312160..994fa96d7 100644
--- a/SL/DB/MetaSetup/DeliveryOrder.pm
+++ b/SL/DB/MetaSetup/DeliveryOrder.pm
@@ -4,94 +4,120 @@ package SL::DB::DeliveryOrder;
 
 use strict;
 
-use base qw(SL::DB::Object);
-
-__PACKAGE__->meta->setup(
-  table   => 'delivery_orders',
-
-  columns => [
-    id                      => { type => 'integer', not_null => 1, sequence => 'id' },
-    donumber                => { type => 'text', not_null => 1 },
-    ordnumber               => { type => 'text' },
-    transdate               => { type => 'date', default => 'now()' },
-    vendor_id               => { type => 'integer' },
-    customer_id             => { type => 'integer' },
-    reqdate                 => { type => 'date' },
-    shippingpoint           => { type => 'text' },
-    notes                   => { type => 'text' },
-    intnotes                => { type => 'text' },
-    employee_id             => { type => 'integer' },
-    closed                  => { type => 'boolean', default => 'false' },
-    delivered               => { type => 'boolean', default => 'false' },
-    cusordnumber            => { type => 'text' },
-    oreqnumber              => { type => 'text' },
-    department_id           => { type => 'integer' },
-    shipvia                 => { type => 'text' },
-    cp_id                   => { type => 'integer' },
-    language_id             => { type => 'integer' },
-    shipto_id               => { type => 'integer' },
-    globalproject_id        => { type => 'integer' },
-    salesman_id             => { type => 'integer' },
-    transaction_description => { type => 'text' },
-    is_sales                => { type => 'boolean' },
-    itime                   => { type => 'timestamp', default => 'now()' },
-    mtime                   => { type => 'timestamp' },
-    taxzone_id              => { type => 'integer' },
-    taxincluded             => { type => 'boolean' },
-    terms                   => { type => 'integer' },
-    curr                    => { type => 'text' },
-  ],
-
-  primary_key_columns => [ 'id' ],
-
-  allow_inline_column_values => 1,
-
-  foreign_keys => [
-    contact => {
-      class       => 'SL::DB::Contact',
-      key_columns => { cp_id => 'cp_id' },
-    },
-
-    customer => {
-      class       => 'SL::DB::Customer',
-      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' },
-    },
-
-    globalproject => {
-      class       => 'SL::DB::Project',
-      key_columns => { globalproject_id => 'id' },
-    },
-
-    language => {
-      class       => 'SL::DB::Language',
-      key_columns => { language_id => 'id' },
-    },
-
-    salesman => {
-      class       => 'SL::DB::Employee',
-      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' },
-    },
-  ],
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('delivery_orders');
+
+__PACKAGE__->meta->columns(
+  billing_address_id      => { type => 'integer' },
+  closed                  => { type => 'boolean', default => 'false' },
+  cp_id                   => { type => 'integer' },
+  currency_id             => { type => 'integer', not_null => 1 },
+  cusordnumber            => { type => 'text' },
+  customer_id             => { type => 'integer' },
+  delivered               => { type => 'boolean', default => 'false' },
+  delivery_term_id        => { type => 'integer' },
+  department_id           => { type => 'integer' },
+  donumber                => { type => 'text', not_null => 1 },
+  employee_id             => { type => 'integer' },
+  globalproject_id        => { type => 'integer' },
+  id                      => { type => 'integer', not_null => 1, sequence => 'id' },
+  intnotes                => { type => 'text' },
+  itime                   => { type => 'timestamp', default => 'now()' },
+  language_id             => { type => 'integer' },
+  mtime                   => { type => 'timestamp' },
+  notes                   => { type => 'text' },
+  order_type              => { type => 'text', not_null => 1 },
+  ordnumber               => { type => 'text' },
+  oreqnumber              => { type => 'text' },
+  payment_id              => { type => 'integer' },
+  reqdate                 => { type => 'date' },
+  salesman_id             => { type => 'integer' },
+  shippingpoint           => { type => 'text' },
+  shipto_id               => { type => 'integer' },
+  shipvia                 => { type => 'text' },
+  tax_point               => { type => 'date' },
+  taxincluded             => { type => 'boolean' },
+  taxzone_id              => { type => 'integer', not_null => 1 },
+  transaction_description => { type => 'text' },
+  transdate               => { type => 'date', default => 'now()' },
+  vendor_id               => { type => 'integer' },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'id' ]);
+
+__PACKAGE__->meta->allow_inline_column_values(1);
+
+__PACKAGE__->meta->foreign_keys(
+  billing_address => {
+    class       => 'SL::DB::AdditionalBillingAddress',
+    key_columns => { billing_address_id => 'id' },
+  },
+
+  contact => {
+    class       => 'SL::DB::Contact',
+    key_columns => { cp_id => 'cp_id' },
+  },
+
+  currency => {
+    class       => 'SL::DB::Currency',
+    key_columns => { currency_id => 'id' },
+  },
+
+  customer => {
+    class       => 'SL::DB::Customer',
+    key_columns => { customer_id => 'id' },
+  },
+
+  delivery_term => {
+    class       => 'SL::DB::DeliveryTerm',
+    key_columns => { delivery_term_id => 'id' },
+  },
+
+  department => {
+    class       => 'SL::DB::Department',
+    key_columns => { department_id => 'id' },
+  },
+
+  employee => {
+    class       => 'SL::DB::Employee',
+    key_columns => { employee_id => 'id' },
+  },
+
+  globalproject => {
+    class       => 'SL::DB::Project',
+    key_columns => { globalproject_id => 'id' },
+  },
+
+  language => {
+    class       => 'SL::DB::Language',
+    key_columns => { language_id => 'id' },
+  },
+
+  payment => {
+    class       => 'SL::DB::PaymentTerm',
+    key_columns => { payment_id => 'id' },
+  },
+
+  salesman => {
+    class       => 'SL::DB::Employee',
+    key_columns => { salesman_id => 'id' },
+  },
+
+  shipto => {
+    class       => 'SL::DB::Shipto',
+    key_columns => { shipto_id => 'shipto_id' },
+  },
+
+  taxzone => {
+    class       => 'SL::DB::TaxZone',
+    key_columns => { taxzone_id => 'id' },
+  },
+
+  vendor => {
+    class       => 'SL::DB::Vendor',
+    key_columns => { vendor_id => 'id' },
+  },
 );
 
 1;