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 1fde1bbfaf176bbf6a0fb858fe4d048e2db89b54..6c1e5ecfbc8d32e4fd6e318581adc8929d2e8163 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -70,6 +70,7 @@ __PACKAGE__->meta->setup(
     warehouse_id                        => { type => 'integer' },
     bin_id                              => { type => 'integer' },
     currency_id                         => { type => 'integer', not_null => 1 },
     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' ],
   ],
 
   primary_key_columns => [ 'id' ],


@@ -85,7 +86,7 @@ __PACKAGE__->meta->setup(
     warehouse => {
       class       => 'SL::DB::Warehouse',
       key_columns => { warehouse_id => 'id' },
     warehouse => {
       class       => 'SL::DB::Warehouse',
       key_columns => { warehouse_id => 'id' },

-
+    },

     currency => {
       class       => 'SL::DB::Currency',
       key_columns => { currency_id => 'id' },
     currency => {
       class       => 'SL::DB::Currency',
       key_columns => { currency_id => 'id' },