diff --git a/content/pdfExport.php b/content/pdfExport.php
index 24decf0ce..e1bd6ee12 100644
--- a/content/pdfExport.php
+++ b/content/pdfExport.php
@@ -101,6 +101,8 @@ if(isset($_GET['uid']))
$params.='&uid='.$_GET['uid'];
if(isset($_GET['person_id']))
$params.='&person_id='.$_GET['person_id'];
+if(isset($_GET['id']))
+ $params.='&id='.$_GET['id'];
if(isset($_GET['prestudent_id']))
$params.='&prestudent_id='.$_GET['prestudent_id'];
if(isset($_GET['buchungsnummern']))
@@ -243,7 +245,6 @@ if (!isset($_REQUEST["archive"]))
$proc->importStyleSheet($xsl_doc); // attach the xsl rules
$buffer = $proc->transformToXml($xml_doc);
-
if (!$fo2pdf->generatePdf($buffer, $filename, "D"))
{
echo('Failed to generate PDF');
@@ -352,4 +353,4 @@ else
else
echo 'Keine Berechtigung zum Speichern';
}
-?>
\ No newline at end of file
+?>
diff --git a/rdf/bestellung.rdf.php b/rdf/bestellung.rdf.php
index b7db356f8..b8f0b9ed4 100644
--- a/rdf/bestellung.rdf.php
+++ b/rdf/bestellung.rdf.php
@@ -83,7 +83,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
header("Content-type: application/xhtml+xml");
echo '';
- echo "\n\n";
+ echo "\n\n";
echo " bestell_nr]]>\n";
echo " titel]]>\n";
echo " \n";
@@ -134,11 +134,13 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
echo " preisprove,2,',','.'),"]]>\n";
echo " mwst,2,',','.'),"]]>\n";
$summe_brutto_detail=$row->menge*$row->preisprove/100*($row->mwst+100);
+ $summe_netto_detail=$row->menge*$row->preisprove;
echo " \n";
+ echo " \n";
echo " \n";
$summe_brutto+=$summe_brutto_detail;
$summe_netto+=$row->menge*$row->preisprove;
- $summe_mwst+=$row->mwst;
+ $summe_mwst+=$row->menge*$row->preisprove/100*$row->mwst;
}
echo " \n";
@@ -146,7 +148,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
echo " ",number_format($summe_netto,2,',','.'),"\n";
echo " ",number_format($summe_mwst,2,',','.'),"\n";
echo " ",number_format($summe_brutto,2,',','.'),"\n";
- echo "";
+ echo "";
}
else
die('Parameter id missing');
@@ -154,4 +156,4 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
else
die('RDF not implemented! Use Parameter xmlformat=xml');
-?>
\ No newline at end of file
+?>
diff --git a/system/xsl/bestellung_etw_v1.xsl b/system/xsl/bestellung_etw_v1.xsl
new file mode 100644
index 000000000..7fcb1c85e
--- /dev/null
+++ b/system/xsl/bestellung_etw_v1.xsl
@@ -0,0 +1,588 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bestellschein
+
+
+
+
+
+
+ Bestell-Nr.:
+
+
+
+
+
+
+
+ UID-Nummer:
+
+ ATU655565658
+
+
+
+
+
+ Kontaktperson:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Kunden-Nr.:
+
+
+
+
+ !! fehlt noch in xml !!
+
+
+
+
+
+
+ Liefertermin:
+
+
+
+
+ !! gibts nicht mehr? !!
+
+
+
+
+
+
+
+ Konto:
+
+
+
+
+
+
+
+
+
+
+
+
+ Kostenstelle:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Empfänger:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tel.:
+
+
+
+
+
+
+ Fax:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Firma (Rechnungsanschrift)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Lieferanschrift
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Pos
+
+
+
+
+ Menge
+
+
+
+
+ VE
+
+
+
+
+ Bezeichnung
+
+
+
+
+ ArtikelNr
+
+
+
+
+ Preis/VE
+
+
+
+
+ Summe [EUR]
+
+
+
+
+ UST
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Wir bitten um Angabe unserer Bestellnummer auf Rechnung und Lieferschein!\n
+
+
+
+
+
+
+
+
+ Erstellt am:
+
+
+
+
+
+
+
+
+
+
+
+ Wien, am:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Zentraleinkauf:\n\n\n\n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Total exkl.:
+
+
+
+
+
+
+
+
+
+
+
+ USt.:
+
+
+
+
+
+
+
+
+
+
+
+ Total inkl.:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+