Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 8136)
+++ /lib/wpsg_calculation.class.php	(revision 8139)
@@ -733,4 +733,5 @@
 					$this->arCalculation['sum']['netto'] += $netto;
 					$this->arCalculation['sum']['brutto'] += $brutto;
+					
 					$this->arCalculation['sum']['tax'] += $tax;
 						
@@ -880,5 +881,5 @@
             }
 
-			//wpsg_debug($this->arCalculation);
+			//die(wpsg_debug($this->arCalculation));
 			
             return $this->arCalculation;
@@ -1272,5 +1273,5 @@
 			if (strpos($db_order['shipping_set'], '#') !== false) $db_order['shipping_set'] = explode('#', $db_order['shipping_set']);
 
-			// Versand- und Zahlungsart
+			// Versand- und Zahlungsart	        
             $this->addShipping($db_order['shipping_set'],$db_order['shipping_bruttonetto'],$db_order['shipping_tax_key'],$db_order['shipping_key']);
             $this->addPayment($db_order['payment_set'], $db_order['payment_bruttonetto'], $db_order['payment_tax_key'],$db_order['payment_key']);
@@ -1569,12 +1570,16 @@
 							
 							$netto = $val * $tax['part'];
+							
+							$brutto = $netto;
 							$brutto =  $netto * (1 + $this->arCalculation['tax'][$tax_key2]['tax_value'] / 100);
 														
 						} else {
 							
-							$brutto = $val * $tax['part'];
+							$brutto = $val * $tax['part']; 
 							$netto = $brutto / (1 + $this->arCalculation['tax'][$tax_key2]['tax_value'] / 100);
 							
 						}
+						
+						if ($this->tax_mode === self::TAXMODE_SMALLBUSINESS) $brutto = $netto;
 						
 						//wpsg_debug($sum_netto.'('.$sum_brutto.')'.":".$val);
@@ -1587,5 +1592,5 @@
 						
 						if ($tax_key !== $tax_key2 && !$noTax) {
-						
+							
 							$this->arCalculation['tax'][$tax_key2]['netto'] += $netto;
 							$this->arCalculation['tax'][$tax_key2]['brutto'] += $brutto;
Index: /views/order/product_table.phtml
===================================================================
--- /views/order/product_table.phtml	(revision 8136)
+++ /views/order/product_table.phtml	(revision 8139)
@@ -304,18 +304,25 @@
 				</td>
 			</tr>			
-			<?php foreach ($arCalculation['tax'] as $tax) { if ($tax['sum'] > 0 && $tax['key'] != '0') { ?>
-				<tr class="wpsg_row_mwst wpsg_row_small">
-					<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">
-						<?php if ($this->get_option('wpsg_kleinunternehmer') == '1') { ?>
-							<?php echo $this->get_option('wpsg_kleinunternehmer_text'); ?>
-						<?php } else { ?>
-							<?php echo wpsg_translate(__('darin enthaltene MwSt. (#1#)', 'wpsg'), $arTax[$tax['key']]); ?>
-						<?php } ?>
-					</td>
-					<td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis">
-						<?php echo wpsg_ff($tax['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
-					</td>
-				</tr>
-			<?php } } ?>
+            
+            <?php if ($this->get_option('wpsg_kleinunternehmer') == '1') { ?>
+                 <tr class="wpsg_row_mwst wpsg_row_small">
+                    <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis" colspan="<?php echo $this->view['colspan'] + 1; ?>">
+                        <?php echo $this->get_option('wpsg_kleinunternehmer_text'); ?>
+                    </td>
+                 </tr>
+            <?php } else { ?>
+            
+                <?php foreach ($arCalculation['tax'] as $tax) { if ($tax['sum'] > 0 && $tax['key'] != '0') { ?>
+                    <tr class="wpsg_row_mwst wpsg_row_small">
+                        <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">
+                            <?php echo wpsg_translate(__('darin enthaltene MwSt. (#1#)', 'wpsg'), $arTax[$tax['key']]); ?>                           
+                        </td>
+                        <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis">
+                            <?php echo wpsg_ff($tax['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+                        </td>
+                    </tr>
+                <?php } } ?>
+                
+            <?php } ?>
 			
 		<?php } ?>