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

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

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 8063f9e..1fde1bb 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -20,7 +20,6 @@ __PACKAGE__->meta->setup(
     weightunit                          => { type => 'varchar', length => 5 },
     businessnumber                      => { type => 'text' },
     version                             => { type => 'varchar', length => 8 },
-    curr                                => { type => 'text' },
     closedto                            => { type => 'date' },
     revtrans                            => { type => 'boolean', default => 'false' },
     ponumber                            => { type => 'text' },
@@ -70,10 +69,13 @@ __PACKAGE__->meta->setup(
     assemblynumber                      => { type => 'text' },
     warehouse_id                        => { type => 'integer' },
     bin_id                              => { type => 'integer' },
+    currency_id                         => { type => 'integer', not_null => 1 },
   ],
 
   primary_key_columns => [ 'id' ],
 
+  allow_inline_column_values => 1,
+
   foreign_keys => [
     bin => {
       class       => 'SL::DB::Bin',
@@ -83,6 +85,10 @@ __PACKAGE__->meta->setup(
     warehouse => {
       class       => 'SL::DB::Warehouse',
       key_columns => { warehouse_id => 'id' },
+
+    currency => {
+      class       => 'SL::DB::Currency',
+      key_columns => { currency_id => 'id' },
     },
   ],
 );