Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 6116)
+++ /controller/wpsg_ShopController.class.php	(revision 6117)
@@ -1138,5 +1138,5 @@
 
 			$this->callMods('renderProdukt_templateSelect', array(&$this->view['data'], &$template_file));
-			
+
 			// Das Template im UserView suchen
 			$template_file_uv = str_replace(WPSG_PATH_PRODUKTTEMPLATES, WPSG_PATH_PRODUKTTEMPLATES_UV, $template_file);
@@ -1289,5 +1289,5 @@
 				else
 				{
-				
+				 
 					return $this->renderProdukt($atts['product'], $template);
 						
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 6116)
+++ /lib/wpsg_basket.class.php	(revision 6117)
@@ -822,6 +822,7 @@
 				
 				// Rabatt und Gutschein netto und brutto speichern
-				$data['price_rabatt_netto'] = $arBasket['sum']['preis_rabatt_netto'];
-				$data['price_rabatt_brutto'] = $arBasket['sum']['preis_rabatt_brutto'];
+				$data['price_rabatt_netto'] = wpsg_getFloat($arBasket['sum']['preis_rabatt_netto']);
+				$data['price_rabatt_brutto'] = wpsg_getFloat($arBasket['sum']['preis_rabatt_brutto']);
+				
 				if (isset($arBasket['sum']['gs']))
 				{
Index: /mods/wpsg_mod_stock.class.php
===================================================================
--- /mods/wpsg_mod_stock.class.php	(revision 6116)
+++ /mods/wpsg_mod_stock.class.php	(revision 6117)
@@ -28,9 +28,4 @@
 		{
 
-			if ($this->shop->get_option('wpsg_mod_stock_template') === false || $this->shop->get_option('wpsg_mod_stock_template') == '')
-			{
-				$this->shop->update_option('wpsg_mod_stock_template', 'ausverkauft.phtml');
-			}
-						
 			$this->shop->checkDefault('wpsg_mod_stock_showBackendStock', '1');
 			
@@ -65,5 +60,4 @@
 						
 			$this->shop->update_option('wpsg_mod_stock_template', $_REQUEST['wpsg_mod_stock_template']);
-			$this->shop->update_option('wpsg_mod_stock_notemplateswitch', $_REQUEST['wpsg_mod_stock_notemplateswitch']);			
 			$this->shop->update_option('wpsg_mod_stock_allow', $_REQUEST['wpsg_mod_stock_allow']);
 			$this->shop->update_option('wpsg_mod_stock_showBackendStock', $_REQUEST['wpsg_mod_stock_showBackendStock']);
@@ -153,19 +147,5 @@
 			
 		} // public function produkt_edit_sidebar(&$produkt_data)
-
-		public function renderProdukt_templateSelect(&$produkt_data, &$template_file) 
-		{ 
-			
-			if ($this->shop->get_option('wpsg_mod_stock_notemplateswitch') == '1') return;
-			 
-			if ($this->checkBestand($produkt_data['id'], '1') === false && $this->shop->get_option('wpsg_mod_stock_template') != '-1')
-			{
-				
-				$template_file = WPSG_PATH_PRODUKTTEMPLATES.$this->shop->get_option('wpsg_mod_stock_template');
-				
-			}
-			
-		} // public function renderProdukt_templateSelect(&$produkt_data, &$template_file)
-		
+ 
 		public function setOrderStatus($order_id, $status_id, $inform)
 		{
Index: /mods/wpsg_mod_userpayment.class.php
===================================================================
--- /mods/wpsg_mod_userpayment.class.php	(revision 6116)
+++ /mods/wpsg_mod_userpayment.class.php	(revision 6117)
@@ -245,5 +245,5 @@
 				$payment_price = $this->getPreis($zv['rabgeb'], $arBasket['sum']['preis']);
 				
-				if ($va['mwst_akt'] != '1' && $arBasket['noMwSt'])
+				if ($arBasket['noMwSt'])
 				{
 					
Index: /views/mods/mod_stock/settings_edit.phtml
===================================================================
--- /views/mods/mod_stock/settings_edit.phtml	(revision 6116)
+++ /views/mods/mod_stock/settings_edit.phtml	(revision 6117)
@@ -6,11 +6,5 @@
 
 ?>
-<?php 
-	$arTemp = wpsg_array_merge(array('-1' => __('Wie Produkttemplate', 'wpsg')), $this->view['arTemplates']);
-?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_stock_template', __('Template fÃŒr ausverkaufte Produkte', 'wpsg'), 
-		$arTemp, @$this->get_option('wpsg_mod_stock_template')); ?>
 
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_stock_notemplateswitch', __('Template nicht wechseln', 'wpsg'), $this->get_option('wpsg_mod_stock_notemplateswitch'), array('help' => 'wpsg_mod_stock_notemplateswitch')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_stock_allow', __('Bestellungen bei negativen Bestand verhindern', 'wpsg'), $this->get_option('wpsg_mod_stock_allow'), array('help' => 'wpsg_mod_stock_allow')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_stock_showBackendStock', __('Bestand in ProduktÃŒbersicht (Backend) anzeigen', 'wpsg'), $this->get_option('wpsg_mod_stock_showBackendStock'), array('help' => 'wpsg_mod_stock_showBackendStock')); ?>
@@ -23,27 +17,3 @@
 
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_stock_minstockproduct',  __('Minimalbestand im Produkt hinterlegen', 'wpsg'), $this->get_option('wpsg_mod_stock_minstockproduct'), array('help' => 'wpsg_mod_stock_minstockproduct')); ?>
-
-<script type="text/javascript">/* <![CDATA[ */
-
-	jQuery(document).ready(function() {
-
-		jQuery('#wpsg_mod_stock_notemplateswitch').bind('change', function() {
-
-			if (jQuery(this).attr("checked"))
-			{
-
-				jQuery('#wpsg_mod_stock_template').attr('disabled', true);
-				
-			}
-			else
-			{
-
-				jQuery('#wpsg_mod_stock_template').attr('disabled', false);
-
-			}
-			
-		} ).change();
-		
-	} );
-
-/* ]]> */</script>
+ 
Index: ews/produkttemplates/ausverkauft.phtml
===================================================================
--- /views/produkttemplates/ausverkauft.phtml	(revision 6116)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?php
-
-	/*
-	 * Template fÃŒr das Produkt im Frontend
-	 */
-
-	//Ausgabe der verfÃŒgbaren Variablen
-	//wpsg_debug($_SESSION);
-	//wpsg_debug($this->view['data']['stock']);
-
-	// Damit keine Zubehörprodukte ausgegeben werden
-	//$this->noReleatedProducts = true; 
-
-?>
-<div class="wpsg_produkt_wrapper">
-	<div itemscope itemtype="http://schema.org/Product" class="wpsg_produkt wpsg_produkt_<?php echo $this->view['data']['id']; ?>">
-	
-		<?php /* Block fÃŒr die Produktbilder START */ ?>
-		<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?>	
-		<div class="wpsg_produkt_produktbilder">
-						<?php 
-						$pbw = $this->get_option('wpsg_mod_produktbilder_width');
-						$pbh = $this->get_option('wpsg_mod_produktbilder_height');
-						$pbm = $this->get_option('wpsg_mod_produktbilder_mode');
-						$pbArr = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['data']['id']));
-						?>
-						<?php if (sizeof($pbArr)) { ?>
-						<?php $i = 0; foreach ($pbArr as $b) { $i++; ?>
-						<?php if ($i == 1 && !wpsg_isSizedString($this->view['data']['varianten_image']) || $b['basename'] == $this->view['data']['varianten_image']) { ?>
-						<div class="wpsg_produkt_preview wpsg_pb_pic">
-							<?php 
-							$href = wp_get_attachment_image_src($b['post_id'], Array(800, 600));
-							$imgtag = wp_get_attachment_image($b['post_id'], Array($pbw, $pbh));
-							?>	
-							<a class="wpsg_imagelink thickbox" rel="<?php echo $this->view['product_index']; ?>-<?php echo $this->view['data']['id']; ?>" 
-							href="<?php echo $href[0]; ?>"> <?php echo $imgtag; ?>
-							</a>
-						</div>
-						<?php } else { ?>
-						<div class="wpsg_pb_pic" style="display:none;">
-							<?php 
-							$href = wp_get_attachment_image_src($b['post_id'], Array(800, 600));
-							$imgtag = wp_get_attachment_image($b['post_id'], Array($pbw, $pbh));
-							?>	
-							<a class="wpsg_imagelink thickbox" rel="<?php echo $this->view['product_index']; ?>-<?php echo $this->view['data']['id']; ?>" href="<?php echo $href[0]; ?>">
-								<?php echo $imgtag; ?>
-							</a>
-						</div>
-						<?php } ?>
-						<?php } ?>
-						<?php } ?>
-						<div class="wpsg_clear"></div>
-		</div>
-		<?php } ?>
-		<?php /* Block fÃŒr die Produktbilder ENDE */ ?>
-	
-		<div class="wpsg_product_afterimage">
-	
-			<h2 itemprop="name" class="wpsg_producttitle"><?php echo wpsg_hspc($this->view['data']['name']); ?></h2>
-		
-			<?php if ($this->get_option('wpsg_showArticelnumber') == '1') { ?>
-			<div class="wpsg_artikelnummer"> 
-				<?php echo __('Artikelnummer', 'wpsg'); ?>: <span class="wpsg_anr"><?php echo wpsg_hspc($this->view['data']['anr']); ?></span>
-			</div>
-			<?php } ?>
-		
-			<div itemprop="offers" itemscope itemtype="http://schema.org/Offer" class="wpsg_produkt_preis">
-				<?php echo __('StÃŒckpreis:', 'wpsg'); ?>
-				<meta itemprop="priceCurrency" content="<?php echo $this->get_option('wpsg_currency'); ?>" />
-				<span itemprop="price" class="preis_<?php echo $this->view['data']['id']; ?>" id="preis_<?php echo $this->view['data']['id']; ?>"><?php echo wpsg_ff($this->view['data']['preis']); ?></span> <?php echo $this->get_option('wpsg_currency'); ?><?php if (wpsg_isSizedString($this->view['data']['price_info'])) { echo '<div class="wpsg_priceinfo">'.wpsg_hspc($this->view['data']['price_info']).'</div>'; } ?>
-			</div>		
-			
-			<?php if ($this->get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?>		
-			
-				<div class="wpsg_produkt_preishinweis">
-					<?php echo wpsg_translate(__('#2# zzgl. #1#', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>', '<a href="#kkhint" title="'.wpsg_hspc($this->get_option('wpsg_kleinunternehmer_text')).'">Endpreis</a>'); ?>
-				</div>
-			
-			<?php } else { /* Kleinunternehmerregelung aktiviert ENDE */ ?>	
-	
-				<div class="wpsg_produkt_preishinweis">		
-					<?php if ($this->getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?>
-					<?php echo wpsg_translate(__('(zzgl. #1#% MwSt. und zzgl. #2#)', 'wpsg'), wpsg_ff($this->view['data']['mwst_value']), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>
-					<?php } else { /* Frontend = BRUTTO Preise */ ?>
-					<?php echo wpsg_translate(__('(inkl. #1#% MwSt. und zzgl. #2#)', 'wpsg'), wpsg_ff($this->view['data']['mwst_value']), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>
-					<?php } ?>
-				</div>
-				
-			<?php } ?>
-			
-			<?php /* FÃŒllmengenanzeige START */ ?>
-			<?php if ($this->hasMod('wpsg_mod_fuellmenge')) { ?>
-			
-				<div class="wpsg_produkt_fuellmenge">
-				<?php echo wpsg_translate(__('FÃŒllmenge: #1# (#2# / #3#)', 'wpsg'), 
-					wpsg_ff($this->view['data']['fmenge'], $this->view['data']['feinheit'], true),
-					wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')),
-					wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])
-				); ?>
-				</div>
-			<?php } ?>		
-			<?php /* FÃŒllmengenanzeige ENDE */ ?>
-			
-			<?php /* Gewichtsanzeige START */ ?>
-			<?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?>
-			<div class="wpsg_mod_weight_produkt">
-				<?php echo wpsg_translate(__('Gewicht: #1# #2#', 'wpsg'), '<span id="weight_'.$this->view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'</span>', $this->get_option('wpsg_mod_weight_unit')); ?>
-			</div>
-			<?php } ?>
-			<?php /* Gewichtsanzeige ENDE */ ?>
-			
-			<?php /* Varianten START */ ?>
-			<div class="wpsg_produkt_varianten">
-			<?php echo $this->callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['id'])); ?>
-			</div>
-			<?php /* Varianten ENDE */ ?>
-										
-			<div class="wpsg_produkt_soldout">	
-			<?php echo __('Produkt ausverkauft', 'wpsg'); ?>				
-			</div>
-			
-			<div class="wpsg_clear"></div>
-					 	
-			<?php /* Facebook und Co Integration aus dem Produktartikel Modul */ ?>
-			<?php echo $this->callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?>
-			<?php /* Facebook und Co Integration ENDE */ ?>
-			
-		</div> 
-		
-	</div>
-	
-	<?php if (strlen(trim($this->view['data']['beschreibung'])) > 0) { ?>
-	<div class="wpsg_produkt_additional_information">
-	
-		<div itemprop="description" class="wpsg_produkt_beschreibung">
-			<?php echo $this->view['data']['beschreibung']; ?>
-		</div>
-				
-	</div>
-	<?php } ?>
-	
-	<?php $this->callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-	
-</div>