X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=lxo-import%2Fimport_lib.php;h=c54305ee41d12ce2f3fbb0cba0d53cbf9383dc4a;hb=78c8b931b0081dc5c082615c6dac24b7d8f6ff7f;hp=d8b2259c18a882e3e620f434897b066b0324ba0b;hpb=8d51e9b8a800f0d734a35887fe0fdb680a67fc72;p=kivitendo-erp.git

diff --git a/lxo-import/import_lib.php b/lxo-import/import_lib.php
index d8b2259c1..c54305ee4 100644
--- a/lxo-import/import_lib.php
+++ b/lxo-import/import_lib.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
 Funktionsbibliothek für den Datenimport in Lx-Office ERP
 
@@ -68,6 +68,7 @@ $parts = array(
 	"unit" => "Einheit",
 	"weight" => "Gewicht in Benutzerdefinition",
 	"onhand" => "Lagerbestand",
+	"bin"	=> "Lagerplatz",
 	"notes" => "Beschreibung",
 	"notes1" => "Beschreibung",
 	//"makemodel" => "Hersteller",
@@ -168,7 +169,7 @@ global $db;
 }
 
 function getKdId() {
-// die nächste freie Kunden-/Lieferantennummer holen
+// die nächste freie Kunden-/Lieferantennummer holen
 global $db,$file,$test;
 	if ($test) { return "#####"; }
 	$sql1="select * from defaults";
@@ -254,7 +255,8 @@ $land=array("DEUTSC"=>"D","FRANKR"=>"F","SPANIE"=>"ES","ITALIE"=>"I","HOLLAN"=>"
 
 function mkland($data) {
 global $land;
-	$data=strtr($data,array("Ö"=>"OE","Ä"=>"AE","Ü"=>"UE","ö"=>"OE","ä"=>"AE","ü"=>"UE","ß"=>"SS"));
+	$data=strtr($data,array("Ö"=>"OE","Ä"=>"AE","Ü"=>"UE","ö"=>"OE","ä"=>"AE","ü"=>"UE","ß"=>"SS",
+			'Ö'=>'OE','Ä'=>'AE','Ü'=>'UE','ö'=>'OE','ä'=>'AE','ü'=>'UE','ß'=>'SS'));
 	$data=strtoupper(substr($data,0,6));
 	$cntr=$land[$data];
 	return (strlen($cntr)>0)?$cntr:substr($data,0,3);
@@ -302,7 +304,7 @@ function anmelden() {
         $dbhost=($hits[1])?$hits[1]:"localhost";
         preg_match("/'port'[ ]*=> '(.+)'/",$tmp,$hits);
         $dbport=($hits[1])?$hits[1]:"5432";
-        preg_match("/^[ ]*\$self->\{cookie_name\}[ ]*=[ ]*'(.+)'/",$tmp,$hits);
+	preg_match("/[ ]*\\\$self->\{cookie_name\}[ ]*=[ ]*'(.+)'/",$tmp,$hits);
         $cookiename=$hits[1];
         if (!$cookiename) $cookiename='lx_office_erp_session_id';
         $cookie=$_COOKIE[$cookiename];
@@ -381,3 +383,9 @@ function authuser($dbhost,$dbport,$dbuser,$dbpasswd,$dbname,$cookie) {
         return $auth;
 }
 
+function getLager($db) {
+	$sql="select w.description as ort,bin.id,bin.description as platz from 	warehouse w left join bin  on w.id=bin.warehouse_id";
+	$rs=$db->getAll($sql,"getLager");
+	return $rs;
+}
+?>