Merge branch 'gewicht'

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

diff --git a/SL/DB/MetaSetup/Order.pm b/SL/DB/MetaSetup/Order.pm
index 914918d..063ca0b 100644 (file)
--- a/SL/DB/MetaSetup/Order.pm
+++ b/SL/DB/MetaSetup/Order.pm
@@ -21,14 +21,13 @@ __PACKAGE__->meta->setup(
     taxincluded             => { type => 'boolean' },
     shippingpoint           => { type => 'text' },
     notes                   => { type => 'text' },
-    curr                    => { type => 'character', length => 3 },
     employee_id             => { type => 'integer' },
     closed                  => { type => 'boolean', default => 'false' },
     quotation               => { type => 'boolean', default => 'false' },
     quonumber               => { type => 'text' },
     cusordnumber            => { type => 'text' },
     intnotes                => { type => 'text' },
-    department_id           => { type => 'integer', default => '0' },
+    department_id           => { type => 'integer' },
     itime                   => { type => 'timestamp', default => 'now()' },
     mtime                   => { type => 'timestamp' },
     shipvia                 => { type => 'text' },
@@ -43,11 +42,10 @@ __PACKAGE__->meta->setup(
     delivered               => { type => 'boolean', default => 'false' },
     globalproject_id        => { type => 'integer' },
     salesman_id             => { type => 'integer' },
-    transaction_description => { type => 'text' },
     marge_total             => { type => 'numeric', precision => 5, scale => 15 },
     marge_percent           => { type => 'numeric', precision => 5, scale => 15 },
-    notes_bottom            => { type => 'text' },
-    project_manager_id      => { type => 'integer' },
+    transaction_description => { type => 'text' },
+    currency_id             => { type => 'integer', not_null => 1 },
   ],
 
   primary_key_columns => [ 'id' ],
@@ -55,6 +53,36 @@ __PACKAGE__->meta->setup(
   allow_inline_column_values => 1,
 
   foreign_keys => [
+    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_customer => {
+      class       => 'SL::DB::Customer',
+      key_columns => { delivery_customer_id => 'id' },
+    },
+
+    delivery_vendor => {
+      class       => 'SL::DB::Vendor',
+      key_columns => { delivery_vendor_id => 'id' },
+    },
+
+    department => {
+      class       => 'SL::DB::Department',
+      key_columns => { department_id => 'id' },
+    },
+
     employee => {
       class       => 'SL::DB::Employee',
       key_columns => { employee_id => 'id' },
@@ -65,15 +93,30 @@ __PACKAGE__->meta->setup(
       key_columns => { globalproject_id => 'id' },
     },
 
-    project_manager => {
-      class       => 'SL::DB::Employee',
-      key_columns => { project_manager_id => 'id' },
+    language => {
+      class       => 'SL::DB::Language',
+      key_columns => { language_id => 'id' },
+    },
+
+    payment_terms => {
+      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' },
+    },
+
+    vendor => {
+      class       => 'SL::DB::Vendor',
+      key_columns => { vendor_id => 'id' },
+    },
   ],
 );