Index: /views/mods/mod_rechnungen/invoice_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 8242)
+++ /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 8243)
@@ -179,6 +179,15 @@
 	AddRechnungPage($this, $pdf);
 
-    if ( ($this->view['oCalculationOrder']->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_B2B && $this->view['oOrder']->isInnerEu()) 
-	|| ($this->view['oCalculationOrder']->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_SMALLBUSINESS) 
+	if ($this->get_option('wpsg_deliverycountrytax') === '1') {
+		$value = false;
+		$kl = $this->view['kunde']['land'];
+		if ( ($kl['mwst_a']) && ($kl['mwst_b']) && ($kl['mwst_c']) && ($kl['mwst_d']) == 0.0000 ) $value = true;
+		$deliverycountrytax = $value;
+	}
+
+    if ( 
+	( ($this->view['oCalculationOrder']->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_B2B) && ( $this->view['oOrder']->isInnerEu() || $deliverycountrytax ) ) 
+	|| 
+	( $this->view['oCalculationOrder']->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_SMALLBUSINESS ) 
 	) $bNoTax = true;
 	else $bNoTax = false;
@@ -651,5 +660,5 @@
 			$offset += 5;
 
-			if ( !(($this->view['oOrder']->isInnerEu()) && ($this->view['oCalculationOrder']->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_B2B)) ) {
+			if ( !(($this->view['oOrder']->isInnerEu() || $deliverycountrytax) && ($this->view['oCalculationOrder']->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_B2B)) ) {
 
 				if (sizeof($this->view['basket']['arCalculation']['tax']) >= 1)