Index: openacs-4/packages/ecommerce/www/admin/orders/revenue-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/revenue-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/orders/revenue-oracle.xql	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/orders/revenue-oracle.xql	12 Sep 2002 03:02:26 -0000	1.3
@@ -22,14 +22,13 @@
           select min(s2.shipment_id) 
           from ec_shipments s2 
           where s2.order_id=mv.order_id) then (
-          select nvl(o.shipping_charged else 0 end-nvl(o.shipping_refunded,0) 
-              from ec_orders o 
-              where o.order_id=mv.order_id),0)),0) as total_shipping_charged,
+          (select nvl(o.shipping_charged,0)-nvl(o.shipping_refunded,0) from
+           ec_orders o where o.order_id=mv.order_id) else 0 end),0)  as total_shipping_charged,
       nvl(sum(bal_tax_charged + case when mv.shipment_id = (
            select min(s2.shipment_id) 
            from ec_shipments s2 where s2.order_id=mv.order_id) then (
-               select nvl(o.shipping_tax_charged else 0 end-nvl(o.shipping_tax_refunded,0) 
-               from ec_orders o where o.order_id=mv.order_id),0)),0) as total_tax_charged
+               select nvl(o.shipping_tax_charged,0)-nvl(o.shipping_tax_refunded,0) from
+               ec_orders o where o.order_id=mv.order_id) else 0 end),0) as total_tax_charged
       from ec_items_money_view mv
       group by to_char(shipment_date,'YYYY'), to_char(shipment_date,'Q')
       order by to_char(shipment_date,'YYYY') || to_char(shipment_date,'Q')