Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 5566)
+++ /controller/wpsg_ShopController.class.php	(revision 5571)
@@ -1397,5 +1397,6 @@
 				
 			}
-			
+
+			$produkt['product_id'] = $this->getProduktID($produkt_id);
 			$produkt['mwst_value'] = $this->getCalcTaxValue($produkt['mwst_key']); 
 			
@@ -3482,7 +3483,9 @@
 		 * Wird aufgerufen wenn ein Fehler im Shop aufgetreten ist
 		 */
-		public function throwErrorCode($code)
-		{
-			
+		public function throwErrorCode($code, $arDebugOut = array())
+		{
+
+			if (wpsg_isSizedArray($arDebugOut)) wpsg_debug($arDebugOut);
+
 			die(wpsg_translate(__('Systemfehler! Fehlercode:#1#', 'wpsg'), $code));
 			
Index: /model/wpsg_product.class.php
===================================================================
--- /model/wpsg_product.class.php	(revision 5566)
+++ /model/wpsg_product.class.php	(revision 5571)
@@ -6,5 +6,10 @@
 	class wpsg_product extends wpsg_model
 	{
-		
+
+		const MULTIPLE_ONE_MULTI = 0; // Nur einmal mit beliebiger Menge (Standard)
+		const MULTIPLE_ONE_ONE = 4; // Nur einmal mit Menge 1
+		const MULTIPLE_MULTI_MULTI = 1; // Mehrfach mit beliebiger Menge
+		const MULTIPLE_MULTI_ONE = 2; // Mehrfach mit Menge 1
+
 		/**
 		 * LÀdt die Daten des Produkts
@@ -41,5 +46,5 @@
 			}
 			
-			if ($this->data['id'] != $product_id) $this->shop->throwErrorCode('100_5');
+			if ($this->data['id'] != $product_id) $this->shop->throwErrorCode('100_5', array('Gesuchte ID:'.$product_id, 'Gefundene ID:'.$this->data['id']));
 			
 			return true;
@@ -214,10 +219,10 @@
 		 * Gibt den Alten Preis fÃŒr das Frontend zurÃŒck
 		 */
-		public function getOldPrice()
-		{
-		
+		public function getOldPrice($taxView = false)
+		{
+
 			$oldprice = wpsg_tf($this->oldprice);
-			
-			if ($oldprice > 0) return $oldprice;
+
+			if ($oldprice > 0) return $this->calculateTaxViewPrice($oldprice, $taxView);
 			else return false;
 			
@@ -234,9 +239,9 @@
 		 * Gibt den Preis fÃŒr das Frontend zurÃŒck
 		 */
-		public function getPrice()
-		{
-			
-			return wpsg_tf($this->preis);
-			
+		public function getPrice($taxView = false)
+		{
+
+			return $this->calculateTaxViewPrice($this->preis, $taxView);
+
 		}
 		
@@ -317,4 +322,37 @@
 			
 		} // public function getAllowedShipping()
+
+		/* Private Funktionen */
+
+		private function calculateTaxViewPrice($price, $taxView)
+		{
+
+			if ($this->shop->getBackendTaxview() === WPSG_NETTO)
+			{
+
+				$price_netto = $price;
+				$price_brutto = wpsg_calculatePreis($price_netto, WPSG_BRUTTO, $this->shop->getCalcTaxValue($this->mwst_key));
+
+			}
+			else
+			{
+
+				$price_brutto = $price;
+				$price_netto = wpsg_calculatePreis($price_brutto, WPSG_NETTO, $this->shop->getCalcTaxValue($this->mwst_key));
+
+			}
+
+			if ($taxView === false)
+			{
+
+				if (is_admin()) $taxView = $this->shop->getBackendTaxview();
+				else $taxView = $this->shop->getFrontendTaxview();
+
+			}
+
+			if ($taxView === WPSG_NETTO) return $price_netto;
+			else return $price_brutto;
+
+		}
 		
 		/* Statische Funktionen */
Index: ews/produkt/_addedit.phtml
===================================================================
--- /views/produkt/_addedit.phtml	(revision 5566)
+++ 	(revision )
@@ -1,199 +1,0 @@
-<?php
-	
-	/**
-	 * Template fÃŒr das Produkt Anlegen/Bearbeiten Formular
-	 * Hier sollten keine Anpassungen vorgenommen werden
-	 */
-
-?>
-
-<div class="wpsg_products wpsg_old_forms" id="wpsg-bs">
-
-	<nav class="navbar navbar-default">
-		<div class="container-fluid">
-			<div class="navbar-header">
-				<a class="navbar-brand" href="#"><?php echo __('wpShopGermany', 'wpsg'); ?></a>
-			</div>
-			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-				<ul class="nav navbar-nav">
-					<li role="presentation" class="<?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt"><?php echo __("ProduktÃŒbersicht", "wpsg"); ?></a></li>
-					<li role="presentation" class="wpsg_showhide_filter active"><a href="#" onclick="return false;"><?php echo __("Produktbearbeitung", "wpsg"); ?></a></li>
-				</ul>
-			</div>
-		</div>
-	</nav>
-
-	<script type="text/javascript">/* <![CDATA[ */
-	
-		wpsg_product_edit_change = new Array();
-		                                            
-		jQuery(document).ready( function() {
-			 
-		    jQuery("#normal-sortables, #side-sortables").sortable({
-				connectWith: ".meta-box-sortables",
-				placeholder: 'wpsg_placeholder',
-				dropOnEmpty: true, 
-				cursor: 'move',
-				grid: [50, 20],
-				handle: '.wpsg_handlediv',
-				forceHelperSize: true,
-				forcePlaceholderSize: true,
-				opacity: 0.8,
-				stop: function(e,ui) {
-	
-					var ser = jQuery("#normal-sortables").sortable("serialize");				
-					ser = ser.replace(/\&wpsg\[\]\=/g, ',').replace(/wpsg\[\]\=/g, '');
-	
-					jQuery.cookie('wpsg_product_view_normal', ser);
-	
-					var ser = jQuery("#side-sortables").sortable("serialize");								
-					ser = ser.replace(/\&wpsg\[\]\=/g, ',').replace(/wpsg\[\]\=/g, '');
-					
-					jQuery.cookie('wpsg_product_view_side', ser);
-					
-				},
-				receive: function(e, ui) {
-				}
-			}); 
-	
-		    if (jQuery.cookie('wpsg_product_view_normal') != null)
-			{
-	
-				var divs = jQuery.cookie('wpsg_product_view_normal').split(',').reverse();
-	
-				for (index in divs)
-				{
-	
-					jQuery('#normal-sortables').prepend(jQuery('#wpsg_' + divs[index]));
-					
-				}
-				
-			}
-	
-			if (jQuery.cookie('wpsg_product_view_side') != null)
-			{
-	
-				var divs = jQuery.cookie('wpsg_product_view_side').split(',').reverse();
-	
-				for (index in divs)
-				{
-	
-					jQuery('#side-sortables').prepend(jQuery('#wpsg_' + divs[index]));
-					
-				}
-				
-			}
-	
-			var click_x = false;
-			var click_y = false;
-			
-			jQuery('.wpsg_handlediv').bind('click', function(ev) {
-	
-				if (Math.abs(click_x - ev.pageX) <= 5 && Math.abs(click_y - ev.pageY) <= 5)
-				{
-	
-					jQuery(this).next().toggle();
-	
-					var arClose = new Array();
-					jQuery('.wpsg_product_view .postbox .inside:hidden').each(function() {
-						arClose.push(jQuery(this).parent().attr("id"));
-					} );
-	
-					jQuery.cookie('wpsg_product_closed', arClose.join(','));
-						
-				}
-				
-			} );
-			
-			jQuery('.wpsg_handlediv').bind('mousedown', function(ev) {
-	
-				click_x = ev.pageX;
-				click_y = ev.pageY;	
-							
-			} );
-	
-			if (jQuery.cookie('wpsg_product_closed') != null && jQuery.cookie('wpsg_product_closed') != '')
-			{
-	
-				var arClose = jQuery.cookie('wpsg_product_closed').split(',');
-	
-				for (index in arClose)
-				{
-	
-					jQuery('#' + arClose[index] + ' .inside').hide();
-								
-				}
-				
-			}
-	
-			jQuery('#submit, #submit_index').bind('click', function() {
-	
-				if (wpsg_product_edit_change.length > 0)
-				{
-	
-					jQuery('.wpsg_change_error').removeClass('wpsg_change_error');
-					
-				    for (var i = 0; i < wpsg_product_edit_change.length; i++) {
-				    	 
-				        jQuery('#' + wpsg_product_edit_change[i]).addClass('wpsg_change_error');
-				        
-				    }
-	
-				    alert('<?php echo __('Bitte ÃŒberprÃŒfen Sie die rot markierten Felder. Änderungen in diesen Feldern gehen beim Speichern verloren.', 'wpsg'); ?>');
-	
-				    return false;
-					
-				}
-				else
-				{
-	
-					return true;
-					
-				}
-				
-			} );
-			
-			// Flaggen fÃŒr die aktuelle Sprache davorbauen
-			<?php if ($this->isMultiLingual() && isset($_REQUEST['wpsg_lang'])) { $arLang = $this->getStoreLanguages(); $lang = $arLang[$_REQUEST['wpsg_lang']]; ?>
-			jQuery('.wpsg_handlediv').prepend('<img src="<?php echo $this->getFlagURL().$lang['flag']; ?>" alt="<?php echo $lang['name']; ?>" />&nbsp;');
-			<?php } ?>
-		    
-		} );
-	             
-	/* ]]> */</script> 
-	
-	<?php echo $this->writeBackendMessage(); ?>
-	
-	<div class="wrap columns-2 wpsg_produkt_addedit wpsg_product_view" id="wpsg_product_view">
-		
-		<div id="wpsg_relatedproducts_produktauswahl"></div>
-			
-	 	<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&amp;action=save&amp;noheader=1" enctype="multipart/form-data">
-	
-			<div id="postbox" class="metabox-holder has-right-sidebar" style="padding-top:0px;">
-	
-				<div id="side-info-column" class="inner-sidebar" style="width:386px;">
-					<div id="side-sortables" class="meta-box-sortables ui-sortable" style="width:380px;">
-																			
-						<?php $this->callMods('produkt_edit_sidebar', array(&$this->view['data'])); ?>
-						 
-					</div>
-				</div>
-			
-				<div id="post-body">
-							
-					<div id="normal-sortables" class="meta-box-sortables" style="margin-right:400px;">
-							  
-				
-						<?php $this->callMods('produkt_edit_content', array(&$this->view['data'])); ?>
-					
-					</div>
-							  
-				</div>
-		
-			</div>
-		
-		</form>
-		
-	</div> 
-</div>