Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7502)
+++ /controller/wpsg_ShopController.class.php	(revision 7503)
@@ -313,5 +313,8 @@
 			}
 			if ($this->get_option('wpsg_page_basket') === false) $this->createPage(__('Warenkorb', 'wpsg'), 'wpsg_page_basket', '-1');
-			if ($this->get_option('wpsg_page_basket_more') === false) $this->createPage(__('Weiter shoppen', 'wpsg'), 'wpsg_page_basket_more', '-1');
+			if ($this->get_option('wpsg_currency') === false) $this->update_option('wpsg_currency', 'EUR');
+			if ($this->get_option('wpsg_produkte_perpage') === false) $this->update_option('wpsg_produkte_perpage', '25');
+			if ($this->get_option('wpsg_order_perpage') === false) $this->update_option('wpsg_order_perpage', '25');
+			if ($this->get_option('wpsg_page_basket_more') === false) $this->createPage(__('Weiter shoppen', 'wpsg'), 'wpsg_page_basket_more', '-1');			
 			if ($this->get_option('wpsg_page_versand') === false) $this->createPage(__('Versandkosten', 'wpsg'), 'wpsg_page_versand', '-1');
 			if ($this->get_option('wpsg_page_agb') === false) $this->createPage(__('AGB', 'wpsg'), 'wpsg_page_agb', '-1');
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7502)
+++ /lib/wpsg_calculation.class.php	(revision 7503)
@@ -159,7 +159,11 @@
 	
 		/**
-		 * @param $voucher_set Der Wert aus dem Backend, eventuell mit %
-		 * @param $voucher_bruttonetto WPSG_BRUTTO oder WPSG_NETTO je nach Backend Einstellung
-		 * 
+		 * @param $set
+		 * @param $bruttonetto
+		 * @param $tax_key
+		 * @param int $amount
+		 * @param bool $code
+		 * @param bool $id
+		 * @param int $order_voucher_id
 		 */
 		public function addVoucher($set, $bruttonetto, $tax_key, $amount = 1, $code = false, $id = false, $order_voucher_id = 0) {
@@ -476,5 +480,15 @@
 							$set_netto = $this->arCalculation['sum']['netto'] / 100 * wpsg_tf($set);
 							$set_brutto = $this->arCalculation['sum']['brutto'] / 100 * wpsg_tf($set);
-					
+							
+							if ($this->shop->getBackendTaxview() === WPSG_NETTO) {
+								
+								list($set_netto, $set_brutto) = $this->calculateTaxPart(WPSG_NETTO, $set_netto, $cr['tax_key']);
+								
+							} else {
+								
+								list($set_netto, $set_brutto) = $this->calculateTaxPart(WPSG_BRUTTO, $set_brutto, $cr['tax_key']);
+								
+							}
+							
 						} else {
 							 
@@ -525,5 +539,5 @@
 							 																									
 						}
-											
+						
 						$netto += $set_netto;
 						$brutto += $set_brutto;
@@ -566,5 +580,5 @@
 					$netto *= $cr['amount'];
 					$brutto *= $cr['amount'];
-						 
+						  
 					$this->arCalculation['tax'][$cr['tax_key']]['netto'] += $netto;
 					$this->arCalculation['tax'][$cr['tax_key']]['brutto'] += $brutto;
@@ -701,5 +715,5 @@
                 
             }
-            
+             
             return $this->arCalculation;
 
Index: /lib/wpsg_imagehandler.class.php
===================================================================
--- /lib/wpsg_imagehandler.class.php	(revision 7502)
+++ /lib/wpsg_imagehandler.class.php	(revision 7503)
@@ -82,23 +82,25 @@
 			
 		} // public function addImageToProduct($file, $product_id)
-		
+	
 		/**
 		 * Gibt die IDs der AnhÀnge zurÌck (Alle Bilder eines Produkts)
 		 * Beachtet die Reihenfolge aus der Spalte "postids"
-		 * 
+		 *
 		 * - Alle Bilder anhand des ProduktKeys:
 		 * getAttachmentIDs('pv_1|1:1|2:3');
-		 * 
+		 *
 		 * - Alle gesetzten Bilder einer speziellen Variation (Nur gesetzte in Reihenfolge)
 		 * - Hier darf $product_key nur die ID enthalten
 		 * getAttachmentIDs(1, 2)
-		 * 
+		 *
 		 * - Alle Bilder einer speziellen Variation (In Reihenfolge)
 		 * - Hier darf $product_key nur die ID enthalten
 		 * getAttachmentIDs(1, 2, true)
-		 * 
-		 * 
+		 *
+		 *
 		 * @author Daschmi
 		 * @param String $product_key
+		 * @return array
+		 * @throws \wpsg\Exception
 		 */
 		public function getAttachmentIDs($product_key, $vari_id = false, $all = false)
Index: /mods/mod_gutschein/wpsg_voucher.php
===================================================================
--- /mods/mod_gutschein/wpsg_voucher.php	(revision 7502)
+++ /mods/mod_gutschein/wpsg_voucher.php	(revision 7503)
@@ -87,5 +87,5 @@
 			if (strtotime($this->start_date) > time()) return false;
 			if (strtotime($this->end_date) < time()) return false;
-			if ($this->isMultiUsable() && $this->getUsed() > 0) return false;
+			if (!$this->isMultiUsable() && $this->getUsed() > 0) return false;
 			if ($this->getFreeAmount() <= 0) return false;
 			
Index: /mods/wpsg_mod_gutschein.class.php
===================================================================
--- /mods/wpsg_mod_gutschein.class.php	(revision 7502)
+++ /mods/wpsg_mod_gutschein.class.php	(revision 7503)
@@ -163,6 +163,7 @@
 							
 								if ($gs['calc'] === 'p') $gs['value'] = $gs['value'].'%';
+								else $gs['value'] = $oVoucher->getFreeAmount();
 							
-								$oCalculation->addVoucher($oVoucher->getFreeAmount(), $this->shop->getBackendTaxview(), '0', 1, $gs['code'], $gs['id']);
+								$oCalculation->addVoucher($gs['value'], $this->shop->getBackendTaxview(), '0', 1, $gs['code'], $gs['id']);
 								
 							}
@@ -411,5 +412,5 @@
 					'value' => $oVoucher->__get('value'),
 					'coupon' => $oVoucher->__get('coupon'),
-					'calc' => $oVoucher->__get('calc'),
+					'calc' => $oVoucher->__get('calc_typ'),
 					'start' => date('d.m.Y', strtotime($oVoucher->start_date)),
 					'end' => date('d.m.Y', strtotime($oVoucher->end_date)),
Index: /views/warenkorb/basket.phtml
===================================================================
--- /views/warenkorb/basket.phtml	(revision 7502)
+++ /views/warenkorb/basket.phtml	(revision 7503)
@@ -7,5 +7,5 @@
 	//wpsg_debug($this->view['basket']);
 	//wpsg_debug($this->view['basket']['arCalculation']);
-	wpsg_debug($_SESSION['wpsg']);
+	//wpsg_debug($_SESSION['wpsg']);
 	//wpsg_debug($this->arShipping);