Index: /mods/wpsg_mod_produktbilder.class.php
===================================================================
--- /mods/wpsg_mod_produktbilder.class.php	(revision 6281)
+++ /mods/wpsg_mod_produktbilder.class.php	(revision 6283)
@@ -550,6 +550,7 @@
 							if ($pos1 !== false) {
 								$pos2 = strrpos($file, '.');
-								$file = substr_replace($file, '', $pos1, $pos2 - $pos1);
+								//$file = substr_replace($file, '', $pos1, $pos2 - $pos1);
 							}
+							$file = preg_replace('/\-(\d+)x(\d+)\./', '.', $file);
 							$this->shop->view['ProduktBilder_MT'][$i]['basenameori']= $file;
 							
@@ -668,6 +669,7 @@
 				if ($pos1 !== false) {
 					$pos2 = strlen($file);
-					$af = substr_replace($file, '', $pos1, $pos2 - $pos1);
+					//$af = substr_replace($file, '', $pos1, $pos2 - $pos1);
 				}
+				$af = preg_replace('/\-(\d+)x(\d+)\./', '.', $file);
 				
 				$sql = "SELECT
@@ -766,6 +768,8 @@
 							if ($pos1 !== false) {
 								$pos2 = strrpos($file, '.');
-								$file = substr_replace($file, '', $pos1, $pos2 - $pos1);
+								//$file = substr_replace($file, '', $pos1, $pos2 - $pos1);
 							}
+							$file = preg_replace('/\-(\d+)x(\d+)\./', '.', $file);
+							
 							$arFiles[$i]['basenameori']= $file;
 							
Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 6281)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 6283)
@@ -890,5 +890,28 @@
 			$this->shop->view['rDatum'] = $_REQUEST['wpsg_rechnungen_datum'];
 			$this->shop->view['title'] = __('Rechnung', 'wpsg');			
-				
+
+			if ($this->shop->hasMod('wpsg_mod_shippingadress') && $this->shop->callMod('wpsg_mod_shippingadress', 'check_different_shippingadress', 
+					array('k_id' => $this->shop->view['data']['k_id'], 'o_id' => $this->shop->view['data']['id'])))
+			{
+				
+				$temp = $this->db->fetchRow("
+				SELECT *
+				FROM
+					`".WPSG_TBL_ADRESS."` AS A
+				WHERE
+					A.`id` = '".wpsg_q($this->shop->view['data']['shipping_adress_id'])."'
+				");
+				
+				$this->shop->view['data']['shipping_firma'] = $temp['firma'];
+				$this->shop->view['data']['shipping_vname'] = $temp['vname'];
+				$this->shop->view['data']['shipping_name'] = $temp['name'];
+				$this->shop->view['data']['shipping_strasse'] = $temp['strasse'];
+				$this->shop->view['data']['shipping_plz'] = $temp['plz'];
+				$this->shop->view['data']['shipping_ort'] = $temp['ort'];
+				$t = $this->db->fetchRow("SELECT L.* FROM `".WPSG_TBL_LAND."` AS L WHERE L.`id` = '".wpsg_q($temp['land'])."'");
+				$this->shop->view['data']['shipping_land'] = $t['kuerzel'];
+				
+			}			
+			
 			$this->shop->view['payment'] = $this->shop->getPaymentName($this->shop->view['data']['type_payment'], $order_id);
 			$this->shop->view['fussText'] = $this->shop->replaceUniversalPlatzhalter($_REQUEST['wpsg_rechnungen_fusstext'], $order_id);
Index: /views/admin/extended.phtml
===================================================================
--- /views/admin/extended.phtml	(revision 6281)
+++ /views/admin/extended.phtml	(revision 6283)
@@ -56,3 +56,2 @@
 	</form>
 </div>
-  
Index: /views/admin/hilfe.phtml
===================================================================
--- /views/admin/hilfe.phtml	(revision 6281)
+++ /views/admin/hilfe.phtml	(revision 6283)
@@ -89,3 +89,2 @@
 			
 </div>
-	
Index: /views/admin/includes.phtml
===================================================================
--- /views/admin/includes.phtml	(revision 6281)
+++ /views/admin/includes.phtml	(revision 6283)
Index: /views/admin/kundendaten_tab1.phtml
===================================================================
--- /views/admin/kundendaten_tab1.phtml	(revision 6281)
+++ /views/admin/kundendaten_tab1.phtml	(revision 6283)
@@ -28,3 +28,2 @@
 <?php echo wpsg_drawForm_Select('pflicht[land]', __('Land', 'wpsg'), $arSelect, $this->view['pflicht']['land'])?>
 <?php echo wpsg_drawForm_Select('pflicht[ustidnr]', __('UStIdNr.', 'wpsg'), $arSelect, $this->view['pflicht']['ustidnr'])?>
- 
Index: /views/admin/kundendaten_tab3.phtml
===================================================================
--- /views/admin/kundendaten_tab3.phtml	(revision 6281)
+++ /views/admin/kundendaten_tab3.phtml	(revision 6283)
@@ -16,3 +16,2 @@
 	'noIndex' => true 
 )); ?>
-	
Index: /views/admin/laender_list.phtml
===================================================================
--- /views/admin/laender_list.phtml	(revision 6281)
+++ /views/admin/laender_list.phtml	(revision 6283)
@@ -85,3 +85,2 @@
     <p><?php echo __('Noch keine LÀnder angelegt.', 'wpsg'); ?></p>
 <?php } ?>
-
Index: /views/admin/ueber.phtml
===================================================================
--- /views/admin/ueber.phtml	(revision 6281)
+++ /views/admin/ueber.phtml	(revision 6283)
Index: /views/admin/widerrufsbelehrung.phtml
===================================================================
--- /views/admin/widerrufsbelehrung.phtml	(revision 6281)
+++ /views/admin/widerrufsbelehrung.phtml	(revision 6283)
Index: /views/mailtemplates/adminmail.phtml
===================================================================
--- /views/mailtemplates/adminmail.phtml	(revision 6281)
+++ /views/mailtemplates/adminmail.phtml	(revision 6283)
Index: /views/mods/mod_rechnungen/invoice_pdf.phtml
===================================================================
--- /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 6281)
+++ /views/mods/mod_rechnungen/invoice_pdf.phtml	(revision 6283)
@@ -850,5 +850,5 @@
 		
 		$shipping_adress .= $this->view['data']['shipping_plz'].' '.$this->view['data']['shipping_ort']."\r\n";
-		$shipping_adress .= $this->view['data']['shipping_land']['name'];
+		$shipping_adress .= $this->view['data']['shipping_land'];		//['name'];