Index: /controller/wpsg_OrderController.class.php
===================================================================
--- /controller/wpsg_OrderController.class.php	(revision 8266)
+++ /controller/wpsg_OrderController.class.php	(revision 8267)
@@ -1697,13 +1697,5 @@
 						}
 						else
-						{
-
-                            
-							// wpsg_debug($arIDs);
-							// wpsg_debug(implode('_', $arIDs));
-							// wpsg_debug(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&noheader=1&do=writeMultiRechnung&ids='.implode('_', $arIDs));
-							// die();
-                            // http://127.0.0.1/wp-admin/admin.php?page=wpsg-Order&noheader=1&wpsg_action=showRechnung&ids=12159_12160
-						
+						{	
 
                             $this->addBackendMessage(
Index: /views/mods/mod_rechnungen/order_view_orderdata_after.phtml
===================================================================
--- /views/mods/mod_rechnungen/order_view_orderdata_after.phtml	(revision 8266)
+++ /views/mods/mod_rechnungen/order_view_orderdata_after.phtml	(revision 8267)
@@ -208,5 +208,5 @@
                                     window.setTimeout(function() { location.href = '<?php
 
-                                        echo wpsg_admin_url('Order', 'view', ['edit_id' => $oOrder->getId()]);
+                                        echo wpsg_admin_url('Order', 'view', ['edit_id' => $oOrder->getId()], [], true);
                                     
                                     ?>'; }, 1000);
@@ -338,5 +338,5 @@
                                     window.setTimeout(function() { location.href = '<?php 
                         
-                                        echo wpsg_admin_url('Order', 'view', ['edit_id' => $oOrder->getId()]);
+                                        echo wpsg_admin_url('Order', 'view', ['edit_id' => $oOrder->getId()], [], true);
                                     
                                     ?>'; }, 1000);
Index: /views/order/product_table.phtml
===================================================================
--- /views/order/product_table.phtml	(revision 8266)
+++ /views/order/product_table.phtml	(revision 8267)
@@ -179,5 +179,4 @@
 				<?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 (($arCalculation['shipping'][0]['brutto'] === $arCalculation['shipping'][0]['netto'])?wpsg_ff(0, '%'):$arTaxShort[$arCalculation['shipping'][0]['tax_key']]); ?></td> 
 				
@@ -208,5 +207,4 @@
 				<?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 (($arCalculation['payment'][0]['brutto'] === $arCalculation['payment'][0]['netto'])?wpsg_ff(0, '%'):$arTaxShort[$arCalculation['payment'][0]['tax_key']]); ?></td>