From a1c4f3ced1a73e63c94377051edbe32462eb521a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Fri, 5 Mar 2010 11:25:33 +0100 Subject: [PATCH] reqdate in warensuche/bsooqr/oe mode anzeigen. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit PArtieller Fix für Bug 1291. --- SL/IC.pm | 6 +++--- bin/mozilla/ic.pl | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/SL/IC.pm b/SL/IC.pm index 30aa8cf0d..dd7c08df1 100644 --- 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 ebdaba52f..965e4bafa 100644 --- 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}) { -- 2.20.1