From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 6 Oct 2010 08:33:28 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~106
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/4cbe32ff62fcce20fff876292ace807c5a61535b?hp=d4377730809a8429a5e8e870b0d2b534081f3c42

Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
---

diff --git a/SL/DB/MetaSetup/Assembly.pm b/SL/DB/MetaSetup/Assembly.pm
index 408eea7af..038795183 100644
--- a/SL/DB/MetaSetup/Assembly.pm
+++ b/SL/DB/MetaSetup/Assembly.pm
@@ -16,14 +16,10 @@ __PACKAGE__->meta->setup(
     bom         => { type => 'boolean' },
     itime       => { type => 'timestamp', default => 'now()' },
     mtime       => { type => 'timestamp' },
-    variable    => { type => 'boolean', default => 'false', not_null => 1, remarks => 'true if this part of the assembly is variable, and can be modified' },
-    item_id     => { type => 'integer', remarks => 'used to group parts in an assembly for exclusive options' },
     assembly_id => { type => 'serial', not_null => 1 },
   ],
 
   primary_key_columns => [ 'assembly_id' ],
-
-  allow_inline_column_values => 1,
 );
 
 1;