Index: /changelog
===================================================================
--- /changelog	(revision 7252)
+++ /changelog	(revision 7253)
@@ -168,4 +168,5 @@
 - Bugfix: automatisch versendete Rechnungen stellen den Status automatisch auf "Rechnung geschrieben"
 - Bugfix: CSS W3C ValiditÀt hergestellt
+- Bugfix: Beim Àndern der Lieferadresse ist nicht mehr das Land der Rechnungsadresse ausgewÀhlt 
 - Feature: Satolo Newsletter-Registrierung mittels Double-OptIn
 - Feature: Retourlabelanfrage integriert
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 7252)
+++ /lib/wpsg_basket.class.php	(revision 7253)
@@ -1897,4 +1897,27 @@
 			}
 			
+			// LÀnderdetails laden
+			if (wpsg_isSizedInt($arReturn['checkout']['land'])) {
+				
+				$oCountry = wpsg_country::getInstance($arReturn['checkout']['land']);
+				
+				$arReturn['land'] = [
+					'name' => $oCountry->getName(),
+					'shorttext' => $oCountry->getShorttext()
+				];
+				
+			}
+			
+			if (wpsg_isSizedInt($arReturn['checkout']['shipping_land'])) {
+				
+				$oCountry = wpsg_country::getInstance($arReturn['checkout']['shipping_land']);
+				
+				$arReturn['shipping_land'] = [
+					'name' => $oCountry->getName(),
+					'shorttext' => $oCountry->getShorttext()
+				];
+				
+			}
+			
 			$oCalculation = new \wpsg\wpsg_calculation();
 			
Index: /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
===================================================================
--- /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml	(revision 7252)
+++ /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml	(revision 7253)
@@ -109,5 +109,5 @@
 				<label for="shipping_land" class="wpsg_checkout"><?php echo __("Land:", "wpsg"); ?>
 					<?php if ($this->view['pflicht']['land'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
-				</label>					
+				</label>				
 				<select name="wpsg[checkout][shipping_land]" class="<?php echo (($this->view['pflicht']['land'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_land", (array)$this->view['error']))?'wpsg_error':''); ?>" id="shipping_land">
 					<option value="-1"><?php echo __('Bitte auswÀhlen', 'wpsg'); ?></option>
@@ -157,5 +157,5 @@
 					view_checkout_shippingadresss();
 
-					land = <?php if (wpsg_isSizedInt($this->view['basket']['checkout']['land'])) echo $this->view['basket']['checkout']['land'];
+					land = <?php if (wpsg_isSizedInt($this->view['basket']['checkout']['shipping_land'])) echo $this->view['basket']['checkout']['shipping_land'];
 					else echo $this->get_option('wpsg_defaultland'); ?>;
 					jQuery('#shipping_land').val(land);