diff --git a/cis/private/lehre/anwesenheitsliste.pdf.php b/cis/private/lehre/anwesenheitsliste.pdf.php
index 5b2a680d8..2b8b3801e 100644
--- a/cis/private/lehre/anwesenheitsliste.pdf.php
+++ b/cis/private/lehre/anwesenheitsliste.pdf.php
@@ -1,4 +1,24 @@
 <?php
+/* Copyright (C) 2006 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>.
+ */
    /**
     * anwesenheitsliste.pdf.php
     *
@@ -125,7 +145,7 @@ if($result = pg_query($conn, $qry))
 		if($row->gruppe_kurzbz=='')
 			$gruppen.=trim($row->kuerzel.'-'.$row->semester.$row->verband.$row->gruppe);
 		else
-			$gruppen=$row->gruppe_kurzbz;
+			$gruppen.=$row->gruppe_kurzbz;
 	}
 }
 $pdf->MultiCell(0,20,'Gruppe: '.$gruppen.' Studiensemester: '.$stsem);
@@ -318,60 +338,64 @@ if($result = pg_query($conn, $qry))
 	$i=0;
 	while($elem = pg_fetch_object($result))
 	{
-	   $i++;
-		if($i%2)
-			$pdf->SetFillColor(190,190,190);
-		else 
-			$pdf->SetFillColor(255,255,255);
-			
-		$pdf->SetFont('Arial','',8);
-		$maxY=$pdf->GetY();
-		if($maxY>770)
+		//Abbrecher und Unterbrecher nicht anzeigen
+		if($elem->status!='Abbrecher' && $elem->status!='Unterbrecher')
 		{
-			$pdf->AddPage();
+			$i++;
+			if($i%2)
+				$pdf->SetFillColor(190,190,190);
+			else 
+				$pdf->SetFillColor(255,255,255);
+				
+			$pdf->SetFont('Arial','',8);
 			$maxY=$pdf->GetY();
+			if($maxY>770)
+			{
+				$pdf->AddPage();
+				$maxY=$pdf->GetY();
+			}
+	
+			$maxX=30;
+			$pdf->SetXY($maxX,$maxY);
+			$pdf->MultiCell(20,$lineheight,$i,1,'R',1);
+			$maxX +=20;
+			$pdf->SetXY($maxX,$maxY);
+			$pdf->SetFont('Courier','B',8);
+			$pdf->MultiCell(130,$lineheight,$elem->nachname,1,'L',1);
+			$pdf->SetFont('Arial','',8);
+			$pdf->SetXY($maxX+strlen($elem->nachname)*5+1,$maxY);
+			if($elem->status=='Incoming')
+				$inc=' (i)';
+			else 
+				$inc='';
+			$pdf->MultiCell(130,$lineheight,$elem->vorname.$inc,0,'L',0);
+			$maxX +=130;
+			$pdf->SetXY($maxX,$maxY);
+			$pdf->SetFont('Arial','',8);
+			$pdf->MultiCell(65,$lineheight,trim($elem->matrikelnr),1,'C',1);
+			$maxX +=65;
+			$pdf->SetXY($maxX,$maxY);
+			$pdf->MultiCell(65,$lineheight,$elem->semester.$elem->verband.$elem->gruppe,1,'C',1);
+			$maxX +=65;
+			$pdf->SetXY($maxX,$maxY);
+			$pdf->MultiCell(40,$lineheight,'',1,'L',1);
+			$maxX +=40;
+			$pdf->SetXY($maxX,$maxY);
+			$pdf->MultiCell(40,$lineheight,'',1,'L',1);	
+			$maxX +=40;
+			$pdf->SetXY($maxX,$maxY);
+			$pdf->MultiCell(40,$lineheight,'',1,'L',1);	
+			$maxX +=40;
+			$pdf->SetXY($maxX,$maxY);
+			$pdf->MultiCell(40,$lineheight,'',1,'L',1);	
+			$maxX +=40;
+			$pdf->SetXY($maxX,$maxY);
+			$pdf->MultiCell(40,$lineheight,'',1,'L',1);	
+			$maxX +=40;
+			$pdf->SetXY($maxX,$maxY);
+			$pdf->MultiCell(40,$lineheight,'',1,'L',1);	
+		   $inhalt[]=array($i,$elem->nachname.' '.$elem->vorname,trim($elem->matrikelnr),$elem->semester.$elem->verband.$elem->gruppe,'','','','','','');
 		}
-
-		$maxX=30;
-		$pdf->SetXY($maxX,$maxY);
-		$pdf->MultiCell(20,$lineheight,$i,1,'R',1);
-		$maxX +=20;
-		$pdf->SetXY($maxX,$maxY);
-		$pdf->SetFont('Courier','B',8);
-		$pdf->MultiCell(130,$lineheight,$elem->nachname,1,'L',1);
-		$pdf->SetFont('Arial','',8);
-		$pdf->SetXY($maxX+strlen($elem->nachname)*5+1,$maxY);
-		if($elem->status=='Incoming')
-			$inc=' (i)';
-		else 
-			$inc='';
-		$pdf->MultiCell(130,$lineheight,$elem->vorname.$inc,0,'L',0);
-		$maxX +=130;
-		$pdf->SetXY($maxX,$maxY);
-		$pdf->SetFont('Arial','',8);
-		$pdf->MultiCell(65,$lineheight,trim($elem->matrikelnr),1,'C',1);
-		$maxX +=65;
-		$pdf->SetXY($maxX,$maxY);
-		$pdf->MultiCell(65,$lineheight,$elem->semester.$elem->verband.$elem->gruppe,1,'C',1);
-		$maxX +=65;
-		$pdf->SetXY($maxX,$maxY);
-		$pdf->MultiCell(40,$lineheight,'',1,'L',1);
-		$maxX +=40;
-		$pdf->SetXY($maxX,$maxY);
-		$pdf->MultiCell(40,$lineheight,'',1,'L',1);	
-		$maxX +=40;
-		$pdf->SetXY($maxX,$maxY);
-		$pdf->MultiCell(40,$lineheight,'',1,'L',1);	
-		$maxX +=40;
-		$pdf->SetXY($maxX,$maxY);
-		$pdf->MultiCell(40,$lineheight,'',1,'L',1);	
-		$maxX +=40;
-		$pdf->SetXY($maxX,$maxY);
-		$pdf->MultiCell(40,$lineheight,'',1,'L',1);	
-		$maxX +=40;
-		$pdf->SetXY($maxX,$maxY);
-		$pdf->MultiCell(40,$lineheight,'',1,'L',1);	
-	   $inhalt[]=array($i,$elem->nachname.' '.$elem->vorname,trim($elem->matrikelnr),$elem->semester.$elem->verband.$elem->gruppe,'','','','','','');
    }
 }
 //Fussnote
diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
index 5d3a46af8..c20547504 100644
--- a/cis/private/lehre/notenliste.xls.php
+++ b/cis/private/lehre/notenliste.xls.php
@@ -1,4 +1,24 @@
 <?php
+/* Copyright (C) 2006 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>.
+ */
 /*
  * Erstellt Notenliste im Excel Format
  */
@@ -106,7 +126,7 @@ if (!$conn = pg_pconnect(CONN_STRING))
 			if($row->gruppe_kurzbz=='')
 				$gruppen.=trim($row->kuerzel.'-'.$row->semester.$row->verband.$row->gruppe);
 			else
-				$gruppen=$row->gruppe_kurzbz;
+				$gruppen.=$row->gruppe_kurzbz;
 		}
 	}
 			
@@ -173,18 +193,21 @@ if (!$conn = pg_pconnect(CONN_STRING))
 		{
 			if(!preg_match('*dummy*',$elem->uid) && $elem->semester!=10)
 	   		{   	
-				$worksheet->write($lines,0,$i);
-				if($elem->status=='Incoming')
-					$inc=' (i)';
-				else 
-					$inc='';
-				$worksheet->write($lines,1,$elem->nachname.$inc);
-				$worksheet->write($lines,2,$elem->vorname);
-				$worksheet->write($lines,3,$elem->semester.$elem->verband.$elem->gruppe);
-				$worksheet->write($lines,4,'="'.trim($elem->matrikelnr).'"');
-				$worksheet->write($lines,5,'');
-				$i++;
-				$lines++;
+	   			if($elem->status!='Abbrecher' && $elem->status!='Unterbrecher')
+	   			{
+					$worksheet->write($lines,0,$i);
+					if($elem->status=='Incoming')
+						$inc=' (i)';
+					else 
+						$inc='';
+					$worksheet->write($lines,1,$elem->nachname.$inc);
+					$worksheet->write($lines,2,$elem->vorname);
+					$worksheet->write($lines,3,$elem->semester.$elem->verband.$elem->gruppe);
+					$worksheet->write($lines,4,'="'.trim($elem->matrikelnr).'"');
+					$worksheet->write($lines,5,'');
+					$i++;
+					$lines++;
+	   			}
 	   		}
 		}
 	}
diff --git a/content/kontakt.js.php b/content/kontakt.js.php
index 3ae1f9826..e0a835e48 100644
--- a/content/kontakt.js.php
+++ b/content/kontakt.js.php
@@ -614,7 +614,7 @@ function KontaktBankverbindungSpeichern(dialog)
 	req.add('anschrift', anschrift);
 	req.add('bic', bic);
 	req.add('blz', blz);
-	req.add('iban', kontonr);
+	req.add('iban', iban);
 	req.add('kontonr', kontonr);
 	req.add('typ', typ);
 	req.add('verrechnung', verrechnung);
diff --git a/content/kontakt.xul.php b/content/kontakt.xul.php
index d21a7c0d7..6f6abeda4 100644
--- a/content/kontakt.xul.php
+++ b/content/kontakt.xul.php
@@ -226,7 +226,7 @@ else
 		</hbox>
 	</groupbox>
 
-	<groupbox id="kontakt-groupbox-adresse">
+	<groupbox id="kontakt-groupbox-bankverbindung">
 		<caption label="Bankverbindungen" />
 		<hbox>
 			<tree id="kontakt-bankverbindung-tree" seltype="single" hidecolumnpicker="false" flex="1"
@@ -262,9 +262,9 @@ else
 						class="sortDirectionIndicator"
 						sort="rdf:http://www.technikum-wien.at/bankverbindung/rdf#kontonr" onclick="KontaktBankverbindungTreeSort()"/>
 					<splitter class="tree-splitter"/>
-					<treecol id="kontakt-bankverbindung-treecol-typ" label="Typ" flex="1" hidden="false"
+					<treecol id="kontakt-bankverbindung-treecol-typ_bezeichnung" label="Typ" flex="1" hidden="false"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/bankverbindung/rdf#typ" onclick="KontaktBankverbindungTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/bankverbindung/rdf#typ_bezeichnung" onclick="KontaktBankverbindungTreeSort()"/>
 					<splitter class="tree-splitter"/>
 					<treecol id="kontakt-bankverbindung-treecol-verrechnung" label="Verrechnung" flex="1" hidden="true"
 						class="sortDirectionIndicator"
@@ -291,7 +291,7 @@ else
 									<treecell label="rdf:http://www.technikum-wien.at/bankverbindung/rdf#blz" />
 									<treecell label="rdf:http://www.technikum-wien.at/bankverbindung/rdf#iban" />
 									<treecell label="rdf:http://www.technikum-wien.at/bankverbindung/rdf#kontonr" />
-									<treecell label="rdf:http://www.technikum-wien.at/bankverbindung/rdf#typ" />
+									<treecell label="rdf:http://www.technikum-wien.at/bankverbindung/rdf#typ_bezeichnung" />
 									<treecell label="rdf:http://www.technikum-wien.at/bankverbindung/rdf#verrechnung" />
 									<treecell label="rdf:http://www.technikum-wien.at/bankverbindung/rdf#person_id" />
 									<treecell label="rdf:http://www.technikum-wien.at/bankverbindung/rdf#bankverbindung_id" />
diff --git a/content/statistik/lehrauftragsliste_gst.xls.php b/content/statistik/lehrauftragsliste_gst.xls.php
index ffdeb1637..3d742cf93 100644
--- a/content/statistik/lehrauftragsliste_gst.xls.php
+++ b/content/statistik/lehrauftragsliste_gst.xls.php
@@ -175,5 +175,8 @@ if($result = pg_query($conn, $qry))
 	//Gesamtkosten anzeigen
 	$worksheet->writeNumber($zeile,6,$gesamtkosten, $format_number_bold);
 }
+	foreach($maxlength as $i=>$breite)
+		$worksheet->setColumn($i, $i, $breite+2);
+	
 	$workbook->close();
 ?>
\ No newline at end of file
diff --git a/rdf/bankverbindung.rdf.php b/rdf/bankverbindung.rdf.php
index 6d6ff01a3..6dc281c69 100644
--- a/rdf/bankverbindung.rdf.php
+++ b/rdf/bankverbindung.rdf.php
@@ -80,9 +80,9 @@ function draw_rdf($row)
 	
 	switch($row->typ)
 	{
-		case 'p': $typ = 'Privatkonto'; break;
-		case 'f': $typ = 'Firmenkonto'; break;
-		default: $typ = ''; break;
+		case 'p': $typ_bezeichnung = 'Privatkonto'; break;
+		case 'f': $typ_bezeichnung = 'Firmenkonto'; break;
+		default: $typ_bezeichnung = ''; break;
 	}
 	
 	echo '
@@ -96,7 +96,8 @@ function draw_rdf($row)
             <BANKVERBINDUNG:blz><![CDATA['.$row->blz.']]></BANKVERBINDUNG:blz>
             <BANKVERBINDUNG:iban><![CDATA['.$row->iban.']]></BANKVERBINDUNG:iban>
             <BANKVERBINDUNG:kontonr><![CDATA['.$row->kontonr.']]></BANKVERBINDUNG:kontonr>
-            <BANKVERBINDUNG:typ><![CDATA['.$typ.']]></BANKVERBINDUNG:typ>
+            <BANKVERBINDUNG:typ_bezeichnung><![CDATA['.$typ_bezeichnung.']]></BANKVERBINDUNG:typ_bezeichnung>
+            <BANKVERBINDUNG:typ><![CDATA['.$row->typ.']]></BANKVERBINDUNG:typ>
             <BANKVERBINDUNG:verrechnung><![CDATA['.($row->verrechnung?'Ja':'Nein').']]></BANKVERBINDUNG:verrechnung>
          </RDF:Description>
       </RDF:li>