Index: /model/wpsg_order.class.php
===================================================================
--- /model/wpsg_order.class.php	(revision 8163)
+++ /model/wpsg_order.class.php	(revision 8164)
@@ -701,7 +701,9 @@
 		 * @return \Integer ID des Landes fÃŒr die Rechnung
 		 */
-		public function getInvoiceCountryID()
-		{
-				
+		public function getInvoiceCountryID() {
+				
+			$target_country_id = intval($this->__get('target_country_id'));
+			if ($target_country_id > 0) return $target_country_id;
+			
 			if ($this->adress_data === false) return $this->customer->getCountryID();
 			else return wpsg_getStr($this->adress_data['land']);
Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 8163)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 8164)
@@ -1348,9 +1348,9 @@
 					$country['c_'.$country['id']],
 					$country['d_'.$country['id']],					
-					$country['default'],
+					$country['default']
 				);
 				
 			}
-			
+						
 			if (intval($_REQUEST['wpsg_rechnungen_discount_voucher_coupon']??0) > 0) {
 				
@@ -1412,5 +1412,5 @@
 			$arProduct = [];
 			
-			$tax_view = WPSG_BRUTTO;
+			$tax_view = WPSG_NETTO;
 			
 			foreach ($_REQUEST['invoice_products'] as $order_product_id => $order_product_info) {
@@ -1501,12 +1501,15 @@
 			
 			//die(wpsg_debug($oCalculation->getCalculationArray()));
-						
+
+			//wpsg_debug($oCalculation->getCalculationArray(true));
+			//wpsg_debug($oCalculationOrder->getCalculationArray(true));die();
+
 			$this->shop->view['basket'] = [
 				'noMwSt' => (($oCalculationOrder->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_B2B)?'1':'0'),
-				'arCalculation' => $oCalculation->getCalculationArray(),
+				'arCalculation' => $oCalculationOrder->getCalculationArray(),
 				'produkte' => $arProduct,
 				'sum' => [
-					'preis_gesamt_netto' => $oCalculation->getSum(WPSG_NETTO),
-					'preis_gesamt_brutto' => $oCalculation->getSum(WPSG_BRUTTO)
+					'preis_gesamt_netto' => $oCalculationOrder->getSum(WPSG_NETTO),
+					'preis_gesamt_brutto' => $oCalculationOrder->getSum(WPSG_BRUTTO)
 				],
 				'mwst' => []
Index: /views/order/view_dev.phtml
===================================================================
--- /views/order/view_dev.phtml	(revision 8163)
+++ /views/order/view_dev.phtml	(revision 8164)
@@ -32,4 +32,22 @@
         </div>
     </div>
+
+    <div class="panel panel-default">
+        <div class="panel-heading" data-toggle="collapse" href="#collapse_calculation" style="cursor:pointer;">
+            <h4 class="panel-title"><?php echo __('Kalkulation (live from Db)', 'wpsg'); ?></h4>
+        </div>
+        <div id="collapse_calculation" class="panel-collapse collapse">
+            <div class="panel-body">
+                <pre><?php
+                
+                    $oCalculaiton = \wpsg\wpsg_calculation::getOrderCalculation($_REQUEST['edit_id'], true);
+                    $arCalculation = $oCalculaiton->getCalculationArray(true);
+                        
+                    wpsg_debug($arCalculation); 
+                    
+                ?></pre>
+            </div>
+        </div>
+    </div>
  
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>