rdbo models: customer und vendor nach de8868c und 4c4939d0.

diff --git a/SL/DB/Customer.pm b/SL/DB/Customer.pm
index f9f890167b39c384e4004cd04e14d60119ca652a..2e3fa68562bbb50ad5d95798aa0fef1ebb4310c2 100644 (file)
--- a/SL/DB/Customer.pm
+++ b/SL/DB/Customer.pm
@@ -26,11 +26,6 @@ __PACKAGE__->meta->add_relationship(
     column_map   => { id      => 'cp_cv_id' },
     manager_args => { sort_by => 'lower(contacts.cp_name)' },
   },
     column_map   => { id      => 'cp_cv_id' },
     manager_args => { sort_by => 'lower(contacts.cp_name)' },
   },

-  business => {
-    type         => 'one to one',
-    class        => 'SL::DB::Business',
-    column_map   => { business_id => 'id' },
-  },

 );
 
 __PACKAGE__->meta->initialize;
 );
 
 __PACKAGE__->meta->initialize;

diff --git a/SL/DB/MetaSetup/Customer.pm b/SL/DB/MetaSetup/Customer.pm
index 00bdb258f4089fd02a342fc5ca3e716c80dc0320..181f6e658374bfd8b99c0d728881c17588ab4d65 100644 (file)
--- a/SL/DB/MetaSetup/Customer.pm
+++ b/SL/DB/MetaSetup/Customer.pm
@@ -51,14 +51,30 @@ __PACKAGE__->meta->setup(
     taxzone_id     => { type => 'integer', default => '0', not_null => 1 },
     greeting       => { type => 'text' },
     ustid          => { type => 'text' },
     taxzone_id     => { type => 'integer', default => '0', not_null => 1 },
     greeting       => { type => 'text' },
     ustid          => { type => 'text' },

+    direct_debit   => { type => 'boolean', default => 'false' },

     iban           => { type => 'varchar', length => 100 },
     bic            => { type => 'varchar', length => 100 },
     iban           => { type => 'varchar', length => 100 },
     bic            => { type => 'varchar', length => 100 },

-    direct_debit   => { type => 'boolean', default => 'false' },
+    curr           => { type => 'character', length => 3 },

   ],
 
   primary_key_columns => [ 'id' ],
 
   ],
 
   primary_key_columns => [ 'id' ],
 

-  allow_inline_column_values => 1,
+  foreign_keys => [
+    business => {
+      class       => 'SL::DB::Business',
+      key_columns => { business_id => 'id' },
+    },
+
+    language_obj => {
+      class       => 'SL::DB::Language',
+      key_columns => { language_id => 'id' },
+    },
+
+    payment => {
+      class       => 'SL::DB::PaymentTerm',
+      key_columns => { payment_id => 'id' },
+    },
+  ],

 );
 
 1;
 );
 
 1;

diff --git a/SL/DB/MetaSetup/Vendor.pm b/SL/DB/MetaSetup/Vendor.pm
index ae71c6293d1ad9479236e3e204614bda98bff80e..2fc47cc181290c14df1f6255cf52d310d5e5666d 100644 (file)
--- a/SL/DB/MetaSetup/Vendor.pm
+++ b/SL/DB/MetaSetup/Vendor.pm
@@ -54,6 +54,7 @@ __PACKAGE__->meta->setup(
     direct_debit   => { type => 'boolean', default => 'false' },
     iban           => { type => 'varchar', length => 100 },
     bic            => { type => 'varchar', length => 100 },
     direct_debit   => { type => 'boolean', default => 'false' },
     iban           => { type => 'varchar', length => 100 },
     bic            => { type => 'varchar', length => 100 },

+    curr           => { type => 'character', length => 3 },

   ],
 
   primary_key_columns => [ 'id' ],
   ],
 
   primary_key_columns => [ 'id' ],