X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FMetaSetup%2FInvoice.pm;h=b88c2f57c087afe3a6562c95709d8ce42b4ff9bb;hb=79c0cb3ee3c502c560d4b541eeb5e662fe50bbbd;hp=8a942fc45703ae857f155bd26cb9a0d06e8d504c;hpb=4bcf880408fcc4270084f36520d4fd2cfd509fbc;p=kivitendo-erp.git

diff --git a/SL/DB/MetaSetup/Invoice.pm b/SL/DB/MetaSetup/Invoice.pm
index 8a942fc45..b88c2f57c 100644
--- a/SL/DB/MetaSetup/Invoice.pm
+++ b/SL/DB/MetaSetup/Invoice.pm
@@ -4,58 +4,58 @@ package SL::DB::Invoice;
 
 use strict;
 
-use base qw(SL::DB::Object);
+use parent qw(SL::DB::Object);
 
 __PACKAGE__->meta->table('ar');
 
 __PACKAGE__->meta->columns(
-  id                        => { type => 'integer', not_null => 1, sequence => 'glid' },
-  invnumber                 => { type => 'text', not_null => 1 },
-  transdate                 => { type => 'date', default => 'now' },
-  gldate                    => { type => 'date', default => 'now' },
+  amount                    => { type => 'numeric', default => '0', not_null => 1, precision => 15, scale => 5 },
+  cp_id                     => { type => 'integer' },
+  currency_id               => { type => 'integer', not_null => 1 },
+  cusordnumber              => { type => 'text' },
   customer_id               => { type => 'integer' },
-  taxincluded               => { type => 'boolean' },
-  amount                    => { type => 'numeric', precision => 5, scale => 15 },
-  netamount                 => { type => 'numeric', precision => 5, scale => 15 },
-  paid                      => { type => 'numeric', precision => 5, scale => 15 },
   datepaid                  => { type => 'date' },
-  duedate                   => { type => 'date' },
+  delivery_customer_id      => { type => 'integer' },
+  delivery_term_id          => { type => 'integer' },
+  delivery_vendor_id        => { type => 'integer' },
   deliverydate              => { type => 'date' },
-  invoice                   => { type => 'boolean', default => 'false' },
-  shippingpoint             => { type => 'text' },
-  terms                     => { type => 'integer', default => '0' },
-  notes                     => { type => 'text' },
-  ordnumber                 => { type => 'text' },
+  department_id             => { type => 'integer' },
+  direct_debit              => { type => 'boolean', default => 'false' },
+  donumber                  => { type => 'text' },
+  duedate                   => { type => 'date' },
+  dunning_config_id         => { type => 'integer' },
   employee_id               => { type => 'integer' },
-  quonumber                 => { type => 'text' },
-  cusordnumber              => { type => 'text' },
+  gldate                    => { type => 'date', default => 'now' },
+  globalproject_id          => { type => 'integer' },
+  id                        => { type => 'integer', not_null => 1, sequence => 'glid' },
   intnotes                  => { type => 'text' },
-  department_id             => { type => 'integer' },
-  shipvia                   => { type => 'text' },
+  invnumber                 => { type => 'text', not_null => 1 },
+  invnumber_for_credit_note => { type => 'text' },
+  invoice                   => { type => 'boolean', default => 'false' },
   itime                     => { type => 'timestamp', default => 'now()' },
-  mtime                     => { type => 'timestamp' },
-  cp_id                     => { type => 'integer' },
   language_id               => { type => 'integer' },
-  payment_id                => { type => 'integer' },
-  delivery_customer_id      => { type => 'integer' },
-  delivery_vendor_id        => { type => 'integer' },
-  storno                    => { type => 'boolean', default => 'false' },
-  taxzone_id                => { type => 'integer' },
-  shipto_id                 => { type => 'integer' },
-  type                      => { type => 'text' },
-  dunning_config_id         => { type => 'integer' },
+  marge_percent             => { type => 'numeric', precision => 15, scale => 5 },
+  marge_total               => { type => 'numeric', precision => 15, scale => 5 },
+  mtime                     => { type => 'timestamp' },
+  netamount                 => { type => 'numeric', default => '0', not_null => 1, precision => 15, scale => 5 },
+  notes                     => { type => 'text' },
   orddate                   => { type => 'date' },
+  ordnumber                 => { type => 'text' },
+  paid                      => { type => 'numeric', default => '0', not_null => 1, precision => 15, scale => 5 },
+  payment_id                => { type => 'integer' },
   quodate                   => { type => 'date' },
-  globalproject_id          => { type => 'integer' },
+  quonumber                 => { type => 'text' },
   salesman_id               => { type => 'integer' },
-  transaction_description   => { type => 'text' },
+  shippingpoint             => { type => 'text' },
+  shipto_id                 => { type => 'integer' },
+  shipvia                   => { type => 'text' },
+  storno                    => { type => 'boolean', default => 'false' },
   storno_id                 => { type => 'integer' },
-  marge_total               => { type => 'numeric', precision => 5, scale => 15 },
-  marge_percent             => { type => 'numeric', precision => 5, scale => 15 },
-  donumber                  => { type => 'text' },
-  invnumber_for_credit_note => { type => 'text' },
-  direct_debit              => { type => 'boolean', default => 'false' },
-  currency_id               => { type => 'integer', not_null => 1 },
+  taxincluded               => { type => 'boolean' },
+  taxzone_id                => { type => 'integer', not_null => 1 },
+  transaction_description   => { type => 'text' },
+  transdate                 => { type => 'date', default => 'now' },
+  type                      => { type => 'text' },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
@@ -78,6 +78,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' },
@@ -122,9 +127,12 @@ __PACKAGE__->meta->foreign_keys(
     class       => 'SL::DB::Invoice',
     key_columns => { storno_id => 'id' },
   },
-);
 
-# __PACKAGE__->meta->initialize;
+  taxzone => {
+    class       => 'SL::DB::TaxZone',
+    key_columns => { taxzone_id => 'id' },
+  },
+);
 
 1;
 ;