Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 7379)
+++ /lib/wpsg_basket.class.php	(revision 7380)
@@ -1766,4 +1766,12 @@
 			}
 			
+			if (wpsg_isSizedArray($arCalculation['voucher'][0])) {
+				
+				$arReturn['gs_value'] = abs(($this->shop->getFrontendTaxview() === WPSG_NETTO)?$arCalculation['voucher'][0]['netto']:$arCalculation['voucher'][0]['brutto']);
+				$arReturn['gs']['code'] = $arCalculation['voucher'][0]['code'];
+				$arReturn['gs']['gs_value'] = $arReturn['gs_value'];
+								
+			}
+			
 			// Alte Templates greifen auf den Shipping Array zu, deshalb dort auch korrigieren
 			//$this->shop->arShipping[$arCalculation['shipping'][0]['shipping_key']]['']			
Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 7379)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 7380)
@@ -684,6 +684,7 @@
 			$this->getAdresse($this->shop->view['data']['k_id']);
 			
-			$custom_data = @unserialize($this->shop->view['data']['custom_data']);
-			$this->shop->view['basket'] = $custom_data['basket'];
+			$basket = new wpsg_basket();
+			$basket->initFromDB($order_id, true);
+			$this->shop->view['basket'] = $basket->toArray(true);
 		 
 			$this->shop->view['storno_fee'] = $storno_fee;
Index: /views/mods/mod_rechnungen/invoice_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 7379)
+++ /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 7380)
@@ -444,5 +444,5 @@
 	
 	// Gutschein
-	if ((isset($this->view['basket']['gs'])) && ($this->view['basket']['gs_value'] > 0))
+	if ((isset($this->view['basket']['gs'])) && abs($this->view['basket']['gs_value']) > 0)
 	{