Index: /mods/wpsg_mod_deliverynote.class.php
===================================================================
--- /mods/wpsg_mod_deliverynote.class.php	(revision 6145)
+++ /mods/wpsg_mod_deliverynote.class.php	(revision 6147)
@@ -601,12 +601,15 @@
 				{
 					
-					$this->shop->view['data']['firma'] = $this->shop->view['order']['shipping_firma'];
-					$this->shop->view['data']['vname'] = $this->shop->view['order']['shipping_vname'];
-					$this->shop->view['data']['name'] = $this->shop->view['order']['shipping_name'];
-					$this->shop->view['data']['strasse'] = $this->shop->view['order']['shipping_strasse'];
-					$this->shop->view['data']['hausnr'] = $this->shop->view['order']['shipping_hausnr'];
-					$this->shop->view['data']['plz'] = $this->shop->view['order']['shipping_plz'];
-					$this->shop->view['data']['ort'] = $this->shop->view['order']['shipping_ort'];
-					$this->shop->view['data']['land'] = $this->shop->view['order']['shipping_land'];
+					$adata = $this->db->fetchRow("SELECT A.* FROM `".WPSG_TBL_ADRESS."` AS A WHERE A.`id` = '".wpsg_q($this->shop->view['order']['shipping_adress_id'])."'");
+						
+					
+					$this->shop->view['data']['firma'] = $adata['firma'];
+					$this->shop->view['data']['vname'] = $adata['vname'];
+					$this->shop->view['data']['name'] = $adata['name'];
+					$this->shop->view['data']['strasse'] = $adata['strasse'];
+					$this->shop->view['data']['hausnr'] = $adata['nr'];
+					$this->shop->view['data']['plz'] = $adata['plz'];
+					$this->shop->view['data']['ort'] = $adata['ort'];
+					$this->shop->view['data']['land'] = $adata['land'];
 					
 				}
Index: /mods/wpsg_mod_productvariants.class.php
===================================================================
--- /mods/wpsg_mod_productvariants.class.php	(revision 6145)
+++ /mods/wpsg_mod_productvariants.class.php	(revision 6147)
@@ -1038,10 +1038,48 @@
 					}
 				}
-				$this->shop->view['data']['vp_data'] = $vp_data;
+
+				// Daten umstrukturieren 
+				$vp = Array();
+				$variant_id_alt = 0;
+				$i = -1;
+				$j = 0;
+				foreach ($vp_data as $k1 => $var) {
+					if ($var['variant_id'] != $variant_id_alt) {
+						$j = 0;	
+						$variant_id_alt = $var['variant_id'];
+						$i++;
+						$vp[$i]['id'] = $var['variant_id'];
+						$vp[$i]['iid'] = $var['id'];
+						$vp[$i]['product_id'] = $var['product_id'];
+						$vp[$i]['pos'] = $var['PVpos'];
+						if ($var['type'] == 0) $vp[$i]['typ'] = 'select';
+						if ($var['type'] == 1) $vp[$i]['typ'] = 'radio';
+						if ($var['type'] == 2) $vp[$i]['typ'] = 'image';
+						$vp[$i]['name'] = $var['Vname'];
+						$vp[$i]['aktiv'] = 1;
+						$vp[$i]['preis'] = 0;
+						$vp[$i]['pic'] = '';
+					}
+					$vp[$i]['vari'][$j] = Array();
+					$vp[$i]['vari'][$j]['id'] = $var['variation_id'];
+					$vp[$i]['vari'][$j]['name'] = $var['shortname'];
+					$vp[$i]['vari'][$j]['lname'] = $var['VVname'];
+					$vp[$i]['vari'][$j]['pos'] = $var['VVpos'];
+					$vp[$i]['vari'][$j]['preis'] = $var['price'];
+					$vp[$i]['vari'][$j]['aktiv'] = 1;
+					$vp[$i]['vari'][$j]['stock'] = $var['stock'];
+					$vp[$i]['vari'][$j]['pic'] = $var['pic'];
+					$vp[$i]['vari'][$j]['picOrder'] = $var['picOrder'];
+					$vp[$i]['vari'][$j]['showpic'] = $var['showpic'];
+					$j++;
+					
+				}
+				
+				$this->shop->view['data']['vp_data'] = $vp;
 				
 				foreach ($this->shop->view['data']['vp_data'] as $k => $v)
 				{
 						
-					if ($v['type'] == "0")	// 0 = checkbox
+					if ($v['typ'] == "checkbox")	// 0 = checkbox
 					{
 		
@@ -1054,8 +1092,6 @@
 		
 						// Preis an Ausgabe im Frontend anpassen
-						//if ($this->shop->getFrontendTaxview() == WPSG_NETTO && $this->shop->getBackendTaxview() == WPSG_BRUTTO) $this->shop->view['data']['vp_data'][$k]['preis'] = wpsg_calculatePreis($v['preis'], WPSG_NETTO, $tax_value);
-						//else if ($this->shop->getFrontendTaxview() == WPSG_BRUTTO && $this->shop->getBackendTaxview() == WPSG_NETTO) $this->shop->view['data']['vp_data'][$k]['preis'] = wpsg_calculatePreis($v['preis'], WPSG_BRUTTO, $tax_value);
-						if ($this->shop->getFrontendTaxview() == WPSG_NETTO && $this->shop->getBackendTaxview() == WPSG_BRUTTO) $this->shop->view['data']['vp_data'][$k]['vprice'] = wpsg_calculatePreis($v['price'], WPSG_NETTO, $tax_value);
-						else if ($this->shop->getFrontendTaxview() == WPSG_BRUTTO && $this->shop->getBackendTaxview() == WPSG_NETTO) $this->shop->view['data']['vp_data'][$k]['vprice'] = wpsg_calculatePreis($v['price'], WPSG_BRUTTO, $tax_value);
+						if ($this->shop->getFrontendTaxview() == WPSG_NETTO && $this->shop->getBackendTaxview() == WPSG_BRUTTO) $this->shop->view['data']['vp_data'][$k]['preis'] = wpsg_calculatePreis($v['preis'], WPSG_NETTO, $tax_value);
+						else if ($this->shop->getFrontendTaxview() == WPSG_BRUTTO && $this->shop->getBackendTaxview() == WPSG_NETTO) $this->shop->view['data']['vp_data'][$k]['preis'] = wpsg_calculatePreis($v['preis'], WPSG_BRUTTO, $tax_value);
 						
 					}
@@ -1063,8 +1099,8 @@
 					{
 		
-						//foreach ($v['vari'] as $k2 => $v2)
+						foreach ($v['vari'] as $k2 => $v2)
 						{
 		
-							//if (get_option("wpsg_vp_showpic") == "1" && wpsg_isSizedString($v2['pic']))
+							if (get_option("wpsg_vp_showpic") == "1" && wpsg_isSizedString($v2['pic']))
 							{
 		
@@ -1074,8 +1110,6 @@
 								
 							// Preis an Ausgabe im Frontend anpassen
-							//if ($this->shop->getFrontendTaxview() == WPSG_NETTO && $this->shop->getBackendTaxview() == WPSG_BRUTTO) $this->shop->view['data']['vp_data'][$k]['vari'][$k2]['preis'] = wpsg_calculatePreis($v2['preis'], WPSG_NETTO, $tax_value);
-							//else if ($this->shop->getFrontendTaxview() == WPSG_BRUTTO && $this->shop->getBackendTaxview() == WPSG_NETTO) $this->shop->view['data']['vp_data'][$k]['vari'][$k2]['preis'] = wpsg_calculatePreis($v2['preis'], WPSG_BRUTTO, $tax_value);
-							if ($this->shop->getFrontendTaxview() == WPSG_NETTO && $this->shop->getBackendTaxview() == WPSG_BRUTTO) $this->shop->view['data']['vp_data'][$k]['price'] = wpsg_calculatePreis($v['price'], WPSG_NETTO, $tax_value);
-							else if ($this->shop->getFrontendTaxview() == WPSG_BRUTTO && $this->shop->getBackendTaxview() == WPSG_NETTO) $this->shop->view['data']['vp_data'][$k]['price'] = wpsg_calculatePreis($v['price'], WPSG_BRUTTO, $tax_value);
+							if ($this->shop->getFrontendTaxview() == WPSG_NETTO && $this->shop->getBackendTaxview() == WPSG_BRUTTO) $this->shop->view['data']['vp_data'][$k]['vari'][$k2]['preis'] = wpsg_calculatePreis($v2['preis'], WPSG_NETTO, $tax_value);
+							else if ($this->shop->getFrontendTaxview() == WPSG_BRUTTO && $this->shop->getBackendTaxview() == WPSG_NETTO) $this->shop->view['data']['vp_data'][$k]['vari'][$k2]['preis'] = wpsg_calculatePreis($v2['preis'], WPSG_BRUTTO, $tax_value);
 								
 						}
Index: /views/mods/mod_productvariants/produkt.phtml
===================================================================
--- /views/mods/mod_productvariants/produkt.phtml	(revision 6145)
+++ /views/mods/mod_productvariants/produkt.phtml	(revision 6147)
@@ -17,5 +17,5 @@
 	<?php foreach ($this->view['data']['vp_data'] as $k => $var) { 
 		
-		if ($var['active'] == "0") { 
+		if ($var['aktiv'] == "1") { 
 
 			$vAktiv = true; ?>
@@ -25,9 +25,9 @@
 				<script type="text/javascript">/* <![CDATA[ */
 		
-					wpsg_vp_vari[<?php echo $this->getProduktId($this->view['data']['id']); ?>][<?php echo $k; ?>] = "<?php echo $var['type']; ?>";			
+					wpsg_vp_vari[<?php echo $this->getProduktId($this->view['data']['id']); ?>][<?php echo $k; ?>] = "<?php echo $var['typ']; ?>";			
 								
 				/* ]]> */</script>
 				
-				<?php if ($var['typ0'] != 0) { ?>
+				<?php if ($var['typ'] != 'radio') { ?>
 					<label class="wpsg_vp_field_label" for="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>">
 						<?php echo $var['name']; ?>
@@ -40,8 +40,8 @@
 				
 					<?php /* SELECT-Box START */ ?>
-					<?php if ($var['type'] == "select") { ?>
+					<?php if ($var['typ'] == "select") { ?>
 						<label>			 			
 							<select onchange="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" name="wpsg_vp[<?php echo $k; ?>]" id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>">
-							<?php foreach ($var['vari'] as $kv => $vari) { 
+							<?php /*foreach ($var['vari'] as $kv => $vari)*/ { 
 								if ($vari['aktiv'] == "1") { $j ++; ?>
 									<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0 || $this->get_option('wpsg_mod_vp_showProduct') === '1') { ?>
@@ -50,10 +50,10 @@
 										<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0) { ?>
 										
-											<option value="<?php echo $kv; ?>" <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $kv)?'selected="selected"':''); ?>>						
+											<option value="<?php echo $kv; ?>" <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'selected="selected"':''); ?>>						
 											<?php echo $vari['name']; ?>
 												
 												<?php /* Abfrage Preisanzeige nur fÃŒr eingeloggte Benutzer START */?>
 												<?php if (($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>			
-													<?php if ($this->callMod('wpsg_mod_varianten', 'showVariPrice', array($vari['preis']))) { ?>
+													<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($vari['preis']))) { ?>
 														(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)
 													<?php } ?>
@@ -66,7 +66,7 @@
 										<?php /* Lagerbestand der Variante=0 - wird angezeigt, ist aber nicht auswÀhlbar */ ?>
 										<?php } else { ?>
-											<option disabled="disabled" value="<?php echo $kv; ?>" <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $kv)?'selected="selected"':''); ?>>						
+											<option disabled="disabled" value="<?php echo $kv; ?>" <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'selected="selected"':''); ?>>						
 												<?php echo $vari['name']; ?>
-												<?php if ($this->callMod('wpsg_mod_varianten', 'showVariPrice', array($vari['preis']))) { ?>
+												<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($vari['preis']))) { ?>
 													(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)
 												<?php } ?>
@@ -82,5 +82,5 @@
 									<?php foreach ($var['vari'] as $kv => $vari) { 
 										if ($vari['aktiv'] == "1" && isset($vari['showpic'])) { ?>
-											<span class="wpsg_vp_image wpsg_vp_image_<?php echo $kv; ?>" style="display:<?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $kv)?'block':'none'); ?>;">
+											<span class="wpsg_vp_image wpsg_vp_image_<?php echo $kv; ?>" style="display:<?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'block':'none'); ?>;">
 												
 												<?php 
@@ -107,10 +107,10 @@
 					<?php if ($var['typ'] == 'image' && $this->hasMod('wpsg_mod_produktbilder')) { ?>
 						<div class="wpsg_mod_varianten_imageselect wpsg_mod_varianten_imageselect_<?php echo $k; ?>">
-						<input type="hidden" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $this->view['wpsg_mod_varianten']['set'][$k]; ?>" />
+						<input type="hidden" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $this->view['wpsg_mod_productvariants']['set'][$k]; ?>" />
 							<?php foreach ($var['vari'] as $kv => $vari) { 
 								if ($vari['aktiv'] == '1' && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { ?>
-									<?php $img = $this->callMod('wpsg_mod_varianten', 'getImageSelectImage', array($this->getProduktId($this->view['data']['id']), $k, $kv, $this->view['data']['product_key'])); ?>								
+									<?php $img = $this->callMod('wpsg_mod_productvariants', 'getImageSelectImage', array($this->getProduktId($this->view['data']['id']), $k, $kv, $this->view['data']['product_key'])); ?>								
 									<?php if (wpsg_isSizedString($img)) { ?>
-										<a data-wpsg-id="<?php echo $kv; ?>" class="image <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $kv)?'akt':''); ?>" onclick="jQuery(this).parent().find('a').removeClass('akt'); jQuery(this).addClass('akt'); wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>); return false;" href="#">
+										<a data-wpsg-id="<?php echo $kv; ?>" class="image <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'akt':''); ?>" onclick="jQuery(this).parent().find('a').removeClass('akt'); jQuery(this).addClass('akt'); wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>); return false;" href="#">
 											<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->getProduktId($this->view['data']['id']), $img, $this->get_option('wpsg_vp_imageselect_width'), $this->get_option('wpsg_vp_imageselect_height'), $this->get_option('wpsg_vp_imageselect_mode'))); ?>" />
 										</a>
@@ -128,8 +128,8 @@
 								
 									<?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0) { ?>
-										<input <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $kv)?'checked="checked"':''); ?> id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>_<?php echo $j; ?>" onclick="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" />&nbsp;<?php echo $vari['name']; ?>
+										<input <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'checked="checked"':''); ?> id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>_<?php echo $j; ?>" onclick="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" />&nbsp;<?php echo $vari['name']; ?>
 									<?php /* Lagerbestand der Variante=0 - wird angezeigt, ist aber nicht auswÀhlbar */ ?>
 									<?php } else { ?>
-										<input disabled="disabled" <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == $kv)?'checked="checked"':''); ?> id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>_<?php echo $j; ?>" onclick="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" />&nbsp;<?php echo $vari['name']; ?>
+										<input disabled="disabled" <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'checked="checked"':''); ?> id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>_<?php echo $j; ?>" onclick="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" />&nbsp;<?php echo $vari['name']; ?>
 									<?php } ?>
 									
@@ -137,5 +137,5 @@
 									<?php if (($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>			
 							
-										<?php if ($this->callMod('wpsg_mod_varianten', 'showVariPrice', array($vari['preis']))) { ?>
+										<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($vari['preis']))) { ?>
 											<span class="wpsg_vp_vari_preisinfo">(<?php echo wpsg_ff($vari['preis'], $this->get_option('wpsg_currency')); ?>)</span>
 										<?php } ?>
@@ -172,8 +172,8 @@
 					<label>
 						<input onchange="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="hidden" value="0" name="wpsg_vp[<?php echo $k; ?>]" />
-						<input <?php echo (($this->view['wpsg_mod_varianten']['set'][$k] == '1')?'checked="checked"':''); ?> onchange="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="checkbox" value="1" name="wpsg_vp[<?php echo $k; ?>]" />
+						<input <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == '1')?'checked="checked"':''); ?> onchange="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="checkbox" value="1" name="wpsg_vp[<?php echo $k; ?>]" />
 						<?php /* Abfrage Preisanzeige nur fÃŒr eingeloggte Benutzer START */?>
 						<?php if (($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?>
-							<?php if ($this->callMod('wpsg_mod_varianten', 'showVariPrice', array($var['preis']))) { ?>
+							<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($var['preis']))) { ?>
 								<span class="wpsg_vp_vari_preisinfo">(<?php echo wpsg_ff($var['preis'], $this->get_option('wpsg_currency')); ?>)</span>
 							<?php } ?>