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

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

diff --git a/SL/DB/MetaSetup/Shipto.pm b/SL/DB/MetaSetup/Shipto.pm
index 0d619ea..57b4971 100644 (file)
--- a/SL/DB/MetaSetup/Shipto.pm
+++ b/SL/DB/MetaSetup/Shipto.pm
@@ -4,55 +4,34 @@ package SL::DB::Shipto;
 
 use strict;
 
-use base qw(SL::DB::Object);
+use parent qw(SL::DB::Object);
 
 __PACKAGE__->meta->table('shipto');
 
 __PACKAGE__->meta->columns(
-  trans_id           => { type => 'integer' },
-  shiptoname         => { type => 'varchar', length => 75 },
-  shiptodepartment_1 => { type => 'varchar', length => 75 },
-  shiptodepartment_2 => { type => 'varchar', length => 75 },
-  shiptostreet       => { type => 'varchar', length => 75 },
-  shiptozipcode      => { type => 'varchar', length => 75 },
-  shiptocity         => { type => 'varchar', length => 75 },
-  shiptocountry      => { type => 'varchar', length => 75 },
-  shiptocontact      => { type => 'varchar', length => 75 },
-  shiptophone        => { type => 'varchar', length => 30 },
-  shiptofax          => { type => 'varchar', length => 30 },
-  shiptoemail        => { type => 'text' },
   itime              => { type => 'timestamp', default => 'now()' },
-  mtime              => { type => 'timestamp' },
   module             => { type => 'text' },
+  mtime              => { type => 'timestamp' },
   shipto_id          => { type => 'integer', not_null => 1, sequence => 'id' },
+  shiptocity         => { type => 'text' },
+  shiptocontact      => { type => 'text' },
+  shiptocountry      => { type => 'text' },
   shiptocp_gender    => { type => 'text' },
+  shiptodepartment_1 => { type => 'text' },
+  shiptodepartment_2 => { type => 'text' },
+  shiptoemail        => { type => 'text' },
+  shiptofax          => { type => 'text' },
+  shiptogln          => { type => 'text' },
+  shiptoname         => { type => 'text' },
+  shiptophone        => { type => 'text' },
+  shiptostreet       => { type => 'text' },
+  shiptozipcode      => { type => 'text' },
+  trans_id           => { type => 'integer' },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'shipto_id' ]);
 
 __PACKAGE__->meta->allow_inline_column_values(1);
 
-__PACKAGE__->meta->relationships(
-  ar => {
-    class      => 'SL::DB::Invoice',
-    column_map => { shipto_id => 'shipto_id' },
-    type       => 'one to many',
-  },
-
-  delivery_orders => {
-    class      => 'SL::DB::DeliveryOrder',
-    column_map => { shipto_id => 'shipto_id' },
-    type       => 'one to many',
-  },
-
-  oe => {
-    class      => 'SL::DB::Order',
-    column_map => { shipto_id => 'shipto_id' },
-    type       => 'one to many',
-  },
-);
-
-# __PACKAGE__->meta->initialize;
-
 1;
 ;