X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FMetaSetup%2FOrderItem.pm;h=85bf5bee6d8fa100eeb3d8f011993465881e0259;hb=766f5705ecb9cd56adfbffd94c871959bb64c6fd;hp=dd2fde76e63b7dda6a4eeaa3cf5e13a1dd9365ba;hpb=b8b112a39bd601b0bc717646d78de470631da22a;p=kivitendo-erp.git

diff --git a/SL/DB/MetaSetup/OrderItem.pm b/SL/DB/MetaSetup/OrderItem.pm
index dd2fde76e..85bf5bee6 100644
--- a/SL/DB/MetaSetup/OrderItem.pm
+++ b/SL/DB/MetaSetup/OrderItem.pm
@@ -9,33 +9,33 @@ use base qw(SL::DB::Object);
 __PACKAGE__->meta->table('orderitems');
 
 __PACKAGE__->meta->columns(
-  trans_id           => { type => 'integer' },
-  parts_id           => { type => 'integer' },
+  base_qty           => { type => 'float', scale => 4 },
+  cusordnumber       => { type => 'text' },
   description        => { type => 'text' },
-  qty                => { type => 'float', precision => 4 },
-  sellprice          => { type => 'numeric', precision => 5, scale => 15 },
-  discount           => { type => 'float', precision => 4 },
-  project_id         => { type => 'integer' },
-  reqdate            => { type => 'date' },
-  ship               => { type => 'float', precision => 4 },
-  serialnumber       => { type => 'text' },
+  discount           => { type => 'float', scale => 4 },
   id                 => { type => 'integer', not_null => 1, sequence => 'orderitemsid' },
   itime              => { type => 'timestamp', default => 'now()' },
+  lastcost           => { type => 'numeric', precision => 15, scale => 5 },
+  longdescription    => { type => 'text' },
+  marge_percent      => { type => 'numeric', precision => 15, scale => 5 },
+  marge_price_factor => { type => 'numeric', default => 1, precision => 15, scale => 5 },
+  marge_total        => { type => 'numeric', precision => 15, scale => 5 },
   mtime              => { type => 'timestamp' },
-  pricegroup_id      => { type => 'integer' },
   ordnumber          => { type => 'text' },
+  parts_id           => { type => 'integer' },
+  price_factor       => { type => 'numeric', default => 1, precision => 15, scale => 5 },
+  price_factor_id    => { type => 'integer' },
+  pricegroup_id      => { type => 'integer' },
+  project_id         => { type => 'integer' },
+  qty                => { type => 'float', scale => 4 },
+  reqdate            => { type => 'date' },
+  sellprice          => { type => 'numeric', precision => 15, scale => 5 },
+  serialnumber       => { type => 'text' },
+  ship               => { type => 'float', scale => 4 },
+  subtotal           => { type => 'boolean', default => 'false' },
+  trans_id           => { type => 'integer' },
   transdate          => { type => 'text' },
-  cusordnumber       => { type => 'text' },
   unit               => { type => 'varchar', length => 20 },
-  base_qty           => { type => 'float', precision => 4 },
-  subtotal           => { type => 'boolean', default => 'false' },
-  longdescription    => { type => 'text' },
-  marge_total        => { type => 'numeric', precision => 5, scale => 15 },
-  marge_percent      => { type => 'numeric', precision => 5, scale => 15 },
-  lastcost           => { type => 'numeric', precision => 5, scale => 15 },
-  price_factor_id    => { type => 'integer' },
-  price_factor       => { type => 'numeric', default => 1, precision => 5, scale => 15 },
-  marge_price_factor => { type => 'numeric', default => 1, precision => 5, scale => 15 },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
@@ -43,6 +43,11 @@ __PACKAGE__->meta->primary_key_columns([ 'id' ]);
 __PACKAGE__->meta->allow_inline_column_values(1);
 
 __PACKAGE__->meta->foreign_keys(
+  order => {
+    class       => 'SL::DB::Order',
+    key_columns => { trans_id => 'id' },
+  },
+
   part => {
     class       => 'SL::DB::Part',
     key_columns => { parts_id => 'id' },
@@ -63,13 +68,11 @@ __PACKAGE__->meta->foreign_keys(
     key_columns => { project_id => 'id' },
   },
 
-  order => {
-    class       => 'SL::DB::Order',
-    key_columns => { trans_id => 'id' },
+  unit_obj => {
+    class       => 'SL::DB::Unit',
+    key_columns => { unit => 'name' },
   },
 );
 
-# __PACKAGE__->meta->initialize;
-
 1;
 ;