From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 7 Feb 2007 14:18:51 +0000 (+0000)
Subject: Bei UNIONs müssen immer die gleichen Spaltenanzahlen herauskommen. Fix für ein Proble... 
X-Git-Tag: release-2.4.2~133
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=bf915098d722f39573e6ed7bc18cd612a5c4a761;p=kivitendo-erp.git

Bei UNIONs müssen immer die gleichen Spaltenanzahlen herauskommen. Fix für ein Problem, das in 1309 hinzukam; Bug 537.
---

diff --git a/SL/IC.pm b/SL/IC.pm
index 11bf58690..0ccdf89a1 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -1145,7 +1145,7 @@ sub all_parts {
 		 p.priceupdate, p.image, p.drawing, p.microfiche,
 		 pg.partsgroup,
 		 '' AS invnumber, o.ordnumber, o.quonumber, oi.trans_id,
-		 ct.name|;
+		 ct.name, NULL AS deliverydate|;
 
       if ($form->{ordered}) {
         $query .= qq|$union
@@ -1172,7 +1172,7 @@ sub all_parts {
 		   p.priceupdate, p.image, p.drawing, p.microfiche,
 		   pg.partsgroup,
 		   '' AS invnumber, o.ordnumber, o.quonumber, oi.trans_id,
-		   ct.name|;
+		   ct.name, NULL AS deliverydate|;
 
         $query .= qq|$union
 	            SELECT $flds, 'oe' AS module, 'purchase_order' AS type,
@@ -1210,7 +1210,7 @@ sub all_parts {
 		 p.priceupdate, p.image, p.drawing, p.microfiche,
 		 pg.partsgroup,
 		 '' AS invnumber, o.ordnumber, o.quonumber, oi.trans_id,
-		 ct.name|;
+		 ct.name, NULL AS deliverydate|;
 
       if ($form->{quoted}) {
         $query .= qq|$union
@@ -1237,7 +1237,7 @@ sub all_parts {
 		   p.priceupdate, p.image, p.drawing, p.microfiche,
 		   pg.partsgroup,
 		   '' AS invnumber, o.ordnumber, o.quonumber, oi.trans_id,
-		   ct.name|;
+		   ct.name, NULL AS deliverydate|;
 
         $query .= qq|$union
 	            SELECT $flds, 'oe' AS module, 'request_quotation' AS type,