From 6e98f45f5fb306a76bef37c746a6eaf9c9184f88 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 5 Nov 2002 02:15:41 +0000 Subject: [PATCH] local kludge --- httemplate/graph/money_time-graph.cgi | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi index 93a80d165..32c2d89e3 100755 --- a/httemplate/graph/money_time-graph.cgi +++ b/httemplate/graph/money_time-graph.cgi @@ -57,7 +57,15 @@ while ( $syear < $eyear || ( $syear == $eyear && $smonth < $emonth ) ) { $refunded_sth->execute or die $refunded_sth->errstr; my $refunded = $refunded_sth->fetchrow_arrayref->[0] || 0; - push @{$data{cash}}, $paid-$refunded; + #horrible local kludge that doesn't even really work right + my $expenses_sql = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND 0 < ( select count(*) from cust_bill_pkg, cust_pkg, part_pkg WHERE cust_bill.invnum = cust_bill_pkg.invnum AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%' )"; + +# my $expenses_sql = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%'"; + my $expenses_sth = dbh->prepare($expenses_sql) or die dbh->errstr; + $expenses_sth->execute or die $expenses_sth->errstr; + my $expenses = $expenses_sth->fetchrow_arrayref->[0] || 0; + + push @{$data{cash}}, $paid-$refunded-$expenses; } -- 2.11.0