From: Stephan Köhler <s.koehler@linet-services.de>
Date: Mon, 12 Dec 2005 15:57:56 +0000 (+0000)
Subject: Merge von 683 aus unstable: Bugfix Angebote/Auftraege
X-Git-Tag: release-2.2.0~73
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=07b34c6ddd71bfeca5266b9045069769c1cdb01f;p=kivitendo-erp.git

Merge von 683 aus unstable: Bugfix Angebote/Auftraege
-Beim Suchen nach Seriennummern konnte nicht in Angeboten und Auftraegen gesucht werden
---

diff --git a/SL/IC.pm b/SL/IC.pm
index 2a75da20e..b8815cc59 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -1041,7 +1041,7 @@ sub all_parts {
         $ordwhere .= " AND lower(oi.description) LIKE '$var'";
       }
 
-      $flds = qq|p.id, p.partnumber, oi.description, '' AS serialnumber,
+      $flds = qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
                  oi.qty AS onhand, oi.unit, p.bin, oi.sellprice,
 	         p.listprice, p.lastcost, p.rop, p.weight,
 		 p.priceupdate, p.image, p.drawing, p.microfiche,
@@ -1067,7 +1067,7 @@ sub all_parts {
       }
 
       if ($form->{onorder}) {
-        $flds = qq|p.id, p.partnumber, oi.description, '' AS serialnumber,
+        $flds = qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
                    oi.qty * -1 AS onhand, oi.unit, p.bin, oi.sellprice,
 		   p.listprice, p.lastcost, p.rop, p.weight,
 		   p.priceupdate, p.image, p.drawing, p.microfiche,
@@ -1104,7 +1104,7 @@ sub all_parts {
         $quowhere .= " AND lower(oi.description) LIKE '$var'";
       }
 
-      $flds = qq|p.id, p.partnumber, oi.description, '' AS serialnumber,
+      $flds = qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
                  oi.qty AS onhand, oi.unit, p.bin, oi.sellprice,
 	         p.listprice, p.lastcost, p.rop, p.weight,
 		 p.priceupdate, p.image, p.drawing, p.microfiche,
@@ -1130,7 +1130,7 @@ sub all_parts {
       }
 
       if ($form->{rfq}) {
-        $flds = qq|p.id, p.partnumber, oi.description, '' AS serialnumber,
+        $flds = qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
                    oi.qty * -1 AS onhand, oi.unit, p.bin, oi.sellprice,
 		   p.listprice, p.lastcost, p.rop, p.weight,
 		   p.priceupdate, p.image, p.drawing, p.microfiche,