Index: /mods/wpsg_mod_deliverytime.class.php
===================================================================
--- /mods/wpsg_mod_deliverytime.class.php	(revision 5890)
+++ /mods/wpsg_mod_deliverytime.class.php	(revision 5891)
@@ -56,4 +56,28 @@
 		} // public function install()
 		
+		public function product_addedit_content(&$product_content, &$product_data)
+		{
+		
+			if (wpsg_isSizedInt($product_data['id']))
+			{
+					
+				$product_data = wpsg_array_merge($product_data, $this->db->fetchRow("
+						SELECT
+							`wpsg_mod_deliverytime_deliverytime`,`wpsg_mod_deliverytime_storeproduct`
+						FROM
+							`".WPSG_TBL_PRODUCTS."`
+						WHERE
+							`id` = '".wpsg_q($product_data['id'])."'
+					"));
+					
+			}
+		
+			$product_data['arDeliverytime'] = explode(',', $this->shop->get_option('wpsg_mod_deliverytime_deliverytime'));
+			$product_data['arStoreproduct'] = explode(',', $this->shop->get_option('wpsg_mod_deliverytime_storeproduct'));
+				
+			$product_content['general']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_deliverytime/produkt_addedit_allgemein.phtml', false);
+		}
+		
+		
 		public function settings_edit()
 		{
Index: /mods/wpsg_mod_minquantity.class.php
===================================================================
--- /mods/wpsg_mod_minquantity.class.php	(revision 5890)
+++ /mods/wpsg_mod_minquantity.class.php	(revision 5891)
@@ -41,4 +41,27 @@
 		} // public function install()
 		
+		public function product_addedit_content(&$product_content, &$product_data)
+		{
+		
+			if (wpsg_isSizedInt($product_data['id']))
+			{
+					
+				$product_data = wpsg_array_merge($product_data, $this->db->fetchRow("
+						SELECT
+							`wpsg_mod_minquantity_value`,`wpsg_mod_minquantity_valuemax`
+						FROM
+							`".WPSG_TBL_PRODUCTS."`
+						WHERE
+							`id` = '".wpsg_q($product_data['id'])."'
+					"));
+					
+			}
+		
+			$product_data['arMinquantity_value'] = explode(',', $this->shop->get_option('wpsg_mod_minquantity_value'));
+			$product_data['arMinquantity_valuemax'] = explode(',', $this->shop->get_option('wpsg_mod_minquantity_valuemax'));
+			
+			$product_content['general']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_minquantity/produkt_addedit_allgemein.phtml', false);
+		}
+		
 		public function settings_edit()
 		{
Index: /mods/wpsg_mod_scaleprice.class.php
===================================================================
--- /mods/wpsg_mod_scaleprice.class.php	(revision 5890)
+++ /mods/wpsg_mod_scaleprice.class.php	(revision 5891)
@@ -69,5 +69,5 @@
 		
 		/*
-		 * zeigt die Saffelpreise im Produktbackend an
+		 * zeigt die Staffelpreise im Produktbackend an
 		*/
 		public function product_addedit_content(&$product_content, &$product_data)
Index: /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
===================================================================
--- /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml	(revision 5891)
+++ /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml	(revision 5891)
@@ -0,0 +1,25 @@
+<?php
+
+	/**
+	 * Integration des Moduls "Lieferzeit" in die Produktverwaltung
+	 */
+
+?>
+
+<div id="wpsg_minquantity" class="panel panel-default"> 
+	<div class="panel-heading clearfix">
+		<h3 class="panel-title">
+			<span><?php echo __('Lieferzeit', 'wpsg'); ?></span>
+		</h3>
+	</div>
+	<div class="panel-body">	
+		<?php if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_SELECT) { ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['arSelection'], $this->view['wpsg_mod_deliverytime']['deliverytime'], array('noIndex' => true)); ?>
+		<?php } else if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['deliverytime'], array('unit' => __('Tage', 'wpsg'))); ?>
+		<?php } ?>
+		<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_store'))) {?>
+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['data']['storeproduct']);?>
+		<?php } ?>
+	</div>
+</div>
Index: /views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml
===================================================================
--- /views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml	(revision 5890)
+++ /views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml	(revision 5891)
@@ -9,5 +9,5 @@
 	<div class="panel-heading clearfix">
 		<h3 class="panel-title">
-			<?php echo __('FÃŒllmenge', 'wpsg'); ?> </span>
+			<span><?php echo __('FÃŒllmenge', 'wpsg'); ?> </span>
 		</h3>
 	</div>
Index: /views/mods/mod_minquantity/produkt_addedit_allgemein.phtml
===================================================================
--- /views/mods/mod_minquantity/produkt_addedit_allgemein.phtml	(revision 5891)
+++ /views/mods/mod_minquantity/produkt_addedit_allgemein.phtml	(revision 5891)
@@ -0,0 +1,27 @@
+<?php
+
+	/**
+	 * Integration des Moduls "Mindestbestellmenge" in die Produktverwaltung
+	 */
+
+?>
+
+<?php
+
+	/**
+	 * Template fÃŒr die Integration des Produktgewichts in die Produktverwaltung
+	 */
+
+?>
+
+<div id="wpsg_minquantity" class="panel panel-default"> 
+	<div class="panel-heading clearfix">
+		<h3 class="panel-title">
+			<span><?php echo __('Mindestbestellmenge', 'wpsg'); ?></span>
+		</h3>
+	</div>
+	<div class="panel-body">	
+		<?php echo wpsg_drawForm_Input('wpsg_mod_minquantity[value]', __('Mindestbestellmenge', 'wpsg'), $this->view['wpsg_mod_minquantity']['value']); ?>
+		<?php echo wpsg_drawForm_Input('wpsg_mod_minquantity[valuemax]', __('Maximalbestellmenge', 'wpsg'), $this->view['wpsg_mod_minquantity']['valuemax']); ?>
+	</div>
+</div>
Index: /views/produkt/addedit_general.phtml
===================================================================
--- /views/produkt/addedit_general.phtml	(revision 5890)
+++ /views/produkt/addedit_general.phtml	(revision 5891)
@@ -56,5 +56,9 @@
 	<?php echo wpsg_drawForm_Select('rating', __('Bewertungspunkte', 'wpsg'), array('0', '1', '2', '3', '4', '5'), wpsg_getInt($this->view['data']['rating'])); ?>
 
-	<?php $this->callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?>	
+	<?php //$this->callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?>	
+	
+	<?php /* Anfrageprodukt */ ?>
+	<?php $this->callMod('wpsg_mod_request', 'produkt_edit_allgemein', array(&$this->view['data']));?>
+
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>