Index: /controller/wpsg_ProduktController.class.php
===================================================================
--- /controller/wpsg_ProduktController.class.php	(revision 5889)
+++ /controller/wpsg_ProduktController.class.php	(revision 5890)
@@ -448,4 +448,9 @@
 				);
 				
+				$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_discount.class.php
===================================================================
--- /mods/wpsg_mod_discount.class.php	(revision 5889)
+++ /mods/wpsg_mod_discount.class.php	(revision 5890)
@@ -154,8 +154,11 @@
 			}
 		
-			$product_content['wpsg_mod_discount'] = array(
+			/*$product_content['wpsg_mod_discount'] = array(
 					'title' => __('Rabatte', 'wpsg'),
 					'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_discount/produkt_addedit_sidebar.phtml', false)
-			);
+			);*/
+			
+			$product_content['price']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_discount/produkt_addedit_sidebar.phtml', false);
+				
 		
 		} // public function produkt_edit_sidebar(&$product_content, &$produkt_data)
Index: /mods/wpsg_mod_fuellmenge.class.php
===================================================================
--- /mods/wpsg_mod_fuellmenge.class.php	(revision 5889)
+++ /mods/wpsg_mod_fuellmenge.class.php	(revision 5890)
@@ -87,8 +87,10 @@
 			$product_data['arFeinheiten'] = explode(',', $this->shop->get_option('wpsg_mod_fuellmenge_einheit'));
 		
-			$product_content['wpsg_mod_fuellmenge'] = array(
+			/*$product_content['wpsg_mod_fuellmenge'] = array(
 					'title' => __('FÃŒllmenge', '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);
 		
 		}
Index: /mods/wpsg_mod_relatedproducts.class.php
===================================================================
--- /mods/wpsg_mod_relatedproducts.class.php	(revision 5889)
+++ /mods/wpsg_mod_relatedproducts.class.php	(revision 5890)
@@ -114,8 +114,11 @@
 			$this->shop->view['wpsg_mod_relatedproducts']['data'] = $product_data;
 		
-			$product_content['wpsg_mod_relatedproducts'] = array(
+			/*$product_content['wpsg_mod_relatedproducts'] = array(
 					'title' => __('Zubehörprodukte', 'wpsg'),
 					'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_relatedproducts/produkt_addedit_sidebar.phtml', false)
-			);
+			);*/
+			
+			$product_content['general']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_relatedproducts/produkt_addedit_sidebar.phtml', false);
+				
 		
 		} //public function product_addedit_content(&$product_content, &$product_data)
Index: /mods/wpsg_mod_scaleprice.class.php
===================================================================
--- /mods/wpsg_mod_scaleprice.class.php	(revision 5889)
+++ /mods/wpsg_mod_scaleprice.class.php	(revision 5890)
@@ -89,8 +89,12 @@
 			$this->shop->view['wpsg_mod_scaleprice']['list'] = $this->scaleList($product_data['id']);
 		
-			$product_content['wpsg_mod_scaleprice'] = array(
+			/*$product_content['wpsg_mod_scaleprice'] = array(
 					'title' => __('Staffelpreise', 'wpsg'),
-					'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_scaleprice/produkt_addedit_sidebar.phtml', false)
+					'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_scaleprice/produkt_addedit_sidebar.phtml', false)		
 			);
+			*/
+			
+			$product_content['price']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_scaleprice/produkt_addedit_sidebar.phtml', false);
+			
 		
 		} //public function product_addedit_content(&$product_content, &$product_data)
Index: /mods/wpsg_mod_topseller.class.php
===================================================================
--- /mods/wpsg_mod_topseller.class.php	(revision 5889)
+++ /mods/wpsg_mod_topseller.class.php	(revision 5890)
@@ -72,8 +72,5 @@
 			$this->shop->view['wpsg_mod_topseller']['data'] = $product_data;
 		
-			$product_content['wpsg_mod_topseller'] = array(
-					'title' => __('Topseller', 'wpsg'),
-					'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_topseller/produkt_addedit_allgemein.phtml', false)
-			);
+			$product_content['general']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_topseller/produkt_addedit_allgemein.phtml', false);			
 		
 		} //public function product_addedit_content(&$product_content, &$product_data)
Index: /views/mods/mod_scaleprice/product_edit_allgemein.phtml
===================================================================
--- /views/mods/mod_scaleprice/product_edit_allgemein.phtml	(revision 5890)
+++ /views/mods/mod_scaleprice/product_edit_allgemein.phtml	(revision 5890)
@@ -0,0 +1,204 @@
+<?php
+
+	/**
+	 * Template fÃŒr die Integration der Staffelpreise in die Produktverwaltung
+	 */
+
+?>
+<script type="text/javascript">/* <![CDATA[ */
+
+	jQuery(document).ready(function() {
+ 
+		jQuery('#wpsg_mod_scaleprice_activ').bind('change', function() {
+ 
+			if (jQuery(this).attr('checked') == 'checked') jQuery('#wpsg_mod_scaleprice_layer').show();
+			else jQuery('#wpsg_mod_scaleprice_layer').hide();
+			
+		} ).change();
+
+		jQuery('#wpsg_mod_scaleprice_typ').bind('change', function() { wpsg_mod_scaleprice_refresh(); } );
+		jQuery('#wpsg_mod_scaleprice_calc').bind('change', function() { wpsg_mod_scaleprice_saveAjax(); } );
+		
+		<?php /* echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_downloadprodukte&edit_id=<?php echo $this->view['data']['id'] ?>&noheader=1&cmd=upload_file*/?>
+				
+	} );
+
+	function wpsg_mod_scaleprice_add()
+	{
+
+		var wpsg_scale = jQuery('#wpsg_mod_scaleprice_scale').val();
+		var wpsg_value = jQuery('#wpsg_mod_scaleprice_value').val();
+		 
+		jQuery('#wpsg_mod_scaleprice_target').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+		
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_scaleprice&edit_id=<?php echo $this->view['wpsg_mod_scaleprice']['product']['id']; ?>&noheader=1&cmd=add',
+			data: { 
+				'scale': wpsg_scale,
+				'value': wpsg_value
+			},
+			success: function(data) {
+				
+				jQuery('#wpsg_mod_scaleprice_target').html(data);
+				wpsg_mod_scaleprice_clearErrorField();
+				 				
+			}
+		} );
+
+		return false;
+		
+	} // function wpsg_mod_scaleprice_add() 
+
+	function wpsg_mod_scaleprice_refresh()
+	{
+ 
+		jQuery('#wpsg_mod_scaleprice_target').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+		
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_scaleprice&edit_id=<?php echo $this->view['wpsg_mod_scaleprice']['product']['id']; ?>&noheader=1&cmd=refresh',
+			data: {
+				typ: jQuery('#wpsg_mod_scaleprice_typ').val(),
+				calc: jQuery('#wpsg_mod_scaleprice_calc').val()
+			},
+			success: function(data) {
+				
+				jQuery('#wpsg_mod_scaleprice_target').html(data);
+				wpsg_mod_scaleprice_clearErrorField();
+				
+			}
+		} );
+
+		return false;
+		
+	} // function wpsg_mod_scaleprice_refresh() 
+
+	function wpsg_mod_scaleprice_saveAjax()
+	{
+ 
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_scaleprice&edit_id=<?php echo $this->view['wpsg_mod_scaleprice']['product']['id']; ?>&noheader=1&cmd=ajaxSave',
+			data: {
+				typ: jQuery('#wpsg_mod_scaleprice_typ').val(),
+				calc: jQuery('#wpsg_mod_scaleprice_calc').val()
+			},
+			success: function(data) {
+
+				wpsg_mod_scaleprice_clearErrorField();
+			
+			}			
+		} );
+		
+	} // function wpsg_mod_scaleprice_saveAjax()
+
+	function wpsg_mod_scaleprice_clearErrorField()
+	{
+
+		var wpsg_product_edit_change_new = Array();
+
+		for (var i = 0; i < wpsg_product_edit_change.length; i++)
+		{
+
+			if (!wpsg_product_edit_change[i].match(/^wpsg_mod_scaleprice/))
+			{
+
+				wpsg_product_edit_change_new.push(wpsg_product_edit_change[i]);
+				
+			}
+			
+		} 
+
+		wpsg_product_edit_change = wpsg_product_edit_change_new;
+				
+	}
+	
+	function wpsg_mod_scaleprice_change(ev)
+	{
+ 
+		if (!wpsg_in_array(ev.target.id, wpsg_product_edit_change) && jQuery(ev.target).val() != "")
+		{
+
+			wpsg_product_edit_change.push(ev.target.id);
+			 
+		}
+		else if (jQuery(ev.target).val() == "" && wpsg_in_array(ev.target.id, wpsg_product_edit_change))
+		{
+ 
+		    for (var i = 0; i < wpsg_product_edit_change.length; i++) 
+			{
+		    	
+		        if (wpsg_product_edit_change[i] == ev.target.id)
+		        {
+
+			    	wpsg_product_edit_change.splice(i, 1);
+			    	jQuery('#' + ev.target.id).removeClass('wpsg_change_error');
+			         
+		        } 
+		    	
+		    }
+			
+		}
+		
+	} // function wpsg_mod_scaleprice_change(ev)
+	
+	function wpsg_mod_scaleprice_remove(scale_id)
+	{
+
+		if (!confirm('<?php echo __('Sind Sie sich sicher, dass sie diese Staffel entfernen möchten?', 'wpsg'); ?>')) return false;
+ 
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_scaleprice&edit_id=<?php echo $this->view['wpsg_mod_scaleprice']['product']['id']; ?>&noheader=1&cmd=remove',
+			data: {
+				scale_id: scale_id
+			},
+			success: function(data) {
+				
+				jQuery('#wpsg_mod_scaleprice_row_' + scale_id).remove();
+				
+			}
+		} );
+
+		return false;
+		
+	} // function wpsg_mod_scaleprice_remove(scale_id)
+         
+/* ]]> */</script>
+
+<div class="panel panel-default">
+	<div class="panel-heading clearfix">
+		<h3 class="panel-title">
+			<span><?php echo __('Staffelpreise', 'wpsg'); ?></span>
+		</h3>
+	</div> 
+	<div class="panel-body">
+	
+		<?php if ($this->view['wpsg_mod_scaleprice']['product']['id'] <= 0) { ?>
+		<p><?php echo __('Staffelpreise können erst nach einmaligem Speichern des Produktes definiert werden.', 'wpsg'); ?>
+		<?php } else { ?>
+
+		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_scaleprice_activ', __('Staffelpreise aktiv', 'wpsg'), $this->view['wpsg_mod_scaleprice']['product']['wpsg_mod_scaleprice_activ']); ?>
+		
+		<div id="wpsg_mod_scaleprice_layer">
+		 
+		 	<?php if (wpsg_isSizedArray($this->view['wpsg_mod_scaleprice']['arTyp']) && sizeof($this->view['wpsg_mod_scaleprice']['arTyp']) > 0) { ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_scaleprice_typ', __('Bezugsgröße', 'wpsg'), array(
+				wpsg_mod_scaleprice::TYP_QUANTITY => __('Menge', 'wpsg'),
+				wpsg_mod_scaleprice::TYP_WEIGHT => __('Gewicht', 'wpsg')
+			), $this->view['wpsg_mod_scaleprice']['product']['wpsg_mod_scaleprice_typ']); ?>
+			<?php } else { ?>
+			<input type="hidden" name="wpsg_mod_scaleprice_typ" id="wpsg_mod_scaleprice_typ" value="0" />
+			<?php } ?>
+			
+			<?php echo wpsg_drawForm_Select('wpsg_mod_scaleprice_calc', __('Berechnung', 'wpsg'), array(
+				wpsg_mod_scaleprice::CALC_REPLACE => __('Ersetzung', 'wpsg'),
+				wpsg_mod_scaleprice::CALC_ADD => __('Addition', 'wpsg')
+			), $this->view['wpsg_mod_scaleprice']['product']['wpsg_mod_scaleprice_calc']); ?>
+			 									
+			<div id="wpsg_mod_scaleprice_target"><?php echo $this->view['wpsg_mod_scaleprice']['list']; ?></div>
+			
+		</div>
+		
+		<?php } ?>
+		<br /><br />
+		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_scaleprice"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Staffelpreise', 'wpsg'); ?></a>			 
+	</div>
+</div>
Index: /views/mods/mod_stock/produkt_edit_sidebar.phtml
===================================================================
--- /views/mods/mod_stock/produkt_edit_sidebar.phtml	(revision 5889)
+++ /views/mods/mod_stock/produkt_edit_sidebar.phtml	(revision 5890)
@@ -12,5 +12,5 @@
 <?php /* Mailbenachrichtigung beim Erreichen des Minimalbestandes des Produktes */ ?>
 <?php if ($this->get_option('wpsg_mod_stock_minstockproduct') == '1') { ?>
-<?php echo wpsg_drawForum_Input('wpsg_mod_minstockproduct', __('Mindestlagerbestand', 'wpsg'), wpsg_getStr($this->view['data']['minstockproduct_count'])); ?>
-<?php echo wpsg_drawForum_Input('wpsg_mod_stock_minstockproduct_mail', __('Benachrichtigung an', 'wpsg'), wpsg_getStr($this->view['data']['minstockproduct_mail'])); ?>	
+<?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_topseller/produkt_addedit_allgemein.phtml
===================================================================
--- /views/mods/mod_topseller/produkt_addedit_allgemein.phtml	(revision 5889)
+++ /views/mods/mod_topseller/produkt_addedit_allgemein.phtml	(revision 5890)
@@ -9,5 +9,5 @@
 	<div class="panel-heading clearfix">
 		<h3 class="panel-title">
-			<?php echo __('Topseller', 'wpsg'); ?> </span>
+			<span><?php echo __('Topseller', 'wpsg'); ?></span>
 		</h3>
 	</div>
Index: /views/produkt/addedit_price.phtml
===================================================================
--- /views/produkt/addedit_price.phtml	(revision 5889)
+++ /views/produkt/addedit_price.phtml	(revision 5890)
@@ -1,2 +1,10 @@
+<?php
+
+	/**
+	 * Template fÃŒr die Integration der Preiseinstellungen in die Produktverwaltung
+	 */
+
+?>
+
 <?php echo wpsg_drawForm_AdminboxStart(__('Preis / Steuer', 'wpsg')); ?>
 	<?php echo wpsg_drawForm_Select('mwst_key', __('Steuergruppe', 'wpsg'), wpsg_tax_groups(true), @$this->view['data']['mwst_key']); ?>								
@@ -7,3 +15,2 @@
 	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender"><span class="glyphicon glyphicon-globe wpsg-glyphicon"></span><?php echo __('LÀnderverwaltung', 'wpsg'); ?></a>
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>
-				
Index: /views/produkt/addedit_stock.phtml
===================================================================
--- /views/produkt/addedit_stock.phtml	(revision 5890)
+++ /views/produkt/addedit_stock.phtml	(revision 5890)
@@ -0,0 +1,25 @@
+<?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 } ?>
+