Merge branch 'master' into dev

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

diff --git a/SL/DB/MetaSetup/Order.pm b/SL/DB/MetaSetup/Order.pm
index de072ec..f68c276 100644 (file)
--- a/SL/DB/MetaSetup/Order.pm
+++ b/SL/DB/MetaSetup/Order.pm
@@ -83,11 +83,6 @@ __PACKAGE__->meta->setup(
       key_columns => { employee_id => 'id' },
     },
 
-    employee_obj => {
-      class       => 'SL::DB::Employee',
-      key_columns => { employee_id => 'id' },
-    },
-
     globalproject => {
       class       => 'SL::DB::Project',
       key_columns => { globalproject_id => 'id' },
@@ -98,7 +93,7 @@ __PACKAGE__->meta->setup(
       key_columns => { language_id => 'id' },
     },
 
-    payment => {
+    payment_terms => {
       class       => 'SL::DB::PaymentTerm',
       key_columns => { payment_id => 'id' },
     },