From: Bernd Blessmann <bibi@online.de>
Date: Fri, 5 Mar 2010 11:39:05 +0000 (+0100)
Subject: Warenimport: Verwende shop-Flag von der Import-Datei, falls
X-Git-Tag: release-2.6.1beta1~17^2~9
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0efaacee75b966aa01e8a4e0358b5753a9e52a22;p=kivitendo-erp.git

Warenimport: Verwende shop-Flag von der Import-Datei, falls
das Feld vorhanden ist, ansonsten verwende Einstellung aus
der Maske.

    Fix für Bug 1342.
---

diff --git a/lxo-import/partsB.php b/lxo-import/partsB.php
index a1d206cc5..49341c0a1 100644
--- a/lxo-import/partsB.php
+++ b/lxo-import/partsB.php
@@ -130,7 +130,7 @@ if ($_POST["ok"]) {
 <tr><td>Test</td><td><input type="checkbox" name="test" value="1">ja</td></tr>
 <tr><td>Textupdate</td><td><input type="checkbox" name="TextUpd" value="1">ja</td></tr>
 <tr><td>Warengruppen<br>verbinder</td><td><input type="text" name="wgtrenner" value="!" size="3"></td></tr>
-<tr><td>Shopartikel</td><td><input type="radio" name="shop" value="t">ja <input type="radio" name="shop" value="f" checked>nein</td></tr>
+<tr><td>Shopartikel,<br>falls Feld leer</td><td><input type="radio" name="shop" value="t">ja <input type="radio" name="shop" value="f" checked>nein</td></tr>
 <tr><td>Art</td><td><input type="Radio" name="ware" value="W" checked>Ware &nbsp; 
             <input type="Radio" name="ware" value="D">Dienstleistung
             <input type="Radio" name="ware" value="G">gemischt (Spalte 'art' vorhanden)</td></tr>
diff --git a/lxo-import/parts_import.php b/lxo-import/parts_import.php
index 5a02ee4f8..83370167e 100644
--- a/lxo-import/parts_import.php
+++ b/lxo-import/parts_import.php
@@ -30,6 +30,7 @@ function insertParts($db,$insert,$show,$data) {
         show($data["buchungsgruppen_id"]);show($data["income_accno"]);      show($data["expense_accno"]);
         show($data["inventory_accno"]);   show($data["microfiche"]);        show($data["drawing"]);
         show($data["rop"]);               show($data["assembly"]);          show($data["makemodel"]);
+        show($data["shop"]);
     }
     /*foreach ($data as $key=>$val) {
         echo $key.":".gettype($val).":".gettype($data[$key]).":".$val."<br>";
@@ -221,7 +222,7 @@ function import_parts($db, $file, $trenner, $trennzeichen, $fields, $check, $ins
         show("weight");     show("image");      show("partsgroup_id");
         show("bg");         show("income_accno"); show("expense_accno");
         show("inventory_accno"); show("microfiche");show("drawing");show("rop");
-        show("assembly");show("makemodel");  show("");
+        show("assembly");show("makemodel");show("shop");  show("");
         show("</tr>\n",false);
     }
 
@@ -382,6 +383,14 @@ function import_parts($db, $file, $trenner, $trennzeichen, $fields, $check, $ins
         if ($zeile[$fldpos["rop"]]) $rop = 1 * str_replace(",", ".",$zeile[$fldpos["rop"]]);
         if ($zeile[$fldpos["weight"]]) $weight = 1 * str_replace(",", ".", $zeile[$fldpos["weight"]]);
 
+        // Shop-Artikel
+        if ($zeile[$fldpos["shop"]]) {
+                $shop = ($zeile[$fldpos["shop"]] > 0)?'t':'f';
+        } else {
+                $shop = $maske["shop"];
+        }
+
+        // Artikel updaten
         if (getPartsid($db,trim($zeile[$fldpos["partnumber"]]))) {
             /* es gibt die Artikelnummer */
             if ($Update) {