From fbe32862f2a6db05722508d7f47a9e0aec91be8b Mon Sep 17 00:00:00 2001
From: Holger Lindemann <hli@lx-system.de>
Date: Thu, 28 May 2009 10:58:56 +0000
Subject: [PATCH] Lager

---
 lxo-import/import_lib.php | 14 +++++++++++---
 lxo-import/partsB.php     | 12 ++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/lxo-import/import_lib.php b/lxo-import/import_lib.php
index 6fef1ecf0..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);
@@ -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;
+}
+?>
diff --git a/lxo-import/partsB.php b/lxo-import/partsB.php
index 6ca232f30..134880928 100644
--- a/lxo-import/partsB.php
+++ b/lxo-import/partsB.php
@@ -55,6 +55,7 @@ if ($_POST["ok"]=="Hilfe") {
 clearstatcache ();
 
 $test    = $_POST["test"];
+$lager    = $_POST["lager"];
 $TextUpd = $_POST["TextUpd"];
 $trenner = ($_POST["trenner"])?$_POST["trenner"]:",";
 $trennzeichen = ($_POST["trennzeichen"])?$_POST["trennzeichen"]:"";
@@ -96,6 +97,8 @@ echo "Checking data:<br>";
 $_test=$_POST;
 $_test["precision"]=-1;
 $_test["quotation"]=0;
+$_test["lager"]=$_POST["lager"];
+$_test["lagerplatz"]=$_POST["lagerplatz"];
 //$_test["shop"]="n";
 //$_test["wgtrenner"]="!";
 $err = import_parts($db, $file, $trenner, $trennzeichen, $parts, TRUE, FALSE, FALSE,$_test);
@@ -110,6 +113,7 @@ import_parts($db, $file, $trenner, $trennzeichen, $parts, FALSE, !$test, TRUE,$_
 
 } else {
 	$bugrus=getAllBG($db);
+	$lagerplatz=getLager($db);
 ?>
 
 <p class="listtop">Artikelimport f&uuml;r die ERP<p>
@@ -155,6 +159,14 @@ import_parts($db, $file, $trenner, $trennzeichen, $parts, FALSE, !$test, TRUE,$_
 	<input type="radio" name="bugrufix" value="1" checked>f&uuml;r alle Artikel verwenden
 	<input type="radio" name="bugrufix" value="2">f&uuml;r Artikel ohne passende Bugru
 	</td></tr>
+<tr><td>Default Lager<br></td><td><select name="lager">
+<?	if ($lagerplatz) foreach ($lagerplatz as $lp) { ?>
+			<option value="<?= $lp["id"] ?>"><?= $lp["ort"] ?>-<?= $lp["platz"] ?>
+<?	} ?>
+	</select>
+	<input type="radio" name="lagerfix" value="1" checked>f&uuml;r alle Artikel verwenden
+	<input type="radio" name="lagerfix" value="2">f&uuml;r Artikel ohne passendes Lager
+	</td></tr>
 <tr><td>Daten</td><td><input type="file" name="Datei"></td></tr>
 <tr><td></td><td><input type="submit" name="ok" value="Import"></td></tr>
 </table>
-- 
2.20.1