From b934b1722cc279d5dfa57187a510631dd6612a4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 21 Apr 2008 11:40:21 +0000
Subject: [PATCH]

---
 content/fasoverlay.xul.php                   | 38 +++++---------------
 content/student/studentDBDML.php             |  2 +-
 content/student/studentkontoneudialog.js.php |  3 +-
 include/konto.class.php                      | 10 +++---
 vilesci/stammdaten/firma_details.php         | 20 +++++++++++
 5 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/content/fasoverlay.xul.php b/content/fasoverlay.xul.php
index 6594e69ad..64a37d27c 100644
--- a/content/fasoverlay.xul.php
+++ b/content/fasoverlay.xul.php
@@ -68,43 +68,23 @@ echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';*/
 	ondragexit="nsDragAndDrop.dragExit(event,verbandtreeDDObserver)"
 	>
 	<treecols>
-	    <treecol id="bez" label="Bezeichnung" persist="hidden, width, ordinal" flex="15" primary="true" 
-	    sortActive="true"
-	    sortDirection="ascending"
-	    class="sortDirectionIndicator"
-	    sort="rdf:http://www.technikum-wien.at/lehrverbandsgruppe/rdf#name"/>
+	    <treecol id="bez" label="Bezeichnung" persist="hidden, width, ordinal" flex="15" primary="true" />
 	    <splitter class="tree-splitter"/>
-	    <treecol id="stg" label="STG" flex="2" persist="hidden, width, ordinal" hidden="true"
-	    class="sortDirectionIndicator"
-	    sort="rdf:http://www.technikum-wien.at/lehrverbandsgruppe/rdf#stg"/>
+	    <treecol id="stg" label="STG" flex="2" persist="hidden, width, ordinal" hidden="true"/>
 	    <splitter class="tree-splitter"/>
-	    <treecol id="stg_kz" label="KZ" flex="2" persist="hidden, width, ordinal" hidden="true"
-	    class="sortDirectionIndicator"
-	    sort="rdf:http://www.technikum-wien.at/lehrverbandsgruppe/rdf#stg_kz"/>
+	    <treecol id="stg_kz" label="KZ" flex="2" persist="hidden, width, ordinal" hidden="true"/>
 	    <splitter class="tree-splitter"/>
-	    <treecol id="sem" label="Sem" flex="1" persist="hidden, width, ordinal" hidden="true"
-	    class="sortDirectionIndicator"
-	    sort="rdf:http://www.technikum-wien.at/lehrverbandsgruppe/rdf#sem"/>
+	    <treecol id="sem" label="Sem" flex="1" persist="hidden, width, ordinal" hidden="true"/>
 	    <splitter class="tree-splitter"/>
-	    <treecol id="ver" label="Ver" flex="1" persist="hidden, width, ordinal" hidden="true"
-	    class="sortDirectionIndicator"
-	    sort="rdf:http://www.technikum-wien.at/lehrverbandsgruppe/rdf#ver"/>
+	    <treecol id="ver" label="Ver" flex="1" persist="hidden, width, ordinal" hidden="true"/>
 	    <splitter class="tree-splitter"/>
-	    <treecol id="grp" label="Grp" flex="1" persist="hidden, width, ordinal" hidden="true"
-	    class="sortDirectionIndicator"
-	    sort="rdf:http://www.technikum-wien.at/lehrverbandsgruppe/rdf#grp"/>
+	    <treecol id="grp" label="Grp" flex="1" persist="hidden, width, ordinal" hidden="true"/>
 	    <splitter class="tree-splitter"/>
-	    <treecol id="gruppe" label="SpzGruppe" persist="hidden, width, ordinal" flex="1" hidden="true"
-	    class="sortDirectionIndicator"
-	    sort="rdf:http://www.technikum-wien.at/lehrverbandsgruppe/rdf#gruppe"/>
+	    <treecol id="gruppe" label="SpzGruppe" persist="hidden, width, ordinal" flex="1" hidden="true"/>
 	    <splitter class="tree-splitter"/>
-	    <treecol id="typ" label="Typ" flex="1" persist="hidden, width, ordinal" hidden="true"
-	    class="sortDirectionIndicator"
-	    sort="rdf:http://www.technikum-wien.at/lehrverbandsgruppe/rdf#typ"/>
+	    <treecol id="typ" label="Typ" flex="1" persist="hidden, width, ordinal" hidden="true"/>
 		<splitter class="tree-splitter"/>
-	    <treecol id="stsem" label="StSem" flex="1" persist="hidden, width, ordinal" hidden="true"
-	    class="sortDirectionIndicator"
-	    sort="rdf:http://www.technikum-wien.at/lehrverbandsgruppe/rdf#stsem"/>
+	    <treecol id="stsem" label="StSem" flex="1" persist="hidden, width, ordinal" hidden="true"/>
 	</treecols>
 
 	<template>
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 705fe4538..8fcf5346e 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -1469,7 +1469,7 @@ if(!$error)
 					}
 					else
 					{
-						$errormsg .= "Fehler bei $person_id: $buchung->errormsg\n";
+						$errormsg .= "Fehler beim Speichern: $buchung->errormsg\n";
 					}
 				}
 			}
diff --git a/content/student/studentkontoneudialog.js.php b/content/student/studentkontoneudialog.js.php
index 74d486b56..d0bd25427 100644
--- a/content/student/studentkontoneudialog.js.php
+++ b/content/student/studentkontoneudialog.js.php
@@ -78,9 +78,8 @@ function StudentKontoNeuInit()
 	}
 	else
 	{
-		studiengang_kz = window.opener.document.getElementById('student-detail-menulist-studiengang_kz').value;
+		studiengang_kz = window.opener.document.getElementById('student-prestudent-menulist-studiengang_kz').value;
 	}
-	
 	person_ids = paramList;
 
 	if(anzahl>1)
diff --git a/include/konto.class.php b/include/konto.class.php
index 0c3c99070..62eaa678e 100644
--- a/include/konto.class.php
+++ b/include/konto.class.php
@@ -154,31 +154,31 @@ class konto
 		$this->betrag = str_replace(',','.',$this->betrag);
 		if(!is_numeric($this->betrag))
 		{
-			$this->errormsg = "Betrag ('".$this->betrag."') ist ungueltig bei Person '".$this->person_id."'";
+			$this->errormsg = "Betrag muss eine gueltige Zahl sein";
 			return false;
 		}
 
 		if(!is_numeric($this->studiengang_kz))
 		{
-			$this->errormsg = "'Studiengang_kz ('".$this->studiengang_kz."') ist ungueltig bei Person '".$this->person_id."'";
+			$this->errormsg = "Die Studiengangskennzahl ist ungueltig";
 			return false;
 		}
 
 		if($this->buchungstyp_kurzbz=='')
 		{
-			$this->errormsg = "Typ muss angegeben werden bei Person '".$this->person_id."'";
+			$this->errormsg = "Es wurde kein Buchungstyp angegeben";
 			return false;
 		}
 
 		if(!is_numeric($this->person_id))
 		{
-			$this->errormsg = "'Person_id ('".$this->person_id."') ist ungueltig";
+			$this->errormsg = "Person_id ist ungueltig";
 			return false;
 		}
 
 		if(!is_numeric($this->mahnspanne))
 		{
-			$this->errormsg = "Mahnspanne ('".$this->mahnspanne."') muss eine gueltige Zahl sein bei Person '".$this->person_id."'";
+			$this->errormsg = "Die Mahnspanne muss eine gueltige Zahl sein";
 			return false;
 		}
 
diff --git a/vilesci/stammdaten/firma_details.php b/vilesci/stammdaten/firma_details.php
index 97a4ae54b..1d5eb14d1 100644
--- a/vilesci/stammdaten/firma_details.php
+++ b/vilesci/stammdaten/firma_details.php
@@ -1,4 +1,24 @@
 <?php
+/* Copyright (C) 2008 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
 	require_once('../config.inc.php');
 	require_once('../../include/functions.inc.php');
 	require_once('../../include/firma.class.php');