Index: /lib/wpsg_imagehandler.class.php
===================================================================
--- /lib/wpsg_imagehandler.class.php	(revision 6510)
+++ /lib/wpsg_imagehandler.class.php	(revision 6512)
@@ -109,7 +109,6 @@
 			");
 			
-			// Die Sortierung steht in der Spalte postids im Produkt			
-			$oProduct = wpsg_product::getInstance($product_id);
-			$postids = $oProduct->postids;
+			// Die Sortierung steht in der Spalte postids im Produkt
+			$postids = $this->db->fetchOne("SELECT `postids` FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($product_id)."' ");
 						
 			if (strpos($postids, ',') !== false)
Index: /mods/wpsg_mod_fuellmenge.class.php
===================================================================
--- /mods/wpsg_mod_fuellmenge.class.php	(revision 6510)
+++ /mods/wpsg_mod_fuellmenge.class.php	(revision 6512)
@@ -72,29 +72,36 @@
 		
 			if (wpsg_isSizedInt($product_data['id']))
-				{
-					
-					$product_data = wpsg_array_merge($product_data, $this->db->fetchRow("
-						SELECT
-							`feinheit`, `fmenge`
-						FROM
-							`".WPSG_TBL_PRODUCTS."`
-						WHERE
-							`id` = '".wpsg_q($product_data['id'])."'
-					"));
-					
-				}
+			{
+				
+				$product_data = wpsg_array_merge($product_data, $this->db->fetchRow("
+					SELECT
+						`feinheit`, `fmenge`
+					FROM
+						`".WPSG_TBL_PRODUCTS."`
+					WHERE
+						`id` = '".wpsg_q($product_data['id'])."'
+				"));
+				
+			}
 		
 			$product_data['arFeinheiten'] = explode(',', $this->shop->get_option('wpsg_mod_fuellmenge_einheit'));
 		
 			
-			if (!array_key_exists('stock', $product_content))
+			if ($this->shop->hasMod('wpsg_mod_stock'))
 			{
+				
+				$product_content['stock']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/produkt_edit_sidebar.phtml', false);
+				
+			}
+			 else 
+			 {
+			
 				$product_content['wpsg_mod_fuellmenge'] = array(
-						'title' => __('Bestand / Maße', 'wpsg'),
-						'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/produkt_edit_sidebar.phtml', false)
+					'title' => __('Bestand / Maße', 'wpsg'),
+					'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/produkt_edit_sidebar.phtml', false)
 				);
-			}
-				
-			$product_content['stock']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/produkt_edit_sidebar.phtml', false);
+				 
+			 }	
+			
 		
 		}
@@ -126,5 +133,5 @@
 			if ($this->shop->hasMod('wpsg_mod_productvariants') && $this->shop->callMod('wpsg_mod_productvariants', 'isVariantsProductKey', array($produkt['id'])))
 			{
-				
+								
 				$variInfo = $this->shop->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($produkt['id']));
 				$produkt['fmenge'] += $variInfo['fmenge'];
Index: /mods/wpsg_mod_productvariants.class.php
===================================================================
--- /mods/wpsg_mod_productvariants.class.php	(revision 6510)
+++ /mods/wpsg_mod_productvariants.class.php	(revision 6512)
@@ -305,6 +305,5 @@
 				
 				if (wpsg_isSizedArray($arProductImagesPossible)) $product_data['image_show'] = array_shift($arProductImagesPossible);
-				if (wpsg_isSizedString($product_data['image_show']))
-					$product_data['image_show'] = sanitize_file_name($product_data['image_show']);
+				if (wpsg_isSizedString($product_data['image_show'])) $product_data['image_show'] = sanitize_file_name($product_data['image_show']);
 					
 				// Preise fÃŒr die Varianten berechnen
@@ -348,8 +347,4 @@
 				}
 
-			}
-			if ($product_data['preis_brutto'] == 161.00) {
-
-				$product_data['preis'] = $product_data['preis_brutto'];
 			}
 
@@ -1906,5 +1901,5 @@
 			//$vp_data = $this->loadVarianten($produkt_id);
 			$vp_data = $this->getVariants($produkt_id, true, true, true);
-			
+			 
 			$arReturn = array(
 				'product_id' => $produkt_id
@@ -1930,5 +1925,5 @@
 			$arImagesProduct = $this->shop->imagehandler->getAttachmentIDs($produkt_id);
 			$arImages = $arImagesProduct;
-			
+	
 			foreach ($arVari as $var_key)
 			{
Index: /mods/wpsg_mod_productvars.class.php
===================================================================
--- /mods/wpsg_mod_productvars.class.php	(revision 6510)
+++ /mods/wpsg_mod_productvars.class.php	(revision 6512)
@@ -513,5 +513,5 @@
 		public function product_bottom(&$produkt_id, $template_index)
 		{
-
+ 
 			if ($this->shop->get_option('wpsg_mod_productvars_showProduct') != '1') return false;
 
Index: /views/mods/mod_productvars/basket_row.phtml
===================================================================
--- /views/mods/mod_productvars/basket_row.phtml	(revision 6510)
+++ /views/mods/mod_productvars/basket_row.phtml	(revision 6512)
@@ -6,4 +6,5 @@
 
 ?>
+
 <?php foreach ($this->view['wpsg_mod_productvars']['data'] as $pv) { ?>
 <div class="product_info">
Index: /views/mods/mod_productvars/renderTemplate.phtml
===================================================================
--- /views/mods/mod_productvars/renderTemplate.phtml	(revision 6510)
+++ /views/mods/mod_productvars/renderTemplate.phtml	(revision 6512)
@@ -6,5 +6,5 @@
 
 ?>
-
+ 
 <div class="wpsg_mod_productvars">
 	<?php foreach ($this->view['wpsg_mod_productvars']['data'] as $pv) { ?>
Index: /views/produkttemplates/standard.phtml
===================================================================
--- /views/produkttemplates/standard.phtml	(revision 6510)
+++ /views/produkttemplates/standard.phtml	(revision 6512)
@@ -201,4 +201,6 @@
 		<?php /* Varianten ENDE */ ?>
 
+		<?php $this->callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
+		
 		<div class="wpsg_product_buttonarea">
 			<div class="wpsg_product_buttons_add_basket">
@@ -293,5 +295,3 @@
 	</div>
 
-	<?php $this->callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-
 </div>
Index: /views/warenkorb/basket.phtml
===================================================================
--- /views/warenkorb/basket.phtml	(revision 6510)
+++ /views/warenkorb/basket.phtml	(revision 6512)
@@ -112,4 +112,5 @@
 					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
 					<div class="product_info">
+						
 						<div
 						<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>