Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7336)
+++ /controller/wpsg_ShopController.class.php	(revision 7339)
@@ -3402,5 +3402,5 @@
 			if ($order_id !== false)
 			{
-
+				
 				$order_data = $this->cache->loadOrder($order_id);
 
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 7336)
+++ /lib/wpsg_basket.class.php	(revision 7339)
@@ -1940,4 +1940,10 @@
 			];
 			
+			if (isset($arCalculation['sum']['voucher_netto'])) {
+				
+				$arReturn['sum']['gs'] = -1 * (($this->shop->getFrontendTaxview() === WPSG_NETTO)?$arCalculation['sum']['voucher_netto']:$arCalculation['sum']['voucher_brutto']);
+				
+			}
+			
 			$arReturn['shipping']['mwst'] = wpsg_getStr($arCalculation['shipping'][0]['tax']);
 			$arReturn['shipping']['preis_shipping_netto'] = wpsg_getStr($arCalculation['shipping'][0]['netto']);
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7336)
+++ /lib/wpsg_calculation.class.php	(revision 7339)
@@ -491,4 +491,12 @@
 					wpsg_addSet($this->arCalculation['sum'][$cr['type'].'_tax'],$tax);
 					
+					if ($this->arCalculation['sum']['netto'] + $netto < 0) {
+						
+						$netto = -1 * $this->arCalculation['sum']['netto'];
+						$brutto = -1 * $this->arCalculation['sum']['brutto'];
+						$tax = -1 * $this->arCalculation['sum']['tax'];
+						
+					}
+					
 					$this->arCalculation['sum']['netto'] += $netto;
 					$this->arCalculation['sum']['brutto'] += $brutto;
@@ -499,4 +507,5 @@
 						$this->arCalculation['sum']['productsum_netto'] += $netto;
 						$this->arCalculation['sum']['productsum_brutto'] += $brutto;
+						
 					}
 		
@@ -510,5 +519,5 @@
                  				
 				//die(wpsg_debug($this->arCalculation));
-
+                
             }
 
Index: /mods/wpsg_mod_prepayment.class.php
===================================================================
--- /mods/wpsg_mod_prepayment.class.php	(revision 7336)
+++ /mods/wpsg_mod_prepayment.class.php	(revision 7339)
@@ -227,4 +227,6 @@
 		public function get_subject($order_id) {
 			
+			$this->shop->cache->clearOrderCache($order_id);
+			
 			$ret = $this->shop->replaceUniversalPlatzhalter($this->shop->get_option('wpsg_mod_prepayment_subject'), $order_id);