Index: /lib/install.php
===================================================================
--- /lib/install.php	(revision 7508)
+++ /lib/install.php	(revision 7509)
@@ -178,14 +178,14 @@
    		shop_country_id INT(11) COMMENT 'ID des Landes vom Shop',
    		shop_country_tax INT(1) COMMENT 'MwSt. Grundlage',
-   		shop_country_tax_a INT(1) COMMENT 'Steuersatz A',
-   		shop_country_tax_b INT(1) COMMENT 'Steuersatz B',
-   		shop_country_tax_c INT(1) COMMENT 'Steuersatz C',
-   		shop_country_tax_d INT(1) COMMENT 'Steuersatz D',   		
+   		shop_country_tax_a DOUBLE(10,4) COMMENT 'Steuersatz A',
+   		shop_country_tax_b DOUBLE(10,4) COMMENT 'Steuersatz B',
+   		shop_country_tax_c DOUBLE(10,4) COMMENT 'Steuersatz C',
+   		shop_country_tax_d DOUBLE(10,4) COMMENT 'Steuersatz D',   		
    		target_country_id INT(11) COMMENT 'ID des Landes vom Zie',
    		target_country_tax INT(1) COMMENT 'MwSt. Grundlage',
-   		target_country_tax_a INT(1) COMMENT 'Steuersatz A',
-   		target_country_tax_b INT(1) COMMENT 'Steuersatz B',
-   		target_country_tax_c INT(1) COMMENT 'Steuersatz C',
-   		target_country_tax_d INT(1) COMMENT 'Steuersatz D',
+   		target_country_tax_a DOUBLE(10,4) COMMENT 'Steuersatz A',
+   		target_country_tax_b DOUBLE(10,4) COMMENT 'Steuersatz B',
+   		target_country_tax_c DOUBLE(10,4) COMMENT 'Steuersatz C',
+   		target_country_tax_d DOUBLE(10,4) COMMENT 'Steuersatz D',
    		calculation INT(1) COMMENT '1 wenn die Bestellung mit der neuen Calculation Klasse berechnet wurde',
    		tax_mode INT(1) COMMENT 'Art der Besteuerung Kleinunternehmer/1, Endkunden/2, Firmenkunden/3',
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 7508)
+++ /lib/wpsg_basket.class.php	(revision 7509)
@@ -1703,5 +1703,5 @@
 				
 				if ($p['tax'] == '0') $arReturn['produkte'][$product_index]['mwst_value'] = 0;
-				else $arReturn['produkte'][$product_index]['mwst_value'] = $arCalculation['tax'][$p['tax_key']]['tax_value'];
+				else $arReturn['produkte'][$product_index]['mwst_value'] =  $arCalculation['tax'][$p['tax_key']]['tax_value'];
 				
 			}
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7508)
+++ /lib/wpsg_calculation.class.php	(revision 7509)
@@ -535,4 +535,5 @@
 								 
 								list($set_netto, $set_brutto) = $this->calculateTaxPart(WPSG_BRUTTO, $set_brutto, $cr['tax_key']);
+								
 								//wpsg_debug('2: '.$set_netto.":".$set_brutto);
 							}
@@ -834,8 +835,8 @@
 			$db_data['shop_country_id'] = wpsg_q($oDefaultCountry->id);
 			$db_data['shop_country_tax'] = wpsg_q($oDefaultCountry->mwst);
-			$db_data['shop_country_tax_a'] = wpsg_q($oDefaultCountry->mwst_a);
-			$db_data['shop_country_tax_b'] = wpsg_q($oDefaultCountry->mwst_b);
-			$db_data['shop_country_tax_c'] = wpsg_q($oDefaultCountry->mwst_c);
-			$db_data['shop_country_tax_d'] = wpsg_q($oDefaultCountry->mwst_d);
+			$db_data['shop_country_tax_a'] = wpsg_q(wpsg_tf($oDefaultCountry->mwst_a));
+			$db_data['shop_country_tax_b'] = wpsg_q(wpsg_tf($oDefaultCountry->mwst_b));
+			$db_data['shop_country_tax_c'] = wpsg_q(wpsg_tf($oDefaultCountry->mwst_c));
+			$db_data['shop_country_tax_d'] = wpsg_q(wpsg_tf($oDefaultCountry->mwst_d));
 				
 			$oTargetCountry = \wpsg_country::getInstance($this->getTargetCountryID());
@@ -843,8 +844,8 @@
 			$db_data['target_country_id'] = wpsg_q($oTargetCountry->id);
 			$db_data['target_country_tax'] = wpsg_q($oTargetCountry->mwst);
-			$db_data['target_country_tax_a'] = wpsg_q($oTargetCountry->mwst_a);
-			$db_data['target_country_tax_b'] = wpsg_q($oTargetCountry->mwst_b);
-			$db_data['target_country_tax_c'] = wpsg_q($oTargetCountry->mwst_c);
-			$db_data['target_country_tax_d'] = wpsg_q($oTargetCountry->mwst_d);
+			$db_data['target_country_tax_a'] = wpsg_q(wpsg_tf($oTargetCountry->mwst_a));
+			$db_data['target_country_tax_b'] = wpsg_q(wpsg_tf($oTargetCountry->mwst_b));
+			$db_data['target_country_tax_c'] = wpsg_q(wpsg_tf($oTargetCountry->mwst_c));
+			$db_data['target_country_tax_d'] = wpsg_q(wpsg_tf($oTargetCountry->mwst_d));
 			
 			// Die Hooks verwenden Daten aus $_SESSION, deshalb nur beim Speichern im Frontend
@@ -1085,5 +1086,5 @@
             
 			$this->setTaxMode($db_order['tax_mode']);
-
+ 
             $this->addCountry($db_order['shop_country_id'], $db_order['shop_country_tax'], $db_order['shop_country_tax_a'],$db_order['shop_country_tax_b'], $db_order['shop_country_tax_c'], $db_order['shop_country_tax_d'], true);
 			$this->addCountry($db_order['target_country_id'], $db_order['target_country_tax'], $db_order['target_country_tax_a'],$db_order['target_country_tax_b'], $db_order['target_country_tax_c'], $db_order['target_country_tax_d'], false);
Index: /views/mods/mod_rechnungen/invoice_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 7508)
+++ /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 7509)
@@ -310,6 +310,6 @@
 		//$pdf->Cell((($this->arMwSt == "-1")?102:87), 8, $produkt_text, 0, 0, 'L');
 		
-		if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')
-		{
+		if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') {
+			
 			
 			$pdf->setXY($prod_left + 97, $prod_top + $offset);