Index: /mods/wpsg_mod_auftragsbestaetigung.class.php
===================================================================
--- /mods/wpsg_mod_auftragsbestaetigung.class.php	(revision 6842)
+++ /mods/wpsg_mod_auftragsbestaetigung.class.php	(revision 6843)
@@ -90,7 +90,7 @@
 			$basket->initFromDB($order_id);
 			
-			$this->shop->view['basket']= $basket->toArray();
-			
-		
+			$this->shop->view['basket']= $basket->toArray(true);
+			
+			/*  Alt
 			$arrShippingData = $this->db->fetchRow("SELECT 
 														`shipping_vname`,
@@ -107,4 +107,27 @@
 														`id` = '".$order_id."'
 													");
+			*/
+			$arrData = $this->db->fetchRow("SELECT
+														`shipping_adress_id`
+													FROM
+														`".WPSG_TBL_ORDER."`
+													WHERE
+														`id` = '".$order_id."'
+													");
+			$arrAdress = $this->db->fetchRow("SELECT *
+													FROM
+														`".WPSG_TBL_ADRESS."`
+													WHERE
+														`id` = '".$arrData['shipping_adress_id']."'
+													");
+			$arrShippingData = array();
+			$arrShippingData['shipping_vname'] = $arrAdress['vname'];
+			$arrShippingData['shipping_name'] = $arrAdress['name'];
+			$arrShippingData['shipping_strasse'] = $arrAdress['strasse'];
+			$arrShippingData['shipping_hausnr'] = $arrAdress['nr'];
+			$arrShippingData['shipping_plz'] = $arrAdress['plz'];
+			$arrShippingData['shipping_ort'] = $arrAdress['ort'];
+			$arrShippingData['shipping_land'] = $arrAdress['land'];
+			$arrShippingData['shipping_firma'] = $arrAdress['firma'];
 			
 			$strShippingLand = $this->db->fetchRow("SELECT
Index: /views/mods/mod_rechnungen/accounting_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/accounting_pdf.phtml	(revision 6842)
+++ /views/mods/mod_rechnungen/accounting_pdf.phtml	(revision 6843)
@@ -509,4 +509,5 @@
 					
 					$mwst = wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%');
+					$mwst = wpsg_ff($this->view['basket']['shipping']['tax_value'], '%');
 					
 				}
Index: /views/mods/mod_rechnungen/invoice_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 6842)
+++ /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 6843)
@@ -509,4 +509,5 @@
 					
 					$mwst = wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%');
+					$mwst = wpsg_ff($this->view['basket']['shipping']['tax_value'], '%');
 					
 				}