Index: /mods/wpsg_mod_deliverynote.class.php
===================================================================
--- /mods/wpsg_mod_deliverynote.class.php	(revision 6364)
+++ /mods/wpsg_mod_deliverynote.class.php	(revision 6365)
@@ -578,4 +578,6 @@
 			if (trim($this->shop->view['order']['language']) != '') $this->shop->setTempLocale($this->shop->view['order']['language']);
 			
+			$oOrder = wpsg_order::getInstance($order_id);  
+			
 			// Rechnungsadresse		
 			$this->shop->view['data']['id'] = $this->shop->view['customer']['id'];
@@ -588,5 +590,6 @@
 			$this->shop->view['data']['ort'] = $this->shop->view['customer']['ort'];
 			$this->shop->view['data']['land'] = $this->shop->view['customer']['land'];
-						
+			$this->shop->view['data']['land'] = strtoupper($oOrder->getInvoiceCountryName());
+			
 			// Versandadresse ?
 			if ($this->shop->hasMod('wpsg_mod_shippingadress'))
@@ -607,4 +610,5 @@
 					$this->shop->view['data']['ort'] = $adata['ort'];
 					$this->shop->view['data']['land'] = $adata['land'];
+					$this->shop->view['data']['land'] = strtoupper($oOrder->getShippingCountryName());
 					
 				}