SVN commit 609471 by freitag:

- removed useless tables from db create script
- added organisation to invoice doc template


 M  +2 -21     database/create_schema.sql  
 M  +2 -2      reports/invoice.trml  


--- trunk/playground/office/kraft/database/create_schema.sql #609470:609471
@@ -120,9 +120,9 @@
 
 
 
-CREATE TABLE stockMat (
+CREATE TABLE stockMaterial (
 	matID        INT NOT NULL AUTO_INCREMENT,
-	matChapter   INT NOT NULL default 1,
+	chapterID    INT NOT NULL default 1,
 	material     mediumtext,
 	unitID       INT NOT NULL,
 	perPack	     DECIMAL(6,2),
@@ -133,25 +133,6 @@
 	INDEX(matChapter)
 );
 
-
-
-CREATE TABLE stockMatChapter (
-	stockMatChapterID     INT NOT NULL AUTO_INCREMENT,
-	matKatID	      INT NOT NULL,
-	stockMatChapter       VARCHAR(255),
-	sortID                INT,
-
-	PRIMARY KEY(stockMatChapterID)
-);
-
-CREATE TABLE matKats(
-	matKatID 	      INT NOT NULL AUTO_INCREMENT,
-	matKatName            VARCHAR(255),
-
-	PRIMARY KEY(matKatID)
-
-);
-
 CREATE TABLE stdSaetze( 
 	stdSaetzeID	      INT NOT NULL AUTO_INCREMENT,
 	name                  VARCHAR(255),
--- trunk/playground/office/kraft/reports/invoice.trml #609470:609471
@@ -11,7 +11,7 @@
 	    <lineMode width="0.5" />
             <lines>2cm 2.2cm 19cm 2.2cm</lines>
 	    <fill color="darkgreen" />
-            <drawCentredString x="105mm" y="2.3cm"><!-- MY.NAME --></drawCentredString>
+            <drawCentredString x="105mm" y="2.3cm"><!-- MY.NAME --> <!-- MY.ORGANISATION --></drawCentredString>
 	    <setFont name="Times-Roman" size="10" />
 	    <fill color="black" />
             <drawCentredString x="105mm" y="1.8cm"><!-- MY.STREET --> - <!-- MY.POSTCODE --> <!-- MY.LOCALITY --></drawCentredString>
@@ -32,7 +32,7 @@
 	    <lineMode width="0.5" />
             <lines>2cm 2.2cm 19cm 2.2cm</lines>
 	    <fill color="darkgreen" />
-            <drawCentredString x="105mm" y="2.3cm"><!-- MY.NAME --></drawCentredString>
+            <drawCentredString x="105mm" y="2.3cm"><!-- MY.NAME --> <!-- MY.ORGANISATION --></drawCentredString>
 	    <setFont name="Times-Roman" size="10" />
 	    <fill color="black" />
             <drawCentredString x="105mm" y="1.8cm"><!-- MY.STREET --> - <!-- MY.POSTCODE --> <!-- MY.LOCALITY --></drawCentredString>