X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=lxo-import%2Fimport_lib.php;h=cc228a0d69f045df403a3ec86d9554024e6ca0a2;hb=ad27efa6a3b7e8feea8497c24acebe5bd501156b;hp=2abec363c65e6caa4257f6a6708072ad1b76462a;hpb=57bf9c89a037036fcf433de39643778854defe51;p=kivitendo-erp.git

diff --git a/lxo-import/import_lib.php b/lxo-import/import_lib.php
index 2abec363c..cc228a0d6 100644
--- a/lxo-import/import_lib.php
+++ b/lxo-import/import_lib.php
@@ -71,6 +71,7 @@ $parts = array(
     "weight" => "Gewicht in Benutzerdefinition",
     "notes" => "Beschreibung",
     "notes1" => "Beschreibung",
+    "formel" => "Formel",
     "makemodel" => "Hersteller",
     "model" => "Modellbezeichnung",
     "image" => "Pfad/Dateiname",
@@ -93,6 +94,7 @@ $parts = array(
     "partsgroup2" => "3.Warengruppenbezeichnung",
     "partsgroup3" => "4.Warengruppenbezeichnung",
     "partsgroup4" => "5.Warengruppenbezeichnung",
+    "shop"  => "Shopexport vorghesehen",
     );
     
 $contactscrm = array(
@@ -369,5 +371,20 @@ function authuser($dbhost,$dbport,$dbuser,$dbpasswd,$dbname,$cookie) {
     $db->query($sql,"authuser_3");
     return $auth;
 }
+/**
+ * Zeichencode übersetzen
+ *
+ * @param String $txt
+ */
+function translate(&$txt) {
+    if (Auto) {
+        $encoding = mb_detect_encoding($data,"UTF-8,ISO-8859-1,ISO-8859-15,Windows-1252,ASCII");
+        $txt = iconv("$encoding",ServerCode."//TRANSLIT",$txt);
+        //$txt = mb_convert_encoding($txt, ServerCode,"$encoding");
+    } else {
+        $txt = iconv(FileCode,ServerCode."//TRANSLIT",$txt);
+        //$txt = mb_convert_encoding($txt, ServerCode,FileCode);
+    }
+}
 
 ?>