From: Chris Sharp Date: Wed, 28 Sep 2016 17:04:25 +0000 (-0400) Subject: Further modifications... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=bb2b669e17f57e67a3e61191d07f1260bd51f6cb;p=working%2FEvergreen.git Further modifications... Signed-off-by: Chris Sharp --- diff --git a/Open-ILS/src/sql/Pg/example.reporter-extension.sql b/Open-ILS/src/sql/Pg/example.reporter-extension.sql index 3a77ea72f4..910bb3e7e5 100644 --- a/Open-ILS/src/sql/Pg/example.reporter-extension.sql +++ b/Open-ILS/src/sql/Pg/example.reporter-extension.sql @@ -397,10 +397,9 @@ CREATE VIEW reporter.acq_invoice_view AS FROM acq.lineitem_detail acqlid WHERE acqlid.lineitem = li.id AND cancel_reason IS NULL) AS quantity_ordered, - -- this total is from the PO, not the invoice (SELECT sum(estimated_unit_price) FROM acq.lineitem acqli - WHERE acqli.purchase_order = po.id) AS lineitem_total, + WHERE inv_entry.lineitem = acqli.id) AS lineitem_total, li.estimated_unit_price, inv_entry.billed_per_item, inv_entry.cost_billed, @@ -430,13 +429,6 @@ CREATE VIEW reporter.acq_invoice_view AS (SELECT COUNT(*) FROM acq.lineitem acqli WHERE inv_entry.lineitem = acqli.id) AS lineitem_count, - -- this is not working - (SELECT sum(estimated_unit_price) - FROM acq.lineitem acqli - WHERE acqli.purchase_order = po.id) + - (SELECT sum(actual_cost) - FROM acq.invoice_item acqii - WHERE acqii.invoice = inv.id) AS invoice_total FROM acq.invoice inv INNER JOIN acq.provider provider ON (inv.provider = provider.id) INNER JOIN acq.provider shipper ON (inv.shipper = shipper.id)