Index: /controller/wpsg_OrderController.class.php
===================================================================
--- /controller/wpsg_OrderController.class.php	(revision 7216)
+++ /controller/wpsg_OrderController.class.php	(revision 7217)
@@ -973,13 +973,12 @@
 
 					// Daten im Kunden aktualisieren?
-					if (wpsg_isSizedInt($form_data['dialog_customer']))
-					{
+					if (wpsg_isSizedInt($form_data['dialog_customer'])) {
 
 						$oCustomer = $oOrder->getCustomer();
 						$oCustomer->updateAdress($adress_data);
+					
 					}
 
-					if (wpsg_isSizedInt($form_data['dialog_shipping']))
-					{
+					if (wpsg_isSizedInt($form_data['dialog_shipping'])) {
 						
 						$oOrder->updateShippingAdress($adress_data);
@@ -1363,5 +1362,10 @@
 			$this->shop->view['arPayment'] = $this->shop->arPayment;
 			$this->shop->view['arShipping'] = $this->shop->arShipping;
-
+			
+			$oCalculation = new \wpsg\wpsg_calculation();
+			$oCalculation->fromDB($this->shop->view['data']['id']);
+			
+			$this->shop->view['oCalculation'] = $oCalculation;
+			
             if (wpsg_isSizedString($_REQUEST['subaction'], 'editPayShipping')) {
 
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7216)
+++ /lib/wpsg_calculation.class.php	(revision 7217)
@@ -488,5 +488,5 @@
 					$db_data['discount_set'] = wpsg_q($cr['set']);
 					$db_data['discount_bruttonetto'] = wpsg_q($cr['bruttonetto']);
-					$db_data['discount_tax_key'] = wpsg_q($cr['tax_key']);
+					$db_data['discount_tax_key'] = wpsg_q($this->clearTaxKey($cr['tax_key']));
 					$db_data['price_rabatt'] = wpsg_q($arCalculation['sum']['discount'.$display]);
 					$db_data['price_rabatt_netto'] = wpsg_q($arCalculation['sum']['discount_netto']);
@@ -500,5 +500,5 @@
 					$db_data['price_gs_brutto'] = wpsg_q($arCalculation['sum']['voucher_brutto']);
 					$db_data['gs_set'] = wpsg_q($cr['set']);
-					$db_data['gs_tax_key'] = wpsg_q($cr['tax_key']);
+					$db_data['gs_tax_key'] = wpsg_q($this->clearTaxKey($cr['tax_key']));
 					$db_data['voucher_bruttonetto'] = wpsg_q($cr['bruttonetto']);
 					$db_data['gs_id'] = wpsg_q($cr['data']['id']);
@@ -510,5 +510,5 @@
 					$db_data['shipping_key'] = wpsg_q($cr['data']['shipping_key']);
 					$db_data['shipping_bruttonetto'] = wpsg_q($cr['bruttonetto']);
-					$db_data['shipping_tax_key'] = wpsg_q($cr['tax_key']);
+					$db_data['shipping_tax_key'] = wpsg_q($this->clearTaxKey($cr['tax_key']));
 					$db_data['type_shipping'] = wpsg_q($cr['data']['shipping_key']);
 					$db_data['price_shipping'] = wpsg_q($arCalculation['sum']['shipping_'.$display]);
@@ -522,5 +522,5 @@
 					$db_data['payment_key'] = wpsg_q($cr['data']['payment_key']);
 					$db_data['payment_bruttonetto'] = wpsg_q($cr['bruttonetto']);
-					$db_data['payment_tax_key'] = wpsg_q($cr['tax_key']);
+					$db_data['payment_tax_key'] = wpsg_q($this->clearTaxKey($cr['tax_key']));
 					$db_data['type_payment'] = wpsg_q($cr['data']['payment_key']);
 					$db_data['price_payment'] = wpsg_q($arCalculation['sum']['payment_'.$display]);
@@ -877,5 +877,5 @@
             if ($tax_key != '0' && !preg_match('/\_\d+$/', $tax_key)) {
             	
-            	if ($country_id === false) $country_id = $this->getDefaultCountryID();
+            	if ($country_id === false) $country_id = $this->getTargetCountryID();
             	
             	return $tax_key.'_'.$country_id;
@@ -884,4 +884,16 @@
             
         }
+	
+		/**
+		 * Entfernt den LÀnderschlÌssel aus dem SteuerschlÌssel
+		 * @param $tax_key
+		 */
+        private function clearTaxKey($tax_key) {
+        	
+        	if (!preg_match('/\_\d+$/', $tax_key)) return $tax_key;
+        	
+        	return explode('_', $tax_key)[0];
+        	
+		}
 	
 		/**
Index: /model/wpsg_order.class.php
===================================================================
--- /model/wpsg_order.class.php	(revision 7216)
+++ /model/wpsg_order.class.php	(revision 7217)
@@ -120,4 +120,6 @@
 				
 				$oCountry = wpsg_country::getInstance($adress_data['land']);
+				
+				
 				
 				$order_data['target_country_id'] = wpsg_q($adress_data['land']);
Index: /views/order/backendEdit/editPayShipping.phtml
===================================================================
--- /views/order/backendEdit/editPayShipping.phtml	(revision 7216)
+++ /views/order/backendEdit/editPayShipping.phtml	(revision 7217)
@@ -5,4 +5,6 @@
      */
 
+    $arCalculation = $this->view['oCalculation']->getCalculationArray();
+     
     $arShippingSelect = [];
     foreach ($this->arShipping as $shipping_id => $shipping_data) {
@@ -33,13 +35,13 @@
     if ($this->getBackendTaxview() === WPSG_BRUTTO) {
         
-        $price_shipping = wpsg_ff($this->view['data']['price_shipping_brutto'], $this->get_option('wpsg_currency'));
-        $price_payment = wpsg_ff($this->view['data']['price_payment_brutto'], $this->get_option('wpsg_currency'));
-        
+    	$price_shipping = wpsg_ff(($arCalculation['shipping'][0]['brutto_single']??0), $this->get_option('wpsg_currency'));
+		$price_payment = wpsg_ff(($arCalculation['payment'][0]['brutto_single']??0), $this->get_option('wpsg_currency'));
+    	         
         $price_suffix = ' ('.__('Brutto', 'wpsg').')';
         
     } else {
-
-        $price_shipping = wpsg_ff($this->view['data']['price_shipping_brutto'], $this->get_option('wpsg_currency'));
-        $price_payment = wpsg_ff($this->view['data']['price_payment_brutto'], $this->get_option('wpsg_currency'));
+	
+		$price_shipping = wpsg_ff(($arCalculation['shipping'][0]['netto_single']??0), $this->get_option('wpsg_currency'));
+		$price_payment = wpsg_ff(($arCalculation['payment'][0]['netto_single']??0), $this->get_option('wpsg_currency'));
 
         $price_suffix = ' ('.__('Netto', 'wpsg').')';