Index: /lib/fpdf/fpdi.php
===================================================================
--- /lib/fpdf/fpdi.php	(revision 7321)
+++ /lib/fpdf/fpdi.php	(revision 7322)
@@ -536,12 +536,25 @@
      */
     function _closeParsers() {
-        if ($this->state > 2 && count($this->parsers) > 0) {
-          	foreach ($this->parsers as $k => $_){
-            	$this->parsers[$k]->closeFile();
-            	$this->parsers[$k] = null;
-            	unset($this->parsers[$k]);
-            }
-            return true;
-        }
+    	
+    	$parsers = $this->parsers;
+    	
+    	if (is_array($parsers)) {
+    	
+			if ($this->state > 2 && count($this->parsers) > 0) {
+				
+				foreach ($this->parsers as $k => $_) {
+					
+					$this->parsers[$k]->closeFile();
+					$this->parsers[$k] = null;
+					unset($this->parsers[$k]);
+					
+				}
+				
+				return true;
+				
+			}
+			
+		}
+		
         return false;
     }
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7321)
+++ /lib/wpsg_calculation.class.php	(revision 7322)
@@ -814,4 +814,6 @@
 			foreach ($db_products as $db_p) {
 				
+				if (!wpsg_isSizedString($db_p['productkey'])) $db_p['productkey'] = $db_p['p_id'];
+				
 				$product_data = $this->db->fetchRow("SELECT `euleistungsortregel` FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($db_p['p_id'])."' ");
 				
Index: /lib/wpsg_fpdf.class.php
===================================================================
--- /lib/wpsg_fpdf.class.php	(revision 7321)
+++ /lib/wpsg_fpdf.class.php	(revision 7322)
@@ -188,14 +188,23 @@
 	    function _putextgstates()
 	    {
-	        for ($i = 1; $i <= count($this->extgstates); $i++)
-	        {
-	            $this->_newobj();
-	            $this->extgstates[$i]['n'] = $this->n;
-	            $this->_out('<</Type /ExtGState');
-	            foreach ($this->extgstates[$i]['parms'] as $k=>$v)
-	                $this->_out('/'.$k.' '.$v);
-	            $this->_out('>>');
-	            $this->_out('endobj');
-	        }
+	    	
+	    	$extgstates = $this->extgstates;
+	    	
+	    	if (is_array($extgstates)) {
+	        
+	    		for ($i = 1; $i <= count($this->extgstates); $i++) {
+	    			
+					$this->_newobj();
+					$this->extgstates[$i]['n'] = $this->n;
+					$this->_out('<</Type /ExtGState');
+					foreach ($this->extgstates[$i]['parms'] as $k=>$v)
+						$this->_out('/'.$k.' '.$v);
+					$this->_out('>>');
+					$this->_out('endobj');
+					
+				}
+				
+			}
+				
 	    }
 
Index: /views/mods/mod_rechnungen/invoice_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 7321)
+++ /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 7322)
@@ -106,5 +106,5 @@
 			$pdf->Text($adress_left, $adress_top, $shop->view['kunde']['firma']);
 			$pdf->Text($adress_left, $adress_top + 5, $shop->view['kunde']['vname'].' '.$shop->view['kunde']['name']);
-			$pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.wpsg_getStr($shop->view['kunde']['hausnr']));
+			$pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.wpsg_getStr($shop->view['kunde']['nr']));
 			$pdf->Text($adress_left, $adress_top + 15, $shop->view['kunde']['plz'].' '.$shop->view['kunde']['ort']);
 			if ($shop->get_option("wpsg_mod_rechnungen_hideCountry") == '0')
Index: /views/produkttemplates/standard.phtml
===================================================================
--- /views/produkttemplates/standard.phtml	(revision 7321)
+++ /views/produkttemplates/standard.phtml	(revision 7322)
@@ -89,9 +89,9 @@
 
 				<?php $oldPrice = $this->view['oProduct']->getOldPrice();  ?>
-				<?php if ($oldPrice !== false && $oldPrice != $this->view['oProduct']->getPrice()) { ?>
-					<span class="wpsg_mod_productview_price wpsg_mod_productview_current"><?php echo wpsg_ff($this->view['oProduct']->getPrice(), $this->get_option('wpsg_currency')); ?></span>
+				<?php if ($oldPrice !== false && $oldPrice != $this->view['oProduct']->getPrice($this->view['data']['product_key'])) { ?>
+					<span class="wpsg_mod_productview_price wpsg_mod_productview_current"><?php echo wpsg_ff($this->view['oProduct']->getPrice($this->view['data']['product_key']), $this->get_option('wpsg_currency')); ?></span>
 					<span class="wpsg_mod_productview_oldprice"><?php echo wpsg_ff($oldPrice, $this->get_option('wpsg_currency')); ?></span>
 				<?php } else { ?>
-					<span class="wpsg_mod_productview_price"><?php echo wpsg_ff($this->view['oProduct']->getPrice(), $this->get_option('wpsg_currency')); ?></span>
+					<span class="wpsg_mod_productview_price"><?php echo wpsg_ff($this->view['oProduct']->getPrice($this->view['data']['product_key']), $this->get_option('wpsg_currency')); ?></span>
 				<?php } ?>