Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 5683)
+++ /controller/wpsg_ShopController.class.php	(revision 5687)
@@ -2524,5 +2524,5 @@
 			$this->callMods('addShipping', array(&$this->arShipping));
 			$this->callMods('addPayment', array(&$this->arPayment));
-						
+
 			if (!is_admin())
 			{
@@ -2682,5 +2682,5 @@
 			$this->view['field']['id'] = $kv_id;
 			
-			$this->render(WPSG_PATH_VIEW.'/admin/kundendaten_renderfield.phtml');
+			$this->render(WPSG_PATH_VIEW.'/warenkorb/kundendaten_renderfield.phtml');
 			
 		} // public function renderKundenField()
@@ -3686,8 +3686,8 @@
 			if (wpsg_isSizedArray($this->view['basket']['produkte']) && !$this->bShippingMerged)
 			{
-				
+
 				$arSystemShippingAllowed = array_keys($this->arShipping);				
 				$arProductShippingAllowd = $arSystemShippingAllowed;
-				
+
 				$bDontMerge130 = wpsg_isSizedInt($this->get_option('wpsg_mod_willcollect_dontMerge'));
 				$bMerge130 = false;
@@ -3702,6 +3702,6 @@
 					if ($oProduct->hasLimitedShipping())
 					{
-						
-						$arSingleProductShippingAllowed = $oProduct->getAllowedShipping();
+
+						$arSingleProductShippingAllowed = array_intersect($arSystemShippingAllowed, $oProduct->getAllowedShipping());
 						$arProductShippingAllowd = array_intersect($arProductShippingAllowd, $arSingleProductShippingAllowed);
 									
@@ -3731,6 +3731,7 @@
 						if ($oProduct->hasLimitedShipping())
 						{
-						
-							$arSingleProductShippingAllowed = $oProduct->getAllowedShipping();
+
+							$arSingleProductShippingAllowed = array_intersect($arSystemShippingAllowed, $oProduct->getAllowedShipping());
+
 							if (in_array('130', $arSingleProductShippingAllowed) && $bDontMerge130)
 							{
@@ -3777,5 +3778,5 @@
 			
 				//$arSystemShippingAllowedMerged = wpsg_trim($arSystemShippingAllowedMerged);			
-			
+
 				foreach ($arSystemShippingAllowedMerged as $shipping)
 				{
@@ -3818,10 +3819,10 @@
 				
 				}
-					
+
 				$this->arShipping = $arShippingNew;
 				$this->bShippingMerged = true;
 				
 			}
-						
+
 			$this->callMods('checkShippingAvailable', array(&$this->arShipping, &$this->view['basket']));
 			
Index: ews/admin/kundendaten_renderfield.phtml
===================================================================
--- /views/admin/kundendaten_renderfield.phtml	(revision 5683)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?php
-
-	/**
-	 * Zeichnet eine einzelne Kundenvariable innerhalb des checkout.phtml	  
-	 */
-
-?>
-<div class="wpsg_checkoutblock">
-	<label class="wpsg_cv" for="wpsg_cv_<?php echo $this->view['field']['id']; ?>">
-		<?php echo wpsg_hspc(__($this->view['field']['name'], 'wpsg')); ?><?php if ($this->view['field']['show'] == '0') { ?> <span class="wpsg_required">*</span><?php } ?>:
-		<?php if ($this->view['field']['typ'] == '0') { // Textfeld ?>
-		<input class="<?php echo (($this->view['field']['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$this->view['field']['id'], (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $this->view['field']['id']; ?>]" type="text" value="<?php echo $this->view['basket']['checkout']['custom'][$this->view['field']['id']]; ?>" />
-		<?php } else if ($this->view['field']['typ'] == '1') { $arAuswahl = explode("|", $this->view['field']['auswahl']); // Auswahlfeld ?>
-		<select class="<?php echo (($this->view['field']['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$this->view['field']['id'], (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $this->view['field']['id']; ?>]">
-			<option value="-1"><?php echo __('Bitte AuswÀhlen', 'wpsg'); ?></option>
-			<?php foreach ((array)$arAuswahl as $a) { ?>
-			<option value="<?php echo wpsg_hspc($a); ?>" <?php echo (($a == $this->view['basket']['checkout']['custom'][$this->view['field']['id']])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
-			<?php } ?>
-		</select>
-		<?php } else if ($this->view['field']['typ'] == '2') { // Checkbox ?>
-		<input type="hidden" name="wpsg[checkout][custom][<?php echo $this->view['field']['id']; ?>]" value="0" />
-		<input class="<?php echo (($this->view['field']['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[checkout][custom][<?php echo $this->view['field']['id']; ?>]" value="1" <?php echo (($this->view['basket']['checkout']['custom'][$this->view['field']['id']] == '1')?'checked="checked"':''); ?> />
-		<?php } ?>
-	</label>
-</div>
Index: /views/warenkorb/kundendaten_renderfield.phtml
===================================================================
--- /views/warenkorb/kundendaten_renderfield.phtml	(revision 5687)
+++ /views/warenkorb/kundendaten_renderfield.phtml	(revision 5687)
@@ -0,0 +1,25 @@
+<?php
+
+	/**
+	 * Zeichnet eine einzelne Kundenvariable innerhalb des checkout.phtml	  
+	 */
+
+?>
+<div class="wpsg_checkoutblock">
+	<label class="wpsg_cv" for="wpsg_cv_<?php echo $this->view['field']['id']; ?>">
+		<?php echo wpsg_hspc(__($this->view['field']['name'], 'wpsg')); ?><?php if ($this->view['field']['show'] == '0') { ?> <span class="wpsg_required">*</span><?php } ?>:
+		<?php if ($this->view['field']['typ'] == '0') { // Textfeld ?>
+		<input class="<?php echo (($this->view['field']['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$this->view['field']['id'], (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $this->view['field']['id']; ?>]" type="text" value="<?php echo $this->view['basket']['checkout']['custom'][$this->view['field']['id']]; ?>" />
+		<?php } else if ($this->view['field']['typ'] == '1') { $arAuswahl = explode("|", $this->view['field']['auswahl']); // Auswahlfeld ?>
+		<select class="<?php echo (($this->view['field']['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$this->view['field']['id'], (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $this->view['field']['id']; ?>]">
+			<option value="-1"><?php echo __('Bitte AuswÀhlen', 'wpsg'); ?></option>
+			<?php foreach ((array)$arAuswahl as $a) { ?>
+			<option value="<?php echo wpsg_hspc($a); ?>" <?php echo (($a == $this->view['basket']['checkout']['custom'][$this->view['field']['id']])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
+			<?php } ?>
+		</select>
+		<?php } else if ($this->view['field']['typ'] == '2') { // Checkbox ?>
+		<input type="hidden" name="wpsg[checkout][custom][<?php echo $this->view['field']['id']; ?>]" value="0" />
+		<input class="<?php echo (($this->view['field']['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[checkout][custom][<?php echo $this->view['field']['id']; ?>]" value="1" <?php echo (($this->view['basket']['checkout']['custom'][$this->view['field']['id']] == '1')?'checked="checked"':''); ?> />
+		<?php } ?>
+	</label>
+</div>