Rose-Model Wiederkehrende Rechnungen: Foreign Key "order" nennen, nicht "oe"

diff --git a/SL/DB/MetaSetup/PeriodicInvoicesConfig.pm b/SL/DB/MetaSetup/PeriodicInvoicesConfig.pm
index aeaf1c2ed0796a9f565e99ae940605d61710a6c6..8860e8c8054104ec6563ac5335839b18d1747775 100644 (file)
--- a/SL/DB/MetaSetup/PeriodicInvoicesConfig.pm
+++ b/SL/DB/MetaSetup/PeriodicInvoicesConfig.pm
@@ -32,7 +32,7 @@ __PACKAGE__->meta->setup(
       key_columns => { ar_chart_id => 'id' },
     },
 
       key_columns => { ar_chart_id => 'id' },
     },
 

-    oe => {
+    order => {

       class       => 'SL::DB::Order',
       key_columns => { oe_id => 'id' },
     },
       class       => 'SL::DB::Order',
       key_columns => { oe_id => 'id' },
     },

diff --git a/SL/DB/PeriodicInvoicesConfig.pm b/SL/DB/PeriodicInvoicesConfig.pm
index c9ef22285cb59f17e310782e8a8b5d882dd1c681..2b4542a97f8caa778b37f5de09b900a87a81ec46 100644 (file)
--- a/SL/DB/PeriodicInvoicesConfig.pm
+++ b/SL/DB/PeriodicInvoicesConfig.pm
@@ -4,16 +4,6 @@ use strict;
 
 use SL::DB::MetaSetup::PeriodicInvoicesConfig;
 
 
 use SL::DB::MetaSetup::PeriodicInvoicesConfig;
 

-__PACKAGE__->meta->add_relationships(
-  order        => {
-    type       => 'many to one',
-    class      => 'SL::DB::Order',
-    column_map => { oe_id => 'id' },
-  },
-);
-
-__PACKAGE__->meta->initialize;
-

 # Creates get_all, get_all_count, get_all_iterator, delete_all and update_all.
 __PACKAGE__->meta->make_manager_class;
 
 # Creates get_all, get_all_count, get_all_iterator, delete_all and update_all.
 __PACKAGE__->meta->make_manager_class;
 

diff --git a/scripts/rose_auto_create_model.pl b/scripts/rose_auto_create_model.pl
index 20048f2d46822eb86c54cc8156223d6ca4f1e4eb..7aab08393be2cc44801b9a8a11e3254a911dd2ab 100755 (executable)
--- a/scripts/rose_auto_create_model.pl
+++ b/scripts/rose_auto_create_model.pl
@@ -52,6 +52,8 @@ our %foreign_key_name_map = (
   orderitems           => { parts => 'part', trans => 'order', },
   delivery_order_items => { parts => 'part' },
   invoice              => { parts => 'part' },
   orderitems           => { parts => 'part', trans => 'order', },
   delivery_order_items => { parts => 'part' },
   invoice              => { parts => 'part' },

+
+  periodic_invoices_configs => { oe => 'order' },

 );
 
 sub setup {
 );
 
 sub setup {