- Bugfix beim Login aus Unterordner

- XML Export für Bestellungen

include/wawi_bestelldetail.class.php

@@ -321,7 +321,7 @@ class wawi_bestelldetail extends basis_db
 				
 				$detail->bestelldetail_id = $row->bestelldetail_id;
 				$detail->bestellung_id = $row->bestellung_id; 
-				$detail->positoin = $row->position; 
+				$detail->position = $row->position; 
 				$detail->menge = $row->menge; 
 				$detail->verpackungseinheit = $row->verpackungseinheit; 
 				$detail->beschreibung = $row->beschreibung; 

rdf/bestellung.rdf.php

@@ -0,0 +1,157 @@
+<?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>.
+ */
+// header für no cache
+header("Cache-Control: no-cache");
+header("Cache-Control: post-check=0, pre-check=0",false);
+header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
+header("Pragma: no-cache");
+// content type setzen
+// DAO
+require_once('../config/vilesci.config.inc.php');
+require_once('../include/datum.class.php');
+require_once('../include/basis_db.class.php');
+require_once('../include/wawi_bestellung.class.php');
+require_once('../include/wawi_bestelldetail.class.php');
+require_once('../include/benutzer.class.php');
+require_once('../include/wawi_konto.class.php');
+require_once('../include/wawi_kostenstelle.class.php');
+require_once('../include/adresse.class.php');
+require_once('../include/firma.class.php');
+require_once('../include/standort.class.php');
+require_once('../include/kontakt.class.php');
+
+if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
+{
+	
+	$bestellung = new wawi_bestellung();
+	if(isset($_GET['id']))
+	{
+		if(!$bestellung->load($_GET['id']))
+			die('Bestellung wurde nicht gefunden');
+			
+		$besteller = new benutzer();
+		if(!$besteller->load($bestellung->besteller_uid))
+			die('Besteller konnte nicht geladen werden');
+		
+		$konto = new wawi_konto();
+		$konto->load($bestellung->konto_id);
+		
+		$kostenstelle = new wawi_kostenstelle();
+		$kostenstelle->load($bestellung->kostenstelle_id);
+		
+		$rechnungsadresse = new adresse();
+		$rechnungsadresse->load($bestellung->rechnungsadresse);
+		
+		$lieferadresse = new adresse();
+		$lieferadresse->load($bestellung->lieferadresse);
+		
+		$firma = new firma();
+		$firma->load($bestellung->firma_id);
+		
+		$standort = new standort();
+		$standort->load_firma($firma->firma_id);
+		if(isset($standort->result[0]))
+			$standort = $standort->result[0];
+			
+		$empfaengeradresse = new adresse();
+		$empfaengeradresse->load($standort->adresse_id);
+		$kontakt = new kontakt();
+		$kontakt->loadFirmaKontakttyp($standort->standort_id, 'telefon');
+		$telefon = $kontakt->kontakt;
+		$kontakt = new kontakt();
+		$kontakt->loadFirmaKontakttyp($standort->standort_id, 'fax');
+		$fax = $kontakt->kontakt;
+		header("Content-type: application/xhtml+xml");
+		echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
+		
+		echo "\n<bestellung>\n";
+		echo "	<bestell_nr><![CDATA[$bestellung->bestell_nr]]></bestell_nr>\n";
+		echo "	<titel><![CDATA[$bestellung->titel]]></titel>\n";
+		echo "	<kontaktperson>\n";
+		echo "		<titelpre><![CDATA[$besteller->titelpre]]></titelpre>\n";
+		echo "		<vorname><![CDATA[$besteller->vorname]]></vorname>\n";
+		echo "		<nachname><![CDATA[$besteller->nachname]]></nachname>\n";
+		echo "		<titelpost><![CDATA[$besteller->titelpost]]></titelpost>\n";
+		echo "		<email><![CDATA[",$besteller->uid,'@',DOMAIN,"]]></email>\n";
+		echo "	</kontaktperson>\n";
+		echo "	<konto><![CDATA[",$konto->beschreibung[1],"]]></konto>\n";
+		echo "	<kostenstelle><![CDATA[$kostenstelle->bezeichnung]]></kostenstelle>\n";
+		echo "	<rechnungsadresse>\n";
+		echo "		<name><![CDATA[$rechnungsadresse->name]]></name>\n";
+		echo "		<strasse><![CDATA[$rechnungsadresse->strasse]]></strasse>\n";
+		echo "		<plz><![CDATA[$rechnungsadresse->plz]]></plz>\n";
+		echo "		<ort><![CDATA[$rechnungsadresse->ort]]></ort>\n";
+		echo "	</rechnungsadresse>\n";
+		echo "	<lieferadresse>\n";
+		echo "		<name><![CDATA[$lieferadresse->name]]></name>\n";
+		echo "		<strasse><![CDATA[$lieferadresse->strasse]]></strasse>\n";
+		echo "		<plz><![CDATA[$lieferadresse->plz]]></plz>\n";
+		echo "		<ort><![CDATA[$lieferadresse->ort]]></ort>\n";
+		echo "	</lieferadresse>\n";
+		echo "	<empfaenger>\n";
+		echo "		<name><![CDATA[$firma->name]]></name>\n";
+		echo "		<strasse><![CDATA[$empfaengeradresse->strasse]]></strasse>\n";
+		echo "		<plz><![CDATA[$empfaengeradresse->plz]]></plz>\n";
+		echo "		<ort><![CDATA[$empfaengeradresse->ort]]></ort>\n";
+		echo "		<telefon><![CDATA[$telefon]]></telefon>\n";
+		echo "		<fax><![CDATA[$fax]]></fax>\n";		
+		echo "	</empfaenger>\n";
+		echo "	<details>\n";
+		
+		$details = new wawi_bestelldetail();
+		$details->getAllDetailsFromBestellung($bestellung->bestellung_id);
+		$summe_netto=0;
+		$summe_brutto=0;
+		$summe_mwst=0;
+		
+		foreach($details->result as $row)
+		{
+			echo "		<detail>\n";
+			echo "			<position><![CDATA[$row->position]]></position>\n";
+			echo "			<menge><![CDATA[$row->menge]]></menge>\n";
+			echo "			<verpackungseinheit><![CDATA[$row->verpackungseinheit]]></verpackungseinheit>\n";
+			echo "			<beschreibung><![CDATA[$row->beschreibung]]></beschreibung>\n";
+			echo "			<artikelnummer><![CDATA[$row->artikelnummer]]></artikelnummer>\n";
+			echo "			<preisprove><![CDATA[",number_format($row->preisprove,2,',','.'),"]]></preisprove>\n";
+			echo "			<mwst><![CDATA[",number_format($row->mwst,2,',','.'),"]]></mwst>\n";
+			$summe_brutto_detail=$row->menge*$row->preisprove/100*($row->mwst+100);
+			echo "			<summe_brutto><![CDATA[",number_format($summe_brutto_detail,2,',','.'),"]]></summe_brutto>\n";
+			echo "		</detail>\n";
+			$summe_brutto+=$summe_brutto_detail;
+			$summe_netto+=$row->menge*$row->preisprove;
+			$summe_mwst+=$row->mwst;
+		}
+		
+		echo "	</details>\n";
+		echo "	<datum><![CDATA[",date('d.m.Y'),"]]></datum>\n";
+		echo "	<summe_netto>",number_format($summe_netto,2,',','.'),"</summe_netto>\n";
+		echo "	<summe_mwst>",number_format($summe_mwst,2,',','.'),"</summe_mwst>\n";
+		echo "	<summe_brutto>",number_format($summe_brutto,2,',','.'),"</summe_brutto>\n";
+		echo "</bestellung>";
+	}
+	else
+		die('Parameter id missing');
+}
+else
+	die('RDF not implemented!  Use Parameter xmlformat=xml');
+
+?>

wawi/auswertungen/kostenstelle.php

@@ -171,13 +171,16 @@ $datum_obj = new datum();
 					<th>Kz</th>
 					<th>Bestellungen</th>
 					<th>Rechnungen</th>
+					<th>Restbudget (Bestellung)</th>
 					<th>Restbudget (Rechnung)</th>
+					<th>Budget</th>
 				</tr>
 			</thead>
 			<tbody>';
 	
 	$gesamt_rechnung = 0;
 	$gesamt_bestellung = 0;
+	$gesamt_budget = 0;
 	
 	foreach($kst_array as $row)
 	{
@@ -193,7 +196,7 @@ $datum_obj = new datum();
 		$kostenstelle = new wawi_kostenstelle();
 		$kostenstelle->load($id);
 		$budget = $kostenstelle->getBudget($id, $gj->geschaeftsjahr_kurzbz);
-		$restbudget = $budget - $brutto['rechnung'];
+		
 		echo '<tr>';
 
 		echo '<td>',$id,'</td>';
@@ -201,17 +204,33 @@ $datum_obj = new datum();
 		echo '<td>',$kostenstelle->kurzbz,'</td>';
 		echo '<td class="number">',number_format($brutto['bestellung'],2,',','.'),'</td>';
 		echo '<td class="number">',number_format($brutto['rechnung'],2,',','.'),'</td>';
+		
+		//Restbudget fuer Bestellungen
+		$restbudget = $budget - $brutto['bestellung'];
 		if($restbudget>0)
 			$class='number_positive';
 		elseif($restbudget<0)
 			$class='number_negative';
 		else
 			$class='number';
-		echo '<td class="',$class,'">',number_format($restbudget,2,',','.').'</td>';
+		echo '<td class="',$class,'">',number_format($restbudget,2,',','.'),'</td>';
+		
+		//Restbudget fuer Rechnungen
+		$restbudget = $budget - $brutto['rechnung'];
+		if($restbudget>0)
+			$class='number_positive';
+		elseif($restbudget<0)
+			$class='number_negative';
+		else
+			$class='number';
+		echo '<td class="',$class,'">',number_format($restbudget,2,',','.'),'</td>';
+		
+		echo '<td class="number">',number_format($budget,2,',','.'),'</td>';
 		echo '</tr>';
 		
 		$gesamt_rechnung += $brutto['rechnung'];
 		$gesamt_bestellung += $brutto['bestellung'];
+		$gesamt_budget += $budget;
 	}
 	echo '
 		</tbody>
@@ -223,6 +242,8 @@ $datum_obj = new datum();
 				<th class="number">',number_format($gesamt_bestellung,2,',','.'),'</th>
 				<th class="number">',number_format($gesamt_rechnung,2,',','.'),'</th>
 				<th></th>
+				<th></th>
+				<th class="number">',number_format($gesamt_budget,2,',','.'),'</th>
 			</tr>
 		</tfoot>
 		</table>';

wawi/auth.php

@@ -1,7 +1,8 @@
 <?php
 	session_start();
 
-	$path = dirname($_SERVER['PHP_SELF']);
+	$path = dirname(__FILE__);
+	$path = mb_substr($path, mb_strlen($_SERVER['DOCUMENT_ROOT']));
 	
 	if (!isset($_SESSION['user']) || $_SESSION['user']=='') 
 	{