From 7cc4d2538916f6cb57c59bd8e3b478bd9c4c2357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 18 Oct 2010 09:47:03 +0000
Subject: [PATCH] =?UTF-8?q?Kostenstellen=20Nummer=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/FH-Complete.txp | 93 ++++++++++++++++++++++++++++++------------
 system/checksystem.php |  5 ++-
 2 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp
index 8b66f13c0..5a7b07de7 100644
--- a/system/FH-Complete.txp
+++ b/system/FH-Complete.txp
@@ -36122,8 +36122,8 @@
 					<Top>1472</Top>
 					<Left>2146</Left>
 					<z>0</z>
-					<Width>843</Width>
-					<Height>473</Height>
+					<Width>846</Width>
+					<Height>512</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -37189,7 +37189,7 @@
 						<Id>{20F41636-8E77-4350-B677-A3F3B4033D9D}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>2067</NamePositionX>
-					<NamePositionY>261</NamePositionY>
+					<NamePositionY>281</NamePositionY>
 					<Points>
 						<Point>
 							<x>2224</x>
@@ -37200,12 +37200,12 @@
 							<y>2148</y>
 						</Point>
 						<Point>
-							<x>2427</x>
-							<y>1976</y>
+							<x>2428</x>
+							<y>2015</y>
 						</Point>
 						<Point>
-							<x>2427</x>
-							<y>1945</y>
+							<x>2428</x>
+							<y>1984</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -37446,16 +37446,16 @@
 					<WorkSpaceShape2>
 						<Id>{4CBD4377-C7EA-48BE-B997-5A0FA6DD1269}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2959</NamePositionX>
-					<NamePositionY>1525</NamePositionY>
+					<NamePositionX>2960</NamePositionX>
+					<NamePositionY>1536</NamePositionY>
 					<Points>
 						<Point>
-							<x>2989</x>
-							<y>1708</y>
+							<x>2992</x>
+							<y>1728</y>
 						</Point>
 						<Point>
-							<x>3020</x>
-							<y>1708</y>
+							<x>3023</x>
+							<y>1728</y>
 						</Point>
 						<Point>
 							<x>3128</x>
@@ -37704,16 +37704,16 @@
 					<WorkSpaceShape2>
 						<Id>{250FCCBF-4717-47E0-B8E7-A12BB03889F9}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2605</NamePositionX>
-					<NamePositionY>2159</NamePositionY>
+					<NamePositionX>2606</NamePositionX>
+					<NamePositionY>2179</NamePositionY>
 					<Points>
 						<Point>
-							<x>2708</x>
-							<y>1945</y>
+							<x>2710</x>
+							<y>1984</y>
 						</Point>
 						<Point>
-							<x>2708</x>
-							<y>1976</y>
+							<x>2710</x>
+							<y>2015</y>
 						</Point>
 						<Point>
 							<x>2702</x>
@@ -37834,15 +37834,15 @@
 						<Id>{6419EE86-CB44-41FA-9E2B-1C2555508A93}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>1460</NamePositionX>
-					<NamePositionY>2150</NamePositionY>
+					<NamePositionY>2159</NamePositionY>
 					<Points>
 						<Point>
 							<x>2146</x>
-							<y>1708</y>
+							<y>1728</y>
 						</Point>
 						<Point>
 							<x>2115</x>
-							<y>1708</y>
+							<y>1728</y>
 						</Point>
 						<Point>
 							<x>1005</x>
@@ -38306,15 +38306,15 @@
 					<WorkSpaceShape2>
 						<Id>{5AEA4D3B-818E-4916-AD78-C310205D8563}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2462</NamePositionX>
+					<NamePositionX>2463</NamePositionX>
 					<NamePositionY>1315</NamePositionY>
 					<Points>
 						<Point>
-							<x>2568</x>
+							<x>2569</x>
 							<y>1472</y>
 						</Point>
 						<Point>
-							<x>2568</x>
+							<x>2569</x>
 							<y>1441</y>
 						</Point>
 						<Point>
@@ -38763,7 +38763,7 @@
 			<Company>Technikum Wien</Company>
 			<Version>2.0</Version>
 			<CreatedDate>2009-04-17T11:15:21.000+02:00</CreatedDate>
-			<ModifiedDate>2010-10-14T17:00:08.101+02:00</ModifiedDate>
+			<ModifiedDate>2010-10-18T11:43:16.932+02:00</ModifiedDate>
 			<Project>FH-Complete 2.0</Project>
 			<Description></Description>
 		</ModelTitlePG83>
@@ -117673,6 +117673,47 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 					<ArrDims></ArrDims>
 					<IsArray>0</IsArray>
 				</PERAttributePG83>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{4D366B60-4AB8-4236-962F-BCB48A669357}</Id>
+					<Name>kostenstelle_nr</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{65081946-25AB-481A-8D7D-C81ECB4D22E5}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<RNOffset>0</RNOffset>
+					<RNLength>0</RNLength>
+					<IgnoreNC>0</IgnoreNC>
+					<GenerateCode>1</GenerateCode>
+					<BeforeScript></BeforeScript>
+					<AfterScript></AfterScript>
+					<Notes></Notes>
+					<Comments></Comments>
+					<DataTypeParam1>4</DataTypeParam1>
+					<DataTypeParam2></DataTypeParam2>
+					<KeepForeignKey>0</KeepForeignKey>
+					<DefaultValue></DefaultValue>
+					<NotNull>0</NotNull>
+					<Migrated>0</Migrated>
+					<Caption>kostenstelle_nr</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{ECB8F02F-B683-4252-8508-ED9D064C9AF3}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
 			</Attributes>
 			<Keys>
 				<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
diff --git a/system/checksystem.php b/system/checksystem.php
index 2658e6ddb..5cc8668e6 100644
--- a/system/checksystem.php
+++ b/system/checksystem.php
@@ -1180,7 +1180,8 @@ if(!@$db->db_query('SELECT * FROM wawi.tbl_konto LIMIT 1'))
 				updatevon varchar(32),
 				insertamum timestamp,
 				insertvon varchar(32),
-				ext_id bigint
+				ext_id bigint,
+				kostenstelle_nr	varchar(4)
 			);
 			
 			CREATE SEQUENCE wawi.seq_kostenstelle_kostenstelle_id
@@ -1663,7 +1664,7 @@ $tabellen=array(
 	"wawi.tbl_betriebsmitteltyp"  => array("betriebsmitteltyp","beschreibung","anzahl","kaution","typ_code"),
 	"wawi.tbl_konto"  => array("konto_id","kontonr","beschreibung","kurzbz","aktiv","insertamum","insertvon","updateamum","updatevon"),
 	"wawi.tbl_konto_kostenstelle"  => array("konto_id","kostenstelle_id","insertamum","insertvon"),
-	"wawi.tbl_kostenstelle"  => array("kostenstelle_id","oe_kurzbz","bezeichnung","kurzbz","aktiv","budget","insertamum","insertvon","updateamum","updatevon","ext_id"),
+	"wawi.tbl_kostenstelle"  => array("kostenstelle_id","oe_kurzbz","bezeichnung","kurzbz","aktiv","budget","insertamum","insertvon","updateamum","updatevon","ext_id","kostenstelle_nr"),
 	"wawi.tbl_bestellungtag"  => array("tag","bestellung_id","insertamum","insertvon"),
 	"wawi.tbl_bestelldetailtag"  => array("tag","bestelldetail_id","insertamum","insertvon"),
 	"wawi.tbl_projekt_bestellung"  => array("projekt_kurzbz","bestellung_id","anteil"),