Index: /mods/wpsg_mod_export.class.php
===================================================================
--- /mods/wpsg_mod_export.class.php	(revision 6948)
+++ /mods/wpsg_mod_export.class.php	(revision 6950)
@@ -31,4 +31,5 @@
 		const TYPE_PRODUCT = '2';
 		const TYPE_CUSTOMER = '3';
+		const TYPE_ABO = '4';
 		
 		const ENCODING_UTF8 = '1';
@@ -209,4 +210,11 @@
 						
 					}
+					else if ($profil['export_type'] === self::TYPE_ABO)
+					{
+					
+						if ($profil['format'] == self::FORMAT_CSV) $file = $this->handleExportAboCSV($profil_id, $filter['filter']);
+						else if ($profil['format'] == self::FORMAT_XML) $file = $this->handleExportAboXML($profil_id, $filter['filter']);
+					
+					}
                  
                     $arFiles[] = array(
@@ -671,5 +679,12 @@
 						
 					}
-                    
+					else if ($profil['export_type'] == self::TYPE_ABO)
+					{
+					
+						if ($profil['format'] == self::FORMAT_CSV) $file = $this->handleExportAboCSV($profil['id'], $arFilter);
+						else if ($profil['format'] == self::FORMAT_XML) $file = $this->handleExportAboXML($profil['id'], $arFilter);
+					
+					}
+					
                     if (wpsg_remoteconnection::handleConenctionString($profil['cron_path'], $profil['filename'], $file) !== true)
 					{
@@ -896,4 +911,16 @@
 		} // private function handleExportCSV($arProfile, $arOrderFilter = array(), $cron = false)
 
+		/**
+		 * Erstellt die CSV und gibt den Pfad zur erstellten Datei zurÃŒck (FÃŒr einen Aboexport)
+		 * 
+		 * 
+		 */
+		private function handleExportAboCSV() 
+		{
+			
+			//TODO
+			
+		}
+		
 		/**
 		 * Erstellt die CSV und gibt den Pfad zur erstellten Datei zurÃŒck (FÃŒr einen Kundenexport)
@@ -1440,5 +1467,6 @@
 						'produkt_fmenge' => __('FÃŒllmenge', 'wpsg'),
 						'produkt_beschreibung' => __('Beschreibung', 'wpsg'),
-						'produkt_weight' => __('Gewicht', 'wpsg'),						 
+						'produkt_weight' => __('Gewicht', 'wpsg'),		
+						'produkt_stock' => __('Lagerbestand', 'wpsg'),
 						'produkt_anr' => __('Artikelnummer', 'wpsg'),
 						'produkt_menge' => __('Anzahl', 'wpsg'),
@@ -1469,7 +1497,24 @@
 						'kunde_geb' => __('Geburtsdatum', 'wpsg')					
 					)
-				)
+				),	
 			);
 			
+			// AboProdukte
+			if ($this->shop->hasMod('wpsg_mod_abo'))
+			{
+				
+				$this->field[12] = array(
+					'name' => __('Abo', 'wpsg'),
+					'fields' => array(
+						'startdate' => __('Abobeginn', 'wpsg'),
+						'enddate' => __('Aboende', 'wpsg'), 
+						'runtime' => __('Laufzeit', 'wpsg')
+					)	
+						
+				);
+				
+			}
+			
+			// Rechnungen
 			if ($this->shop->hasMod('wpsg_mod_rechnungen'))
 			{
@@ -1987,4 +2032,5 @@
 				case 'produkt_beschreibung': $return = $produkt['beschreibung']; break;
 				case 'produkt_weight': $return = $produkt['weight']; break;
+				case 'produkt_stock': $return = $produkt['stock']; break;
 				case 'produkt_anr': $return = $produkt['anr']; break;
 				case 'produkt_menge': $return = $produkt['menge']; break;
Index: /mods/wpsg_mod_stock.class.php
===================================================================
--- /mods/wpsg_mod_stock.class.php	(revision 6948)
+++ /mods/wpsg_mod_stock.class.php	(revision 6950)
@@ -706,4 +706,40 @@
 
 		/**
+		 * Export der Daten als CSV
+		 * {@inheritDoc}
+		 * @see wpsg_mod_basic::wpsg_mod_export_loadFields()
+		 */
+		public function wpsg_mod_export_loadFields(&$arFields)
+		{
+			
+			$arFields[20]['fields']['mod_stock_stock'] = __('Lagerbestand', 'wpsg');
+			
+		}
+		
+		/*
+		public function wpsg_mod_export_getValue(&$return, $field_value, $o_id, $p_id, $productkey, $product_index, $profil_separator)
+		{
+			$arOrder = $this->shop->cache->loadOrder($o_id);
+			$value = "";
+			
+			if ($field_value == 'mod_creditcard_typ')
+			{
+				$value = $arOrder['mod_creditcard_typ'];
+			}
+			
+			else 
+				
+			{
+				
+				$key = $this->shop->get_option("wpsg_mod_stock");
+				$return = $value;
+				
+			}
+			
+			
+		}
+		*/
+		
+		/**
 		 * Sendet eine Mail bei erreichen des Mindestbestandes
 		 */
Index: /views/css/admin.css
===================================================================
--- /views/css/admin.css	(revision 6948)
+++ /views/css/admin.css	(revision 6950)
@@ -105,4 +105,6 @@
 .wpsgitrecht_table td select { float:left; }
 
+/* Datepicker */
+#ui-datepicker-div { z-index:3 !important; }
 
 /* Kundenkontakt */
Index: /views/produkttemplates/standard.phtml
===================================================================
--- /views/produkttemplates/standard.phtml	(revision 6948)
+++ /views/produkttemplates/standard.phtml	(revision 6950)
@@ -173,19 +173,19 @@
 			<?php /* Produkt nur im Store, nicht im Onlineshop vorhanden */ ?>
 			<?php if ($this->callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) { ?>
-
+	
 				<div class="wpsg_product_only_store"><?php echo __($this->callMod('wpsg_mod_deliverytime', 'displayStoreText', array($this->view['data']['product_key']))); ?></div>
-
+	
 				<?php $stl = 0; $stl = $this->callMod('wpsg_mod_deliverytime', 'displayStoreLink', array($this->view['data']['product_key'])) ?>
 				<?php if (wpsg_isSizedInt($stl)) { ?>
-				
+					
 					&nbsp;<a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>
-				
+					
 				<?php } ?>
-
+	
 			<?php } else { ?>				
-
+	
 				<?php $strDelayNote = $this->callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?>
 				<?php if (wpsg_isSizedString($strDelayNote)) { ?>
-					
+						
 					<div class="wpsg_mod_deliverytime_offline">
 					
@@ -193,14 +193,14 @@
 					
 					</div>
-					
+						
 				<?php } else { ?>
-			
+				
 				<div class="wpsg_mod_deliverytime">
 					<span class="label label_deliverytime"><?php echo wpsg_translate(__('Lieferzeit:', 'wpsg')); ?></span>
 					<?php echo $this->callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?>
 				</div>	
-					
+						
 				<?php } ?>
-
+	
 			<?php } ?>
 			
@@ -240,6 +240,17 @@
 
 					<input type="text" value="<?php echo ((wpsg_isSizedInt($this->view['data']['menge']))?$this->view['data']['menge']:'1'); ?>" name="wpsg[menge]" class="wpsg_menge" id="wpsg_menge_<?php echo $this->getTemplateIndex(); ?>" <?php echo (($this->view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> />
-					<input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />
-
+					
+					<?php /* Urlaubsmodus aktiv */ ?>
+					<?php if ($this->hasMod('wpsg_mod_deliverytime') && ($this->get_option('wpsg_mod_deliverytime_holiday') == '1')) { ?>
+						
+						<div class="wpsg_product_deliverytime_holiday"><?php echo __($this->callMod('wpsg_mod_deliverytime', 'holidayText', array($this->view['data']['product_key']))); ?></div>
+						
+
+					<?php } else {?>
+					
+						<input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />
+					
+					<?php } ?>
+					
 					<?php if (in_array($this->get_option('wpsg_afterinsert'), array('2', '3'))) { ?>
 					<script type="text/javascript">