Index: /views/order/product_table.phtml
===================================================================
--- /views/order/product_table.phtml	(revision 8265)
+++ /views/order/product_table.phtml	(revision 8266)
@@ -178,5 +178,8 @@
 				</td>
 				<?php if (sizeof($arCalculation['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
-				<td><?php echo $arTaxShort[$arCalculation['shipping'][0]['tax_key']]; ?></td>
+
+				<!-- <td><?php // echo $arTaxShort[$arCalculation['shipping'][0]['tax_key']]; ?></td> -->
+				<td><?php echo (($arCalculation['shipping'][0]['brutto'] === $arCalculation['shipping'][0]['netto'])?wpsg_ff(0, '%'):$arTaxShort[$arCalculation['shipping'][0]['tax_key']]); ?></td> 
+				
 				<?php } ?>
 				<td class="wpsg_cell_shipping_value wpsg_cell_gesamtpreis" colspan="2">
@@ -204,5 +207,8 @@
 				</td>
 				<?php if (sizeof($arCalculation['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
-					<td><?php echo $arTaxShort[$arCalculation['payment'][0]['tax_key']]; ?></td>
+
+					<!-- <td><?php // echo $arTaxShort[$arCalculation['payment'][0]['tax_key']]; ?></td> -->
+					<td><?php echo (($arCalculation['payment'][0]['brutto'] === $arCalculation['payment'][0]['netto'])?wpsg_ff(0, '%'):$arTaxShort[$arCalculation['payment'][0]['tax_key']]); ?></td> 
+
 				<?php } ?>
 				<td class="wpsg_cell_payment_value wpsg_cell_gesamtpreis" colspan="2">