Index: /mods/wpsg_mod_export.class.php
===================================================================
--- /mods/wpsg_mod_export.class.php	(revision 7118)
+++ /mods/wpsg_mod_export.class.php	(revision 7119)
@@ -1456,7 +1456,7 @@
 						'produkt_index' => __('Position', 'wpsg'),
 						'produkt_name' => __('Produktname', 'wpsg'),
-						'produkt_link' => __('Produkt-URL', 'wpsg'),
-						//'produkt_picture_link' => __('Produktbild-URL', 'wpsg'),
-						//'produkt_shippingprice' => __('Versandkosten', 'wpsg'),		
+						'product_url' => __('Produkt-URL', 'wpsg'),
+						'product_picture_url' => __('Produktbild-URL', 'wpsg'),
+						//'product_shippingprice' => __('Versandkosten', 'wpsg'),		
 						'produkt_typ' => __('Produkttyp', 'wpsg'),
 						'produkt_preis' => __('Produktpreis', 'wpsg'),
@@ -1470,6 +1470,5 @@
 						'produkt_fmenge' => __('FÃŒllmenge', 'wpsg'),
 						'produkt_beschreibung' => __('Beschreibung', 'wpsg'),
-						'produkt_weight' => __('Gewicht', 'wpsg'),		
-						'produkt_stock' => __('Lagerbestand', 'wpsg'),
+						'produkt_weight' => __('Gewicht', 'wpsg'),		 
 						'produkt_anr' => __('Artikelnummer', 'wpsg'),
 						'produkt_menge' => __('Anzahl', 'wpsg'),
@@ -1503,4 +1502,11 @@
 			);
 			
+			if ($this->shop->hasMod('wpsg_mod_stock')) {
+
+                $this->fields[20]['fields']['produkt_stock'] = __('Lagerbestand', 'wpsg');
+			    $this->fields[20]['fields']['product_stock_state'] = __('Lagerstatus', 'wpsg');
+			    
+            }
+			
 			// AboProdukte
 			if ($this->shop->hasMod('wpsg_mod_abo'))
@@ -1884,5 +1890,11 @@
 			if ($customer_id !== false) $oCustomer = wpsg_customer::getInstance($customer_id);
 			else $oCustomer = $oOrder->getCustomer();
-			
+ 
+			if ($p_id !== false) {
+			    			    
+			    $oProduct = wpsg_product::getInstance($p_id);
+			                                    
+            }
+                        			
 			switch ($field_value)
 			{
@@ -1997,4 +2009,50 @@
 				case 'produkt_index': $return = $product_index; break; 
 				case 'produkt_name': $return = $produkt['name']; break;
+                case 'product_url': $return = $this->shop->getProduktLink($produkt); break;
+                case 'product_picture_url':
+
+                    $nAttachmentID = $this->shop->imagehandler->getAttachmentID($produkt['id']);
+                    $return = '';
+                    
+                    if (wpsg_isSizedInt($nAttachmentID)) $return = \wp_get_attachment_url($nAttachmentID);
+                    
+                    break;
+                /*case 'product_shippingprice':
+                     
+                    $arCountry = wpsg_country::find([]);
+                    
+                    foreach ($arCountry as $oCountry) {
+                        
+                        $cost = 0;
+ 
+                        $this->shop->basket = new wpsg_basket();
+                        $this->shop->basket->arProdukte = [
+                            [
+                                'id' => $oProduct->id,
+                                'menge' => 1
+                            ]
+                        ];
+                        $this->shop->baskert->arCheckout['land'] = $oCountry->id;
+
+                        $arShipping = [];
+                        
+                        $this->shop->callMods('addShipping', [&$arShipping, true]);
+                        
+                        foreach ($arShipping as $shipping_key => $shipping) {
+                            
+                            $arBasket = $this->shop->basket->toArray();
+                            
+                            $this->shop->callMods('calcShipping', [&$arBasket, $shipping_key]);
+ 
+                            wpsg_debug($oCountry->getShorttext()." : ".$shipping_key.":".$arBasket['sum']['preis_shipping_brutto']);
+
+                        }
+                        
+                    }
+                    
+                    
+                    die("K");
+                    
+                    break;*/
 				case 'produkt_typ': $return = $produkt['typ']; break;
 				case 'produkt_preis': // Brutto Preis im Produkt
@@ -2006,5 +2064,5 @@
 										
 					break;
-				
+                					
 				case 'produkt_preis_netto': // Netto Preis im Produkt
 					
@@ -2028,6 +2086,5 @@
 				case 'produkt_mwst': $return = $produkt['mwst_key']; break;
 				case 'produkt_mwst_value': $return = wpsg_ff($oFrontendCountry->getTax($produkt['mwst_key'])); break;
-				
-				case 'produkt_link': $return = $produkt['url']; break; 				
+				 				
 				// case 'produkt_picture_link': $return = $produktbild['url']; break; 
 							
@@ -2041,4 +2098,9 @@
 				case 'produkt_weight': $return = $produkt['weight']; break;
 				case 'produkt_stock': $return = $produkt['stock']; break;
+                case 'product_stock_state': 
+                    
+                    $return = ((wpsg_isSizedInt($produkt['stock']))?__('auf Lager', 'wpsg'):__('nicht auf Lager', 'wpsg'));
+
+                    break;
 				case 'produkt_anr': $return = $produkt['anr']; break;
 				case 'produkt_menge': $return = $produkt['menge']; break;