Merge branch 'master' of ssh://lx-office/~/lx-office-erp

diff --git a/doc/changelog b/doc/changelog
index bfa2584b7f53fc2833e1c7606d5b2fd71628217d..207367a7a4f5b954398881c3e0f5be99f7eacc0c 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -181,7 +181,8 @@
   1051 1055 1057 1058 1072 1073 1077 1079 1081 1082 1095 1098 1100 1101 1108
   1110 1118 1125 1127 1130 1133 1135 1136 1138 1144 1146 1147 1150 1151 1155
   1164 1173 1177 1186 1188 1190 1191 1195 1197 1198 1199 1200 1201 1209 1213
-  1243 1248 1250 1262 1286 1287 1289 1291 1294 1299 1341 1342 1399
+  1243 1248 1250 1262 1286 1287 1289 1291 1294 1299 1339 1340 1341 1342 1343
+  1399
 
 
 2009-06-02 - Version 2.6.0

diff --git a/lxo-import/partsB.php b/lxo-import/partsB.php
index 49341c0a1df35231e69ff26247c1eeaf2caf2f7f..961946612a1ae21a67d59a33e41610ca4e3b6d3d 100644 (file)
--- a/lxo-import/partsB.php
+++ b/lxo-import/partsB.php
@@ -66,23 +66,24 @@ if ($_POST["ok"]) {
     $precision = $_POST["precision"];
     $quotation = $_POST["quotation"];
     $quottype = $_POST["quottype"];
-    $file    = "parts";
+    $file    = "../users/parts.csv";
+    $table   = "parts";
 
     /* no data? */
     if (empty($_FILES["Datei"]["name"]))
         ende ("Kein Datenfile angegeben");
 
     /* copy file */
-    if (!move_uploaded_file($_FILES["Datei"]["tmp_name"],$file.".csv")) {
+    if (!move_uploaded_file($_FILES["Datei"]["tmp_name"],$file)) {
         ende ("Upload von Datei fehlerhaft.".$_FILES["Datei"]["error"]);
     } 
 
     /* check if file is really there */
-    if (!file_exists("$file.csv") or filesize("$file.csv")==0) 
-        ende("Datenfile ($file.csv) nicht im Ordner gefunden oder leer");
+    if (!file_exists("$file") or filesize("$file")==0) 
+        ende("Datenfile ($file) nicht im Ordner gefunden oder leer");
 
     /* Zu diesem Zeitpunkt wurde der Artikel Importiert */
-    if (!$db->chkcol($file)) 
+    if (!$db->chkcol($table)) 
         ende("Importspalte konnte nicht angelegt werden");
 
     /* first check all elements */

diff --git a/lxo-import/parts_import.php b/lxo-import/parts_import.php
index 83370167e0b68cec3290d114f3a33ec6a6379513..2f0edd0a2930d469fff9fae15426b2b56686613a 100644 (file)
--- a/lxo-import/parts_import.php
+++ b/lxo-import/parts_import.php
@@ -210,7 +210,7 @@ function import_parts($db, $file, $trenner, $trennzeichen, $fields, $check, $ins
     $parts_fld = array_keys($fields);
 
     /* open csv file */
-    $f=fopen("$file.csv","r");
+    $f=fopen("$file","r");
     
     /*
      * read first line with table descriptions