Index: /views/mods/mod_rechnungen/invoice_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 8186)
+++ /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 8189)
@@ -7,5 +7,4 @@
 	require_once WPSG_PATH_LIB.'FPDF_1.81/fpdf.php';
 	require_once WPSG_PATH_LIB.'FPDI_2.2.0/autoload.php';
-	 
 	require_once WPSG_PATH_LIB.'wpsg_fpdf.class.php';
 	
@@ -37,10 +36,5 @@
 	
 	// Damit die Steuer bei der Kleinunternehmerregelung nicht angezeigt wird leer ich den Array sicherheitshalber
-	if ( ($this->get_option('wpsg_kleinunternehmer') == '1') || ($this->view['oCalculationOrder']->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_SMALLBUSINESS) )
-	{
-		
-		unset($this->view['basket']['mwst']);
-		
-	}
+	if ( ($this->get_option('wpsg_kleinunternehmer') == '1') || ($this->view['oCalculationOrder']->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_SMALLBUSINESS) ) unset($this->view['basket']['mwst']);
 	
 	if (!function_exists('AddRechnungPage'))
@@ -113,6 +107,6 @@
 			$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')
-				$pdf->Text($adress_left, $adress_top + 20, strtoupper($shop->view['oOrder']->getInvoiceCountryName()));
+
+			if ($shop->get_option("wpsg_mod_rechnungen_hideCountry") == '0') $pdf->Text($adress_left, $adress_top + 20, strtoupper($shop->view['oOrder']->getInvoiceCountryName()));
 			
 			// Rechnungsdaten
@@ -183,10 +177,7 @@
 
     if ( ($this->view['oCalculationOrder']->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_B2B && $this->view['oOrder']->isInnerEu()) 
-		|| ($this->view['oCalculationOrder']->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_SMALLBUSINESS) 
-	) {
-        $bNoTax = true;
-    } else {
-	    $bNoTax = false;
-    }
+	|| ($this->view['oCalculationOrder']->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_SMALLBUSINESS) 
+	) $bNoTax = true;
+	else $bNoTax = false;
 
 	$bTaxCol = false;
@@ -251,26 +242,9 @@
 		$pdf->setXY($prod_left, $prod_top + $offset);
 		
-		if ($this->get_option('wpsg_mod_rechnungen_anr') == '1')
-		{
-			
-			$pdf->Cell(10, 8,  $product->getNr(), 0, 0, 'C');
-			
-		}
-		else
-		{
-			
-			$pdf->Cell(10, 8, $pnr.".", 0, 0, 'C');
-			
-		}
-		
-		if ($this->get_option('wpsg_rechnungen_pdetailname') == '1') {
-
-			$produkt_text = $this->getProductName($this->getProduktID($p['product_id']), true);
-
-		} else {
-
-			$produkt_text = $this->getProductName($this->getProduktID($p['product_id']), false);
-
-		}
+		if ($this->get_option('wpsg_mod_rechnungen_anr') == '1') $pdf->Cell(10, 8, $product->getNr(), 0, 0, 'C');
+		else $pdf->Cell(10, 8, $pnr.".", 0, 0, 'C');
+		
+		if ($this->get_option('wpsg_rechnungen_pdetailname') == '1') $produkt_text = $this->getProductName($this->getProduktID($p['product_id']), true);
+		else $produkt_text = $this->getProductName($this->getProduktID($p['product_id']), false);
 
 		$produktBeschreibung = trim(strip_tags($product->getShortDescription()));
@@ -325,8 +299,5 @@
 		
 		$produkt_text_cell_width = 102;
-		if ($bTaxCol)
-		{
-			$produkt_text_cell_width = 87;
-		}
+		if ($bTaxCol) $produkt_text_cell_width = 87;
 		
 		$produkt_text_width = $pdf->GetStringWidth($produkt_text);
@@ -344,5 +315,5 @@
 
 			$pdf->setXY($prod_left + 97, $prod_top + $offset);
-			$pdf->Cell(15, 8, (($bNoTax)?'0.00 %':wpsg_ff($this->view['basket']['arCalculation']['tax'][$p['tax_key']]['tax_value'], '%')), 0, 0, 'C'); // BUG
+			$pdf->Cell(15, 8, (($bNoTax)?'0.00 %':wpsg_ff($this->view['basket']['arCalculation']['tax'][$p['tax_key']]['tax_value'], '%')), 0, 0, 'C');
 
 		}
@@ -351,13 +322,6 @@
 		$pdf->Cell(15, 8, $p['amount'], 0, 0, 'C');
 		
-		if ( ( wpsg_ShopController::get_option('wpsg_preisangaben') == WPSG_NETTO ) || $bNoTax ) {
-			
-			$preis_single = $p['netto_calculated_single'];
-			
-		} else {
-			
-			$preis_single =  $p['brutto_calculated_single'];
-			
-		}
+		if ( ( wpsg_ShopController::get_option('wpsg_preisangaben') == WPSG_NETTO ) || $bNoTax ) $preis_single = $p['netto_calculated_single'];
+		else $preis_single =  $p['brutto_calculated_single'];
 		
 		$pdf->setXY($prod_left + 127, $prod_top + $offset);
@@ -450,10 +414,5 @@
 		$pdf->Rect($prod_left + 10, $prod_top + $offset, (($bTaxCol)?87:102), $height);
 		
-		if ($bTaxCol)
-		{
-			
-			$pdf->Rect($prod_left + 97, $prod_top + $offset, 15, $height);
-			
-		}
+		if ($bTaxCol) $pdf->Rect($prod_left + 97, $prod_top + $offset, 15, $height);
 		
 		$pdf->Rect($prod_left + 112, $prod_top + $offset, 15, $height);
@@ -466,9 +425,6 @@
 		$count ++;
 		
-		if ($bNoTax) {
-			$price = $p['netto'];
-		} else {
-			$price = $p['brutto'];
-		}
+		if ($bNoTax) $price = $p['netto'];
+		else $price = $p['brutto'];
 
 		$summe += $price * $p['amount'];
@@ -537,16 +493,9 @@
 		{
 
-			if ($this->arShipping[$this->view['data']['type_shipping']]['mwst_null'] == '1' && $bNoTax)
-			{
-
-				$mwst = wpsg_ff(0.00, '%');
-
-			} else {
-				
-				if ($this->view['basket']['arCalculation']['shipping'][0]['tax_key'] === '0') {
-
-					$mwst = _('anteilig');
-					
-				} else {
+			if ($this->arShipping[$this->view['data']['type_shipping']]['mwst_null'] == '1' && $bNoTax) $mwst = wpsg_ff(0.00, '%');
+			else {
+				
+				if ($this->view['basket']['arCalculation']['shipping'][0]['tax_key'] === '0') $mwst = _('anteilig');
+				else {
 
 					$mwst = wpsg_ff($this->view['basket']['arCalculation']['shipping'][0]['tax'], '%');
@@ -645,12 +594,6 @@
 		{
 			
-			if ($bNoTax)
-			{
-				$mwst = wpsg_ff(0.00, '%');
-			}
-			else
-			{
-				$mwst = wpsg_ff($this->view['storno_fee_tax_value'], '%');
-			}
+			if ($bNoTax) $mwst = wpsg_ff(0.00, '%');
+			else $mwst = wpsg_ff($this->view['storno_fee_tax_value'], '%');
 			
 			$pdf->setXY($prod_left + 97, $prod_top + $offset);