--- a/svv/database.py	Mon Jan 10 18:33:15 2011 +0200
+++ b/svv/database.py	Mon Jan 10 19:03:10 2011 +0200
@@ -104,17 +104,17 @@
         Column('quantity', Integer, nullable=True),
 )
 
-## items included in order
-#order_items = Table('order_items', schema,
-#        # order we are part of
-#        Column('order_id', None, ForeignKey('orders.id'), primary_key=True),
-#        
-#        # which item is selected
-#        Column('item_id', None, ForeignKey('items.id'), primary_key=True),
-#
-#        # how many out of total quantity
-#        Column('quantity', Integer, nullable=True),
-#)
+# items included in order
+order_items = Table('order_items', schema,
+        # order we are part of
+        Column('order_id', None, ForeignKey('orders.id'), primary_key=True),
+        
+        # which item is selected
+        Column('item_id', None, ForeignKey('items.id'), primary_key=True),
+
+        # how many out of total quantity
+        Column('quantity', Integer, nullable=True),
+)
 
 ## editable contract terms for customer order
 ## provision for standard terms, or more specific ones for certain customers

--- a/svv/items.py	Mon Jan 10 18:33:15 2011 +0200
+++ b/svv/items.py	Mon Jan 10 19:03:10 2011 +0200
@@ -82,7 +82,7 @@
                 html.legend(legend),
 
                 html.ol(
-                    self.render_form_field('item_parent', u"Case", u"Missä laite sijaitsee", (
+                    self.render_form_field('item_parent', u"Sijainti", u"Missä laite sijaitsee", (
                         self.render_parent_select('item_parent', self.item_parent_id)
                     )),
 
@@ -568,7 +568,7 @@
                 html.tr(
                     html.th(title) for title in (
                         u"#ID",
-                        u"Case" if not parent else None,
+                        u"Sijainti" if not parent else None,
                         u"Nimi",
                         u"Kuvaus",
                         u"Määrä",