Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 8066)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 8067)
@@ -1423,6 +1423,7 @@
 			
 			//die(wpsg_debug($oCalculation->getCalculationArray()));
-			
+						
 			$this->shop->view['basket'] = [
+				'noMwSt' => (($oCalculationOrder->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_B2B)?'1':'0'),
 				'arCalculation' => $oCalculation->getCalculationArray(),
 				'produkte' => $arProduct,
@@ -1433,5 +1434,11 @@
 				'mwst' => []
 			];
-			 			
+			
+			if ($oCalculation->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_B2B) {
+			
+				$this->shop->view['basket']['arCalculation']['tax'][$this->shop->view['basket']['arCalculation']['shipping'][0]['tax_key']]['tax_value'] = 0;
+				
+			}
+			
 			// Die Templates brauchen es leider noch etwas anders
 			foreach ($this->shop->view['basket']['arCalculation']['tax'] as $tax_key => $tax) {
Index: /mods/wpsg_mod_versandarten.class.php
===================================================================
--- /mods/wpsg_mod_versandarten.class.php	(revision 8066)
+++ /mods/wpsg_mod_versandarten.class.php	(revision 8067)
@@ -254,4 +254,10 @@
 		public function checkShippingAvailable_pre(&$arShipping) { 
 			
+			foreach ($arShipping as $shipping_key => $shipping_data) {
+				
+				if ($shipping_data['active'] !== '1') unset($arShipping[$shipping_key]);
+				
+			}
+			
 			if (wpsg_isSizedInt($_SESSION['wpsg']['checkout']['shipping_land'])) $land = intval($_SESSION['wpsg']['checkout']['shipping_land']);
 			else if (wpsg_isSizedInt($_SESSION['wpsg']['checkout']['land'])) $land = intval($_SESSION['wpsg']['checkout']['land']);