Index: /mods/wpsg_mod_export.class.php
===================================================================
--- /mods/wpsg_mod_export.class.php	(revision 6149)
+++ /mods/wpsg_mod_export.class.php	(revision 6150)
@@ -1200,5 +1200,5 @@
 		{
 			
-			$field_value = $f['value'];
+			$field_value = $f['value_key'];
 			
 			$cache_key = $o_id.'_'.$p_id.'_'.$product_index.'_'.$productkey.'_'.$order_product_id;
@@ -1228,9 +1228,11 @@
 				$order['menge'] = $this->db->fetchOne("SELECT SUM(OP.`menge`) FROM `".WPSG_TBL_ORDERPRODUCT."` AS OP WHERE OP.`o_id` = '".wpsg_q($order['id'])."'");
 				
+                $order['oOrder'] = wpsg_order::getInstance($order['id']);
+                
 				// Anzahl an Produkten in der Bestellung (MengenunabhÀngig)
 				$order['count'] = $this->db->fetchOne("SELECT COUNT(*) FROM `".WPSG_TBL_ORDERPRODUCT."` WHERE `o_id` = '".wpsg_q($order['id'])."'");
 				
-				$order['payment_method'] = $this->shop->arPayment[$order['type_payment']]['name'];
-				$order['shipping_method'] = $this->shop->arShipping[$order['type_shipping']]['name'];
+				$order['payment_method'] = $order['oOrder']->getPaymentLabel();
+				$order['shipping_method'] = $order['oOrder']->getShippingLabel();
 				
 				$order['custom_data'] = unserialize($order['custom_data']);
@@ -1669,5 +1671,5 @@
 						{
 						
-							$return = __('Nicht definiert!'.$field_value, 'wpsg');
+							$return = __('Nicht definiert ('.$field_value.') !', 'wpsg');
 							
 						}
Index: /views/produkt/index.phtml
===================================================================
--- /views/produkt/index.phtml	(revision 6149)
+++ /views/produkt/index.phtml	(revision 6150)
@@ -229,6 +229,4 @@
 	{
 
-		if (page <= 0 || page == <?php echo @$this->view['arFilter']['page']; ?> || page > <?php echo wpsg_getStr($this->view['pages'], '0'); ?>) return;
-
 		jQuery('#wpsg_seite').val(page);
 		jQuery('#filter_form').submit();