Index: /changelog
===================================================================
--- /changelog	(revision 7641)
+++ /changelog	(revision 7642)
@@ -321,3 +321,4 @@
 - Bugfix: Link in Paketverfolgung geht in neuem Fenster auf
 - Bugfix: Korrektur beim schreiben eines Fehlers im PayPal Modul bei Stornierung
+- Bugfix: Ausweisung von Anteilig bei Versand- und Zahlungskosten in Rechnung/Gutschrift
 - Technisch: Ausgabe Overview wird zwischengespeichert, um Performance zu erhöhen
Index: /views/mods/mod_rechnungen/accounting_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/accounting_pdf.phtml	(revision 7641)
+++ /views/mods/mod_rechnungen/accounting_pdf.phtml	(revision 7642)
@@ -533,34 +533,16 @@
 			else
 			{
-	 
-				if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true)
-				{
-					
-					$mwst = __('anteilig', 'wpsg');
-											
+				
+				if ($this->view['basket']['arCalculation']['shipping'][0]['tax_key'] === '0') {
+					
+					$mwst = _('anteilig');
+					
+				} else {
+					
+					$mwst = wpsg_ff($this->view['basket']['arCalculation']['shipping'][0]['tax'], '%');
+					$mwst = wpsg_ff($this->view['basket']['arCalculation']['tax'][$this->view['basket']['arCalculation']['shipping'][0]['tax_key']]['tax_value'], '%');
+					
 				}
-				else
-				{
-					
-					$mwst = wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%');
-					$mwst = wpsg_ff($this->view['basket']['shipping']['tax_value'], '%');
-					
-				}
-				
-				/*
-				if ($this->arShipping[$this->view['data']['type_shipping']]['mwst'] == '0')
-				{
-
-					$mwst = __('anteilig', 'wpsg');
-					
-				}
-				else
-				{
-				
-					$mwst = wpsg_ff($this->arShipping[$this->view['data']['type_shipping']]['mwst_value'], '%');
-					
-				}
-				*/
-				
+				 				
 			}
 			
@@ -643,33 +625,16 @@
 			}
 			else
-			{ 
-				
-				if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true)
-				{
-						
-					$mwst = __('anteilig', 'wpsg');
-						
+			{
+				
+				if ($this->view['basket']['arCalculation']['payment'][0]['tax_key'] === '0') {
+					
+					$mwst = _('anteilig');
+					
+				} else {
+					
+					$mwst = wpsg_ff($this->view['basket']['arCalculation']['payment'][0]['tax'], '%');
+					$mwst = wpsg_ff($this->view['basket']['arCalculation']['tax'][$this->view['basket']['arCalculation']['payment'][0]['tax_key']]['tax_value'], '%');
+					
 				}
-				else
-				{
-						
-					$mwst = wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%');
-						
-				}
-				
-				/*
-				if ($this->arPayment[$this->view['data']['type_payment']]['mwst'] == '0')
-				{
-
-					$mwst = __('anteilig', 'wpsg');
-					
-				}
-				else
-				{
-				
-					$mwst = wpsg_ff($this->arPayment[$this->view['data']['type_payment']]['mwst_value'], '%');
-					
-				}
-				*/
 				
 			}
Index: /views/mods/mod_rechnungen/invoice_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 7641)
+++ /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 7642)
@@ -548,32 +548,14 @@
 			{
 				
-				if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true)
-				{
-					
-					$mwst = __('anteilig', 'wpsg');
+				if ($this->view['basket']['arCalculation']['shipping'][0]['tax_key'] === '0') {
+				
+					$mwst = _('anteilig');
+					
+				} else {
+										
+					$mwst = wpsg_ff($this->view['basket']['arCalculation']['shipping'][0]['tax'], '%');
+					$mwst = wpsg_ff($this->view['basket']['arCalculation']['tax'][$this->view['basket']['arCalculation']['shipping'][0]['tax_key']]['tax_value'], '%');
 					
 				}
-				else
-				{
-					
-					$mwst = wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%');
-					$mwst = wpsg_ff($this->view['basket']['shipping']['tax_value'], '%');
-					
-				}
-				
-				/*
-				if ($this->arShipping[$this->view['data']['type_shipping']]['mwst'] == '0')
-				{
-
-					$mwst = __('anteilig', 'wpsg');
-					
-				}
-				else
-				{
-				
-					$mwst = wpsg_ff($this->arShipping[$this->view['data']['type_shipping']]['mwst_value'], '%');
-					
-				}
-				*/
 				
 			}
@@ -659,31 +641,14 @@
 			{
 				
-				if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true)
-				{
-					
-					$mwst = __('anteilig', 'wpsg');
+				if ($this->view['basket']['arCalculation']['payment'][0]['tax_key'] === '0') {
+					
+					$mwst = _('anteilig');
+					
+				} else {
+					
+					$mwst = wpsg_ff($this->view['basket']['arCalculation']['payment'][0]['tax'], '%');
+					$mwst = wpsg_ff($this->view['basket']['arCalculation']['tax'][$this->view['basket']['arCalculation']['payment'][0]['tax_key']]['tax_value'], '%');
 					
 				}
-				else
-				{
-					
-					$mwst = wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%');
-					
-				}
-				
-				/*
-				if ($this->arPayment[$this->view['data']['type_payment']]['mwst'] == '0')
-				{
-
-					$mwst = __('anteilig', 'wpsg');
-					
-				}
-				else
-				{
-				
-					$mwst = wpsg_ff($this->arPayment[$this->view['data']['type_payment']]['mwst_value'], '%');
-					
-				}
-				*/
 				
 			}