Merge branch 'master' of http://wagnertech.de/git/mfinanz

[mfinanz.git] / SL / DB / MetaSetup / DeliveryOrder.pm

diff --git a/SL/DB/MetaSetup/DeliveryOrder.pm b/SL/DB/MetaSetup/DeliveryOrder.pm
index 92d45ae14860ea4ff6bd0aec81c8d90489d666c0..2ab10c362351e8ede2cfd57e1288600bbbf73b76 100644 (file)
--- a/SL/DB/MetaSetup/DeliveryOrder.pm
+++ b/SL/DB/MetaSetup/DeliveryOrder.pm
@@ -4,41 +4,45 @@ package SL::DB::DeliveryOrder;
 
 use strict;
 
-use base qw(SL::DB::Object);
+use parent qw(SL::DB::Object);
 
 __PACKAGE__->meta->table('delivery_orders');
 
 __PACKAGE__->meta->columns(
-  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' },
-  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' },
-  is_sales                => { type => 'boolean' },
-  itime                   => { type => 'timestamp', default => 'now()' },
-  language_id             => { type => 'integer' },
-  mtime                   => { type => 'timestamp' },
-  notes                   => { type => 'text' },
-  ordnumber               => { type => 'text' },
-  oreqnumber              => { type => 'text' },
-  reqdate                 => { type => 'date' },
-  salesman_id             => { type => 'integer' },
-  shippingpoint           => { type => 'text' },
-  shipto_id               => { type => 'integer' },
-  shipvia                 => { type => 'text' },
-  taxincluded             => { type => 'boolean' },
-  taxzone_id              => { type => 'integer' },
-  terms                   => { type => 'integer' },
-  transaction_description => { type => 'text' },
-  transdate               => { type => 'date', default => 'now()' },
-  vendor_id               => { type => 'integer' },
+  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' },
+  ordnumber                  => { type => 'text' },
+  oreqnumber                 => { type => 'text' },
+  payment_id                 => { type => 'integer' },
+  record_type                => { type => 'enum', check_in => [ 'sales_delivery_order', 'purchase_delivery_order', 'supplier_delivery_order', 'rma_delivery_order' ], db_type => 'delivery_order_types', not_null => 1 },
+  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_confirmation_number => { type => 'text' },
+  vendor_id                  => { type => 'integer' },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
@@ -46,6 +50,11 @@ __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' },
@@ -61,6 +70,11 @@ __PACKAGE__->meta->foreign_keys(
     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' },
@@ -81,6 +95,11 @@ __PACKAGE__->meta->foreign_keys(
     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' },
@@ -91,6 +110,11 @@ __PACKAGE__->meta->foreign_keys(
     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' },