Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

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

diff --git a/SL/DB/MetaSetup/Vendor.pm b/SL/DB/MetaSetup/Vendor.pm
index 8367137a351ade37efc9a71ec591f5117371ef7c..a4578028b4a0858685b5eb0b2baeb9ad5e4b8779 100644 (file)
--- a/SL/DB/MetaSetup/Vendor.pm
+++ b/SL/DB/MetaSetup/Vendor.pm
@@ -4,7 +4,7 @@ package SL::DB::Vendor;
 
 use strict;
 
-use base qw(SL::DB::Object);
+use parent qw(SL::DB::Object);
 
 __PACKAGE__->meta->table('vendor');
 
@@ -26,9 +26,10 @@ __PACKAGE__->meta->columns(
   department_2     => { type => 'text' },
   depositor        => { type => 'text' },
   direct_debit     => { type => 'boolean', default => 'false' },
-  discount         => { type => 'float', scale => 4 },
+  discount         => { type => 'float', precision => 4, scale => 4 },
   email            => { type => 'text' },
   fax              => { type => 'text' },
+  gln              => { type => 'text' },
   greeting         => { type => 'text' },
   homepage         => { type => 'text' },
   iban             => { type => 'text' },
@@ -38,6 +39,7 @@ __PACKAGE__->meta->columns(
   language_id      => { type => 'integer' },
   mtime            => { type => 'timestamp' },
   name             => { type => 'text', not_null => 1 },
+  natural_person   => { type => 'boolean', default => 'false' },
   notes            => { type => 'text' },
   obsolete         => { type => 'boolean', default => 'false' },
   payment_id       => { type => 'integer' },
@@ -46,8 +48,7 @@ __PACKAGE__->meta->columns(
   street           => { type => 'text' },
   taxincluded      => { type => 'boolean' },
   taxnumber        => { type => 'text' },
-  taxzone_id       => { type => 'integer', default => '0', not_null => 1 },
-  terms            => { type => 'integer', default => '0' },
+  taxzone_id       => { type => 'integer', not_null => 1 },
   user_password    => { type => 'text' },
   username         => { type => 'text' },
   ustid            => { type => 'text' },
@@ -85,6 +86,11 @@ __PACKAGE__->meta->foreign_keys(
     class       => 'SL::DB::PaymentTerm',
     key_columns => { payment_id => 'id' },
   },
+
+  taxzone => {
+    class       => 'SL::DB::TaxZone',
+    key_columns => { taxzone_id => 'id' },
+  },
 );
 
 1;