reqdate in warensuche/bsooqr/oe mode anzeigen.

PArtieller Fix für Bug 1291.

diff --git a/SL/IC.pm b/SL/IC.pm
index 30aa8cf0d256078ba5f437b7e0d13e89dade3629..dd7c08df18fb7c464ed3e5be03b5a697b02c9b2e 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -799,9 +799,9 @@ sub all_parts {
        ) AS ioi ON ioi.parts_id = p.id|,
     apoe       =>
       q|LEFT JOIN (
-         SELECT id, transdate, 'ir' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation, NULL AS customer_id,         vendor_id, NULL AS deliverydate, 'invoice'    AS ioi FROM ap UNION
-         SELECT id, transdate, 'is' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation,         customer_id, NULL AS vendor_id,         deliverydate, 'invoice'    AS ioi FROM ar UNION
-         SELECT id, transdate, 'oe' AS module, ordnumber, quonumber, NULL AS invnumber,          quotation,         customer_id,         vendor_id, NULL AS deliverydate, 'orderitems' AS ioi FROM oe
+         SELECT id, transdate, 'ir' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation, NULL AS customer_id,         vendor_id,    NULL AS deliverydate, 'invoice'    AS ioi FROM ap UNION
+         SELECT id, transdate, 'is' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation,         customer_id, NULL AS vendor_id,            deliverydate, 'invoice'    AS ioi FROM ar UNION
+         SELECT id, transdate, 'oe' AS module, ordnumber, quonumber, NULL AS invnumber,          quotation,         customer_id,         vendor_id, reqdate AS deliverydate, 'orderitems' AS ioi FROM oe
        ) AS apoe ON ((ioi.trans_id = apoe.id) AND (ioi.ioi = apoe.ioi))|,
     cv         =>
       q|LEFT JOIN (

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index ebdaba52f894cb45900ae10184a63d5e951aac00..965e4bafa6ecf9c7ed525edfbb5e100401171878 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1145,12 +1145,10 @@ sub generate_report {
 
   # special case for lastcost
   if ($form->{ledgerchecks}){
-    # zumindestens für den haken 'gekauft' muss das verhalten
-    # so sein, das der Verkaufspreis nicht angezeigt
-    # wird. In der Backend-Funktion all_parts wird nur mit
-    # price gearbeitet
+    # ledgerchecks don't know about sellprice or lastcost. they just return a
+    # price. so rename sellprice to price, and drop lastcost.
     $column_defs{sellprice}{text} = $locale->text('Price');
-    $form->{l_lastcost} = "" 
+    $form->{l_lastcost} = ""
   }
 
   if ($form->{description}) {