Merge pull request #30 from rebootl/csv-import-script-fix

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

diff --git a/SL/DB/MetaSetup/TimeRecording.pm b/SL/DB/MetaSetup/TimeRecording.pm
index cb3bdd5..a500131 100644 (file)
--- a/SL/DB/MetaSetup/TimeRecording.pm
+++ b/SL/DB/MetaSetup/TimeRecording.pm
@@ -11,17 +11,20 @@ __PACKAGE__->meta->table('time_recordings');
 __PACKAGE__->meta->columns(
   booked          => { type => 'boolean', default => 'false' },
   customer_id     => { type => 'integer', not_null => 1 },
+  date            => { type => 'date', not_null => 1 },
   description     => { type => 'text', not_null => 1 },
+  duration        => { type => 'integer' },
   employee_id     => { type => 'integer', not_null => 1 },
   end_time        => { type => 'timestamp' },
   id              => { type => 'serial', not_null => 1 },
   itime           => { type => 'timestamp', default => 'now()', not_null => 1 },
   mtime           => { type => 'timestamp', default => 'now()', not_null => 1 },
+  order_id        => { type => 'integer' },
+  part_id         => { type => 'integer' },
   payroll         => { type => 'boolean', default => 'false' },
   project_id      => { type => 'integer' },
   staff_member_id => { type => 'integer', not_null => 1 },
-  start_time      => { type => 'timestamp', not_null => 1 },
-  type_id         => { type => 'integer' },
+  start_time      => { type => 'timestamp' },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
@@ -39,6 +42,16 @@ __PACKAGE__->meta->foreign_keys(
     key_columns => { employee_id => 'id' },
   },
 
+  order => {
+    class       => 'SL::DB::Order',
+    key_columns => { order_id => 'id' },
+  },
+
+  part => {
+    class       => 'SL::DB::Part',
+    key_columns => { part_id => 'id' },
+  },
+
   project => {
     class       => 'SL::DB::Project',
     key_columns => { project_id => 'id' },
@@ -48,11 +61,6 @@ __PACKAGE__->meta->foreign_keys(
     class       => 'SL::DB::Employee',
     key_columns => { staff_member_id => 'id' },
   },
-
-  type => {
-    class       => 'SL::DB::TimeRecordingType',
-    key_columns => { type_id => 'id' },
-  },
 );
 
 1;