X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=lxo-import%2Fparts_import.php;h=94f2b6f15fc9db8ef8a77bf68808154b32a3f998;hb=64035a1b2890a19fc9cd247c0eff2670ba09cb6b;hp=4159eff29e0e99cf1ba68776247ac87045616cbb;hpb=596cce1fb449f9400899105d5fc3f793b18cb142;p=kivitendo-erp.git

diff --git a/lxo-import/parts_import.php b/lxo-import/parts_import.php
index 4159eff29..94f2b6f15 100644
--- a/lxo-import/parts_import.php
+++ b/lxo-import/parts_import.php
@@ -128,11 +128,13 @@ function updParts($db,$insert,$show,$partnumber,$lastcost,$sellprice,$listprice,
     return $rc;
 }
 
-function getMakemodel($db,$check,$hersteller,$model,$partsid,$add=true) {
+function getMakemodel($db,$check,$hersteller,$model,$partsid,$lastcost,$add=true) {
     $sql="select * from makemodel where make = $hersteller and model = '$model' and parts_id = $partsid";
     $rs=$db->getAll($sql);
     if (empty($rs[0]["id"]) && $add) {
-        $sql="insert into makemodel (parts_id,make,model) values ($partsid,'$hersteller','$model')";    
+        if (!$lastcost) $lastcost=0.00;
+        $sql="insert into makemodel (parts_id,make,model,lastcost,lastupdate,sortorder) ";
+        $sql.="values ($partsid,'$hersteller','$model',$lastcost,now(),1)";    
         $rc=$db->query($sql);
     }
 }
@@ -226,7 +228,24 @@ function insPrices($db,$pid,$prices) {
     return true;
 }
 
-function import_parts($db, $file, $trenner, $trennzeichen, $fields, $check, $insert, $show ,$maske) {
+/**
+ * TODO: short description.
+ * 
+ * @param double $db     
+ * @param mixed  $file   
+ * @param mixed  $fields 
+ * @param mixed  $check  
+ * @param int    $insert 
+ * @param string $show   
+ * @param mixed  $maske  
+ * 
+ * @return TODO
+ */
+function import_parts($db, $file, $fields, $check, $maske) {
+    $insert = !$maske["test"];
+    $show = $maske["show"];
+    $trennzeichen = ($maske["trennzeichen"])?$maske["trennzeichen"]:"";
+    $trenner = ($maske["trenner"])?$maske["trenner"]:",";
     $precision=$maske["precision"];
     $quotation=$maske["quotation"];
     $quottype=$maske["quottype"];
@@ -234,6 +253,8 @@ function import_parts($db, $file, $trenner, $trennzeichen, $fields, $check, $ins
     $wgtrenner=$maske["wgtrenner"];
     $Update=($maske["update"]=="U")?true:false;
     $UpdText=($maske["TextUpd"]=="1")?true:false;
+    $vendnr=($maske["vendnr"]=="t")?true:false;
+    $modnr=($maske["modnr"]=="t")?true:false;
 
     //$stdunitW=getStdUnit($db,"dimension");
     //$stdunitD=getStdUnit($db,"service");
@@ -276,12 +297,12 @@ function import_parts($db, $file, $trenner, $trennzeichen, $fields, $check, $ins
      */
     if ($show) {
         show('<tr>',false);
-        show("partnumber"); show("lastcost");   show("sellprice");	show("listprice");
-        show("description");show("notes");      show("ean");
-        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("shop"); show("");
+        show("partnumber");     show("lastcost");       show("sellprice");	show("listprice");
+        show("description");    show("notes");          show("ean");
+        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("shop"); show("");
         show("</tr>\n",false);
     }
 
@@ -325,8 +346,8 @@ function import_parts($db, $file, $trenner, $trennzeichen, $fields, $check, $ins
   	        foreach ($prices as $pkey=>$val) {
                 if (array_key_exists($pkey,$fldpos))  
     		        $pricegroup[$val] = str_replace(",", ".", $zeile[$fldpos[$pkey]]);
-	    }
-	}
+            }
+        }
         if ($quotation<>0) {
             if ($quottype=="A") { $sellprice += $quotation; }
             else { $sellprice = $sellprice * $quotation; }
@@ -366,32 +387,39 @@ function import_parts($db, $file, $trenner, $trennzeichen, $fields, $check, $ins
                 $partsgroup_id = getPartsgroupId($db, $pgname, $insert);
         }
 
+        /* Ware oder Dienstleistung */
+        if (($maske["ware"]=="G" and strtoupper($zeile[$fldpos["art"]])=="D") or $maske["ware"]=="D") { 
+            $artikel = false; 
+        } else if (($maske["ware"]=="G" and strtoupper($zeile[$fldpos["art"]])=="W") or $maske["ware"]=="W") { 
+            $artikel = true;
+        }
+
         /* sind Hersteller und Modelnummer hinterlegt 
             wenn ja, erfolgt er insert später */
         $makemodel = 'f';
-        if (!empty($zeile[$fldpos["makemodel"]]) and !$artikel) { 
+        if (!empty($zeile[$fldpos["makemodel"]]) and $artikel) { 
             $mm = $zeile[$fldpos["makemodel"]];
             if (Translate) translate($mm);
-            $hersteller=suchFirma("vendor",$mm);
-            $hersteller=$hersteller["cp_cv_id"];
-            if (!empty($zeile[$fldpos["model"]])) {
+            if ($vendnr) {
+                $hersteller=getFirma($mm,"vendor");
+            } else {
+                $hersteller=suchFirma("vendor",$mm);
+                $hersteller=$hersteller["cp_cv_id"];
+            }
+            if (!empty($zeile[$fldpos["model"]]) and $hersteller>0) {
                 $mo = $zeile[$fldpos["model"]];
                 if (Translate) translate($mo);
                 $model = $mo;
                 $makemodel = 't';
-            } else { 
+            } else if ($modnr and $hersteller>0) { 
+                $model = ''; 
+                $makemodel = 't';
+            } else {
                 unset($hersteller);
                 $makemodel = 'f';
             }
         }
 
-        /* Ware oder Dienstleistung */
-        if (($maske["ware"]=="G" and strtoupper($zeile[$fldpos["art"]])=="D") or $maske["ware"]=="D") { 
-            $artikel = false; 
-        } else if (($maske["ware"]=="G" and strtoupper($zeile[$fldpos["art"]])=="W") or $maske["ware"]=="W") { 
-            $artikel = true;
-        }
-
         /* Einheit ermitteln */
         if ($zeile[$fldpos["unit"]]=="") {
             //Keine Einheit mitgegeben
@@ -506,10 +534,10 @@ function import_parts($db, $file, $trenner, $trennzeichen, $fields, $check, $ins
                     "rop"=>$rop,"assembly"=>$assembly,
                     "shop"=>$shop,"makemodel"=>$makemodel),$pricegroup
                 );
-        if ($hersteller>0 && $model) {
+        if ($hersteller>0 ) { // && $model) {
             $partsid=getPartsid($db,$zeile[$fldpos["partnumber"]]);
-            if ($partsid) {
-                getMakemodel($db,$check,$hersteller,$model,$partsid,true);
+            if ($partsid) { 
+                getMakemodel($db,$check,$hersteller,$model,$partsid,$lastcost,true);
             }
         }
         unset($zeile);