Index: /controller/wpsg_ProduktController.class.php
===================================================================
--- /controller/wpsg_ProduktController.class.php	(revision 5917)
+++ /controller/wpsg_ProduktController.class.php	(revision 5918)
@@ -447,10 +447,5 @@
 					'content' => $this->shop->render(WPSG_PATH_VIEW.'/produkt/addedit_payship.phtml', false)
 				);
-				
-				$this->shop->view['arSubAction']['stock'] = array(
-						'title' => __('Bestand / Maße', 'wpsg'),
-						'content' => $this->shop->render(WPSG_PATH_VIEW.'/produkt/addedit_stock.phtml', false)
-				);
-				
+								
 			}
 			
Index: /mods/wpsg_mod_stock.class.php
===================================================================
--- /mods/wpsg_mod_stock.class.php	(revision 5917)
+++ /mods/wpsg_mod_stock.class.php	(revision 5918)
@@ -144,16 +144,5 @@
 						
 		} // public function produkt_save(&$produkt_id)
-		
-		
-		public function produkt_edit_allgemein(&$produkt_data)
-		{
-		
-			if (isset($_REQUEST['wpsg_lang'])) return;
-				
-			$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_stock/produkt_edit_sidebar.phtml');
-		
-		} // public function produkt_edit_allgemein(&$produkt_data)
-		
-		
+		 
 		public function produkt_edit_sidebar(&$produkt_data)
 		{
@@ -410,4 +399,24 @@
 		} // public function checkCheckout(&$state, &$error, &$arCheckout)
 		
+		public function product_addedit_content(&$product_content, &$product_data) 
+		{ 
+			
+			if (isset($_REQUEST['wpsg_lang'])) return;
+			
+			if (!array_key_exists('stock', $product_content))
+			{
+				
+				$this->shop->view['arSubAction']['stock'] = array(
+					'title' => __('Bestand / Maße', 'wpsg'),
+					'content' => ''
+				);
+				
+			}
+			
+			$this->shop->view['data'] = $product_data;
+			$this->shop->view['arSubAction']['stock']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_stock/product_addedit_content.phtml', false);
+			
+		} // public function produkt_add(&$produkt_data)
+		
 		/* Modulfunktionen */
 		
Index: /mods/wpsg_mod_weight.class.php
===================================================================
--- /mods/wpsg_mod_weight.class.php	(revision 5917)
+++ /mods/wpsg_mod_weight.class.php	(revision 5918)
@@ -145,12 +145,21 @@
 		} // public function overview_row_end(&$overview_view)
 		
-		public function produkt_edit_allgemein(&$produkt_data) 
+		public function product_addedit_content(&$product_content, &$product_data)
 		{ 
 			
 			if (isset($_REQUEST['wpsg_lang'])) return;
 			
-			$this->shop->view['wpsg_mod_weight']['weight'] = wpsg_getFloat($produkt_data['weight']);
-			
-			$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_weight/produkt_edit_allgemein.phtml');
+			if (!array_key_exists('stock', $product_content))
+			{
+				
+				$this->shop->view['arSubAction']['stock'] = array(
+					'title' => __('Bestand / Maße', 'wpsg'),
+					'content' => ''
+				);
+				
+			}
+						
+			$this->shop->view['wpsg_mod_weight']['weight'] = wpsg_getFloat($product_data['weight']);			
+			$this->shop->view['arSubAction']['stock']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_weight/product_addedit_content.phtml', false);
 			
 		} // public function produkt_edit_allgemein(&$produkt_data)
Index: /views/mods/mod_stock/product_addedit_content.phtml
===================================================================
--- /views/mods/mod_stock/product_addedit_content.phtml	(revision 5918)
+++ /views/mods/mod_stock/product_addedit_content.phtml	(revision 5918)
@@ -0,0 +1,28 @@
+<?php
+
+    /**
+     * Template fÃŒr die Integration des Lagerbestandes in die Produktverwaltung
+     */
+
+?>
+
+<?php echo wpsg_drawForm_AdminboxStart(__('Lagerbestand', 'wpsg')); ?>
+
+    <?php echo wpsg_drawForm_Input('wpsg_mod_stock_stock', __('Lagerbestand', 'wpsg'), wpsg_getStr($this->view['data']['stock'], '0')); ?>
+    <?php echo wpsg_drawForm_Checkbox('wpsg_mod_stock_stock_count', __('Lagerbestand zÀhlen', 'wpsg'), wpsg_getStr($this->view['data']['stock_count'], '0')); ?>
+
+    <br />
+
+    <div class="info"><?php echo __('Lagerbestand = Bestand(Variante 1) + Bestand(Variante 2) + Bestand(Variante X)','wpsg'); ?></div>
+    
+    <?php /* Mailbenachrichtigung beim Erreichen des Minimalbestandes des Produktes */ ?>
+    <?php if ($this->get_option('wpsg_mod_stock_minstockproduct') == '1') { ?>
+    <?php echo wpsg_drawForm_Input('wpsg_mod_minstockproduct', __('Mindestlagerbestand', 'wpsg'), wpsg_getStr($this->view['data']['minstockproduct_count'])); ?>
+    <?php echo wpsg_drawForm_Input('wpsg_mod_stock_minstockproduct_mail', __('Benachrichtigung an', 'wpsg'), wpsg_getStr($this->view['data']['minstockproduct_mail'])); ?>	
+    <?php }?>
+
+    <br />
+
+	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_stock"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration des Lagerbestandmoduls', 'wpsg'); ?></a>
+
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
Index: ews/mods/mod_stock/produkt_edit_sidebar.phtml
===================================================================
--- /views/mods/mod_stock/produkt_edit_sidebar.phtml	(revision 5917)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?php
-
-	/**
-	 * Template fÃŒr die Lagerbestands Einstellungen innerhalb des Produkts
-	 */
-
-?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_stock_stock', __('Lagerbestand', 'wpsg'), wpsg_getStr($this->view['data']['stock'], '0')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_stock_stock_count', __('Lagerbestand zÀhlen', 'wpsg'), wpsg_getStr($this->view['data']['stock_count'], '0')); ?>
-<?php echo __('Lagerbestand = Bestand(Variante 1) + Bestand(Variante 2) + Bestand(Variante X)','wpsg'); ?>
-
-<?php /* Mailbenachrichtigung beim Erreichen des Minimalbestandes des Produktes */ ?>
-<?php if ($this->get_option('wpsg_mod_stock_minstockproduct') == '1') { ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_minstockproduct', __('Mindestlagerbestand', 'wpsg'), wpsg_getStr($this->view['data']['minstockproduct_count'])); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_stock_minstockproduct_mail', __('Benachrichtigung an', 'wpsg'), wpsg_getStr($this->view['data']['minstockproduct_mail'])); ?>	
-<?php }?>
Index: /views/mods/mod_weight/product_addedit_content.phtml
===================================================================
--- /views/mods/mod_weight/product_addedit_content.phtml	(revision 5918)
+++ /views/mods/mod_weight/product_addedit_content.phtml	(revision 5918)
@@ -0,0 +1,17 @@
+<?php
+ 
+	/**
+	 * Template fÃŒr die Integration des Produktgewichts in die Produktverwaltung
+	 */
+
+?>
+
+<?php echo wpsg_drawForm_AdminboxStart(__('Produktgewicht', 'wpsg')); ?>
+
+    <?php echo wpsg_drawForm_Input('wpsg_mod_weight[weight]', __('Produktgewicht', 'wpsg'), wpsg_ff($this->view['wpsg_mod_weight']['weight']), array('unit' => $this->get_option('wpsg_mod_weight_unit'))); ?>
+
+    <br />
+
+	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_weight"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration des Gewichtsmoduls', 'wpsg'); ?></a>
+
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
Index: ews/produkt/addedit_stock.phtml
===================================================================
--- /views/produkt/addedit_stock.phtml	(revision 5917)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?php
-
-	/**
-	 * Template fÃŒr den Reiter "Bestandsdaten" der Produktverwaltung
-	 */
-
-?>
-<?php /* Lagerbestand */ ?>
-<?php if ($this->hasMod('wpsg_mod_stock') == '1') { ?>
-	<?php echo wpsg_drawForm_AdminboxStart(__('Lagerbestand', 'wpsg')); ?>
-		<?php $this->callMod('wpsg_mod_stock', 'produkt_edit_allgemein', array(&$this->view['data']));?>
-		<br />
-		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_stock"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration des Lagerbestandmoduls', 'wpsg'); ?></a>			
-	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
-<?php } ?>
-
-<?php /* Gewicht */ ?>
-<?php if ($this->hasMod('wpsg_mod_weight') == '1') { ?>
-	<?php echo wpsg_drawForm_AdminboxStart(__('Produktgewicht', 'wpsg')); ?>
-		<?php $this->callMod('wpsg_mod_weight', 'produkt_edit_allgemein', array(&$this->view['data']));?>
-		<br />
-		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_weight"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration des Produktgewichtmoduls', 'wpsg'); ?></a>			
-	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
-<?php } ?>
-