Merge branch 'master' of github.com:kivitendo/kivitendo-erp

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

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 7b1df394f4ad588de11040b6dff1f856636d2e6e..6c1e5ecfbc8d32e4fd6e318581adc8929d2e8163 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -67,7 +67,10 @@ __PACKAGE__->meta->setup(
     ar_show_mark_as_paid                => { type => 'boolean', default => 'true' },
     ap_show_mark_as_paid                => { type => 'boolean', default => 'true' },
     assemblynumber                      => { type => 'text' },
+    warehouse_id                        => { type => 'integer' },
+    bin_id                              => { type => 'integer' },
     currency_id                         => { type => 'integer', not_null => 1 },
+    show_weight                         => { type => 'boolean', default => 'false', not_null => 1 },
   ],
 
   primary_key_columns => [ 'id' ],
@@ -75,6 +78,15 @@ __PACKAGE__->meta->setup(
   allow_inline_column_values => 1,
 
   foreign_keys => [
+    bin => {
+      class       => 'SL::DB::Bin',
+      key_columns => { bin_id => 'id' },
+    },
+
+    warehouse => {
+      class       => 'SL::DB::Warehouse',
+      key_columns => { warehouse_id => 'id' },
+    },
     currency => {
       class       => 'SL::DB::Currency',
       key_columns => { currency_id => 'id' },