X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=lxo-import%2Fimport_lib.php;h=902feff2cef261bf6ca04455b6598ea52e5a56b6;hb=04e9a4746bd5f1de726ee00593286cbe48684417;hp=89ca76f20ba17b4577f31d77e29594f814481a0c;hpb=c25cb4622b88c268878dc814d4b8487584315fe7;p=kivitendo-erp.git

diff --git a/lxo-import/import_lib.php b/lxo-import/import_lib.php
index 89ca76f20..902feff2c 100644
--- a/lxo-import/import_lib.php
+++ b/lxo-import/import_lib.php
@@ -31,19 +31,21 @@ $address = array(
 	"customernumber" => "Kundennummer",
 	"vendornumber" => "Lieferantennummer",
 	"taxnumber" => "Steuernummer",
+	"ustid" => "Umsatzsteuer-ID",
 	"account_number" => "Kontonummer",
 	"bank_code" => "Bankleitzahl",
 	"bank" => "Bankname",
 	"branche" => "Branche",
-	"language" => "Sprache (de,en,fr)",
+	//"language" => "Sprache (de,en,fr)",
 	"sw" => "Stichwort",
-	"creditlimit" => "Kreditlimit (nnnnnn.nn)",
+	"creditlimit" => "Kreditlimit (nnnnnn.nn)"); /*,
 	"hierarchie" => "Hierarchie",
 	"potenzial" => "Potenzial",
         "ar" => "Debitorenkonto",
         "ap" => "Kreditorenkonto",
         "matchcode" => "Matchcode",
-	"customernumber2" => "Kundennummer 2");
+	"customernumber2" => "Kundennummer 2"); 
+	Kundenspezifisch */
         
 $shiptos = array(
 	"shiptoname" => "Firmenname",
@@ -64,41 +66,58 @@ $parts = array(
 	"partnumber" => "Artikelnummer",
 	"description" => "Artikeltext",
 	"unit" => "Einheit",
-	"weight" => "Gewicht (kg)",
+	"weight" => "Gewicht in Benutzerdefinition",
 	"onhand" => "Lagerbestand",
 	"notes" => "Beschreibung",
-	"makemodel" => "Hersteller",
-	"model" => "Modellbezeichnung",
-	"income_accno_id" => "Erlöskonto",
-	"expense_accno_id" => "Konto Umsatzkosten",
+	//"makemodel" => "Hersteller",
+	//"model" => "Modellbezeichnung",
 	"bin" => "Lagerort",
 	"image" => "Pfad/Dateiname",
 	"drawing" => "Pfad/Dateiname",
 	"microfiche" => "Pfad/Dateiname",
-	"partsgroup_id" => "Name Warengruppe",
 	"listprice" => "Listenpreis",
 	"sellprice" => "Verkaufspreis",
 	"lastcost" => "letzter EK",
-	"art" => "Ware/Dienstleistung (*/d)");
+	"art" => "Ware/Dienstleistung (*/d), muß vor den Konten kommen",
+	"inventory_accno" => "Bestandskonto",
+	"income_accno" => "Erlöskonto",
+	"expense_accno" => "Konto Umsatzkosten",
+	"obsolete" => "Gesperrt (Y/N)",
+	"lastcost" => "letzer EK-Preis",
+	"rop" => "Mindestbestand",
+	"shop" => "Shopartikel (Y/N)",
+	"assembly" => "Stückliste (Y/N); wird noch nicht unterstützt",
+	"partsgroup" => "Warengruppenbezeichnung",
+	"partsgroup1" => "2.Warengruppenbezeichnung",
+	//"income_accno_0" => "?Nummer? für Erlöse Inland",
+	//"income_accno_1" => "?Nummer? für Erlöse EG",
+	//"income_accno_3" => "?Nummer? für Erlöse Ausland",
+	);
 	
 $contactscrm = array(
 	"customernumber" => "Kundennummer",
 	"vendornumber" => "Lieferantennummer",
 	"cp_cv_id" => "FirmenID in der db",
 	"firma" => "Firmenname",
+	"cp_abteilung" => "Abteilung",
+	"cp_position" => "Position/Hierarchie",
 	"cp_greeting" => "Anrede",
 	"cp_title" => "Titel",
 	"cp_givenname" => "Vorname",
-	"cp_greeting" => "Anrede",
 	"cp_name" => "Nachname",
 	"cp_email" => "eMail",
 	"cp_phone1" => "Telefon 1",
 	"cp_phone2" => "Telefon 2",
+	"cp_mobile1" => "Mobiltelefon 1",
+	"cp_mobile2" => "Mobiltelefon 2",
+	"cp_homepage" => "Homepage",
 	"cp_street" => "Strasse",
+	"cp_country" => "Land",
 	"cp_zipcode" => "PLZ",
 	"cp_city" => "Ort",
+	"cp_privatphone" => "Privattelefon",
+	"cp_privatemail" => "private eMail",
 	"cp_notes" => "Bemerkungen",
-	"cp_country" => "Land",
 	"cp_stichwort1" => "Stichwort(e)",
 	"katalog" => "Katalog",
 	"inhaber" => "Inhaber",
@@ -118,6 +137,11 @@ $contacts = array(
 	"cp_email" => "eMail",
 	"cp_phone1" => "Telefon 1",
 	"cp_phone2" => "Telefon 2",
+	"cp_mobile1" => "Mobiltelefon 1",
+	"cp_mobile2" => "Mobiltelefon 2",
+	"cp_privatphone" => "Privattelefon",
+	"cp_privatemail" => "private eMail",
+	"cp_homepage" => "Homepage",
 	"katalog" => "Katalog",
 	"inhaber" => "Inhaber",
 	"contact_id" => "Kontakt ID"
@@ -251,6 +275,12 @@ global $db;
 	}
 }
 
+function getAllBG($db) {
+	$sql  = "select * from buchungsgruppen order by description";
+	$rs=$db->getAll($sql);
+	return $rs;
+}
+
 class myDB extends DB {
 // Datenbankklasse
 
@@ -258,6 +288,10 @@ class myDB extends DB {
  var $showErr = false;
  var $db = false;
  var $debug = false;
+ var $logsql = false;
+ var $errfile = false;
+ var $logfile = false;
+
 
 /****************************************************
 * uudecode
@@ -267,6 +301,7 @@ class myDB extends DB {
 * http://de3.php.net/base64_decode (bug #171)
 *****************************************************/
 	function uudecode($encode) {
+	  $encode=stripslashes($encode);
 	  $b64chars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 	  $encode = preg_replace("/^./m","",$encode);
@@ -288,13 +323,17 @@ class myDB extends DB {
 			echo "$sql : $err\n";
 	}
 
-	function showDebug($sql) {
+	function showDebug($sql) {	
 		echo $sql."\n";
 		if ($this->debug==2) {
 			print_r($this->rc);
 		};
 	}
 
+	function logSql($sql) {
+		if (!$this->logfile)  $this->logfile=fopen("import.sql","a");
+		fputs($this->logfile,$sql."\n");
+	}
 	function myDB($usr) {
 		// Datenbankparameter des ERP-Users benutzen.
 		$tmp = file_get_contents("../users/$usr.conf");
@@ -328,6 +367,7 @@ class myDB extends DB {
 
 	function query($sql) {
 		$this->rc=@$this->db->query($sql);
+		if ($this->logsql) $this->logSql($sql);
 		if ($this->debug) $this->showDebug($sql);
 		if(DB::isError($this->rc)) {
 			$this->dbFehler($sql,$this->rc->getMessage());
@@ -338,6 +378,7 @@ class myDB extends DB {
 	}
 	function getAll($sql) {
 		$this->rc=@$this->db->getAll($sql,DB_FETCHMODE_ASSOC);
+		if ($this->logsql) $this->logSql($sql);
 		if ($this->debug) $this->showDebug($sql);
 		if(DB::isError($this->rc)) {
 			$this->dbFehler($sql,$this->rc->getMessage());