Merge branch 'b-3.6.1' into mebil

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

diff --git a/SL/DB/MetaSetup/Shop.pm b/SL/DB/MetaSetup/Shop.pm
index 1110fd0..adb6b3a 100644 (file)
--- a/SL/DB/MetaSetup/Shop.pm
+++ b/SL/DB/MetaSetup/Shop.pm
@@ -9,27 +9,29 @@ use parent qw(SL::DB::Object);
 __PACKAGE__->meta->table('shops');
 
 __PACKAGE__->meta->columns(
-  connector               => { type => 'text' },
-  description             => { type => 'text' },
-  id                      => { type => 'serial', not_null => 1 },
-  itime                   => { type => 'timestamp', default => 'now()' },
-  last_order_number       => { type => 'integer' },
-  login                   => { type => 'text' },
-  mtime                   => { type => 'timestamp', default => 'now()' },
-  obsolete                => { type => 'boolean', default => 'false', not_null => 1 },
-  orders_to_fetch         => { type => 'integer' },
-  password                => { type => 'text' },
-  path                    => { type => 'text', default => '/', not_null => 1 },
-  port                    => { type => 'integer' },
-  price_source            => { type => 'text' },
-  pricetype               => { type => 'text' },
-  protocol                => { type => 'text', default => 'http', not_null => 1 },
-  realm                   => { type => 'text' },
-  server                  => { type => 'text' },
-  shipping_costs_parts_id => { type => 'integer' },
-  sortkey                 => { type => 'integer' },
-  taxzone_id              => { type => 'integer' },
-  transaction_description => { type => 'text' },
+  connector                => { type => 'text' },
+  description              => { type => 'text' },
+  id                       => { type => 'serial', not_null => 1 },
+  itime                    => { type => 'timestamp', default => 'now()' },
+  last_order_number        => { type => 'integer' },
+  login                    => { type => 'text' },
+  mtime                    => { type => 'timestamp', default => 'now()' },
+  obsolete                 => { type => 'boolean', default => 'false', not_null => 1 },
+  orders_to_fetch          => { type => 'integer' },
+  password                 => { type => 'text' },
+  path                     => { type => 'text', default => '/', not_null => 1 },
+  port                     => { type => 'integer' },
+  price_source             => { type => 'text' },
+  pricetype                => { type => 'text' },
+  protocol                 => { type => 'text', default => 'http', not_null => 1 },
+  proxy                    => { type => 'text', default => '' },
+  realm                    => { type => 'text' },
+  server                   => { type => 'text' },
+  shipping_costs_parts_id  => { type => 'integer' },
+  sortkey                  => { type => 'integer' },
+  taxzone_id               => { type => 'integer' },
+  transaction_description  => { type => 'text' },
+  use_part_longdescription => { type => 'boolean', default => 'false' },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);