Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 8059)
+++ /lib/wpsg_calculation.class.php	(revision 8060)
@@ -198,4 +198,22 @@
 		}
 		
+		public function getVoucher() {
+			
+			$arVoucher = [];
+			
+			foreach ($this->arCalculationRow as $cr_key => $cr) { 
+				
+				if ($cr['type'] === 'voucher') {
+
+					$arVoucher[] = $cr;
+					
+				}
+
+			}
+			
+			if (sizeof($arVoucher) > 0) return $arVoucher; else return null;
+			 
+		}
+		
 		public function addCoupon($set, $bruttonetto, $tax_key, $amount = 1, $code = false, $id = false, $order_voucher_id = 0) {
  
@@ -220,4 +238,22 @@
 			
 		}
+		
+		public function getCoupon() {
+			
+			$arCoupon = [];
+			
+			foreach ($this->arCalculationRow as $cr_key => $cr) { 
+				
+				if ($cr['type'] === 'coupon') {
+
+					$arCoupon[] = $cr;
+					
+				}
+
+			}
+			
+			if (sizeof($arCoupon) > 0) return $arCoupon; else return null;
+			
+		}
         
         public function removeDiscount() {
@@ -255,5 +291,13 @@
 	                    
         }
-        
+		
+		public function getDiscount() {
+			
+			if (!isset($this->arCalculationRow['discount'])) return null;
+			
+			return $this->arCalculationRow['discount'];
+						
+		}
+		
         public function addProduct($set, $bruttonetto, $tax_key, $amount, $product_key, $product_index = false, $order_product_id = false, $eu = false, $ses_data = false) {
 	
Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 8059)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 8060)
@@ -1201,4 +1201,52 @@
 			$oCalculation = new \wpsg\wpsg_calculation();
 			
+			$oCalculationOrder = \wpsg\wpsg_calculation::getOrderCalculation($order_id);
+			
+			$discount = $oCalculationOrder->getDiscount();
+			if ($discount !== null) $oCalculation->addDiscount(
+				$discount['set'], 
+				$discount['bruttonetto'], 
+				$discount['tax_key'], 
+				$discount['amount']
+			);
+			
+			$arVoucher = $oCalculationOrder->getVoucher();
+			if ($arVoucher !== null) {
+				
+				foreach ($arVoucher as $v) {
+					
+					$oCalculation->addVoucher(
+						$v['set'],
+						$v['bruttonetto'],
+						$v['tax_key'],
+						$v['amount'],
+						$v['data']['code']??false,
+						$v['code']['id']??0,
+						$v['code']['order_voucher_id']??0
+					);
+					
+				}
+				
+			}
+			
+			$arCoupon = $oCalculationOrder->getCoupon();
+			if ($arCoupon !== null) {
+				
+				foreach ($arCoupon as $c) {
+					
+					$oCalculation->addCoupon(
+						$c['set'],
+						$c['bruttonetto'],
+						$c['tax_key'],
+						$c['amount'],
+						$c['data']['code']??false,
+						$c['code']['id']??0,
+						$c['code']['order_voucher_id']??0
+					);
+					
+				}
+				
+			}
+			
 			$oDefaultCountry = $oOrder->getInvoiceCountry();			
 			$oCalculation->addCountry($oDefaultCountry->id, $oDefaultCountry->mwst, $oDefaultCountry->mwst_a,$oDefaultCountry->mwst_b, $oDefaultCountry->mwst_c, $oDefaultCountry->mwst_d, true);
@@ -1258,5 +1306,5 @@
 				
 			}
-			
+									
 			if (($_REQUEST['wpsg_rechnungen_shippay']??'0') === '1') {
 				 
@@ -1300,4 +1348,16 @@
 				
 			} 
+			
+			if ($this->shop->view['basket']['arCalculation']['sum']['discount_netto'] < 0) {
+				
+				if ($this->shop->getFrontendTaxview() === WPSG_NETTO)
+					$this->shop->view['basket']['sum']['preis_rabatt'] = -1 * $this->shop->view['basket']['arCalculation']['sum']['discount_netto'];
+				else
+					$this->shop->view['basket']['sum']['preis_rabatt'] = -1 * $this->shop->view['basket']['arCalculation']['sum']['discount_brutto'];
+				
+			}
+			
+			//wpsg_Debug($this->shop->view['basket']['arCalculation']);
+			// if ($this->view['basket']['sum']['preis_rabatt']
 			 
 			if (($_REQUEST['wpsg_rechnungen_shippay']??'0') === '1') {
Index: /views/order/product_table.phtml
===================================================================
--- /views/order/product_table.phtml	(revision 8059)
+++ /views/order/product_table.phtml	(revision 8060)
@@ -127,5 +127,5 @@
 					<td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis"><?php 
 							
-						echo wpsg_ff($p['amount'] * $product_price / $v['set']); ?> <?php echo $this->get_option('wpsg_currency');
+						echo wpsg_ff($v['set']); ?> <?php echo $this->get_option('wpsg_currency');
 						
 						if (strpos($v['set'], '%') !== false) {