--- a/fhiiqm/vertrag_flist1.php	Wed Oct 05 16:46:09 2011 +0200
+++ b/fhiiqm/vertrag_flist1.php	Fri Oct 07 11:37:29 2011 +0200
@@ -85,7 +85,8 @@
     
     echo "<div align='center'>\n";
 //echo "$sort, $dir, $fnum, $filter<br><br>\n";    
-    $sql = "CALL fhiiqm.vertrag_flist1(" . $sort . ",'" . $dir . "', " . $fnum . ", '" . $filter . "',$start,$zeil, @anz)";
+//    $sql = "CALL fhiiqm.vertrag_flist1(" . $sort . ",'" . $dir . "', " . $fnum . ", '" . $filter . "',$start,$zeil, @anz)";
+    $sql = "CALL fhiiqm.vertrag_flist1_1(" . $sort . ",'" . $dir . "', " . $fnum . ", '" . $filter . "',$start,$zeil, @anz)";
     // Parameter: Nr. Sortfelf, Sortierrichtung, Nr. Filterfeld, Filterbegriff, Start bei DS $start+1, Anzahl DS/Seite, Anzahl gefundener Vertraege
     // liefert Felder: contract_ID,cname,clong,bearb,doc,typ,prod
     $result = $dbc -> queryObjectArray($sql);
@@ -145,17 +146,21 @@
         echo "<tr bgcolor='#68ACBF'>";
         tab_column(2,"Bezeichnung",$sort,$dir,2,$fnum,$filter,$start,$zeil);
         tab_column(3,"Beschreibung",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+        tab_column(6,"Typ",$sort,$dir,6,$fnum,$filter,$start,$zeil);
+        tab_column(7,"zu Produkt",$sort,$dir,7,$fnum,$filter,$start,$zeil);
+        tab_column(8,"Partner",$sort,$dir,8,$fnum,$filter,$start,$zeil);
         tab_column(4,"Bearbeiter",$sort,$dir,4,$fnum,$filter,$start,$zeil);
         tab_column(5,"Dokument",$sort,$dir,0,$fnum,$filter,$start,$zeil);
-        tab_column(6,"Typ",$sort,$dir,6,$fnum,$filter,$start,$zeil);
-        tab_column(7,"zu Produkt",$sort,$dir,7,$fnum,$filter,$start,$zeil);
         echo "<th>&nbsp;</th></tr>\n";
         foreach ($result as $row)
         {
 			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-            echo "<tr bgcolor='" . $bg . "'><td><b>$row->cname</b></td>";    
+            echo "<tr bgcolor='" . $bg . "'><td width='17%'><b>$row->cname</b></td>";    
 //            echo "<td>$row->contract_s</td>";    
-            echo "<td>" . nl2br($row->clong) . "</td>";    
+            echo "<td width='22%'>" . nl2br($row->clong) . "</td>";    
+            echo "<td>$row->typ</td>";    
+            echo "<td>$row->prod</td>";
+            echo "<td>$row->partfirma</td>";
             echo "<td>$row->bearb</td>";
             if (file_exists("documents/".$row->doc))
             {
@@ -164,8 +169,6 @@
             }    
             else    
                 echo "<td>$row->doc</td>";
-            echo "<td>$row->typ</td>";    
-            echo "<td>$row->prod</td>";
             echo "<td><a href='/fhiiqm/vertrag_upd.php?uid=$row->contract_ID'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td></tr>\n";
        }
         echo "</table></div>\n";