From dfaabf0c82291f2839922065aa80b2590bab25b0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 2 Nov 2002 00:13:33 +0000
Subject: whew, glad i had a copy of this

---
 httemplate/graph/money_time-graph.cgi | 96 +++++++++++++++++++++++++++++++++++
 httemplate/graph/money_time.cgi       | 43 ++++++++++++++++
 2 files changed, 139 insertions(+)
 create mode 100755 httemplate/graph/money_time-graph.cgi
 create mode 100644 httemplate/graph/money_time.cgi

(limited to 'httemplate/graph')

diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
new file mode 100755
index 000000000..93a80d165
--- /dev/null
+++ b/httemplate/graph/money_time-graph.cgi
@@ -0,0 +1,96 @@
+<%
+
+#find first month
+my $syear = 2001;
+my $smonth = 8;
+
+#find last month
+my $eyear = 2002;
+my $emonth = 11;
+
+my @labels;
+my %data;
+
+while ( $syear < $eyear || ( $syear == $eyear && $smonth < $emonth ) ) {
+  push @labels, "$smonth/$syear";
+
+  my $speriod = timelocal(0,0,0,1,$smonth-1,$syear);
+  if ( ++$smonth == 13 ) { $syear++; $smonth=1; }
+  my $eperiod = timelocal(0,0,0,1,$smonth-1,$syear);
+
+  my $where = "WHERE _date >= $speriod AND _date < $eperiod";
+
+  # Invoiced
+  my $charged_sql = "SELECT SUM(charged) FROM cust_bill $where";
+  my $charged_sth = dbh->prepare($charged_sql) or die dbh->errstr;
+  $charged_sth->execute or die $charged_sth->errstr;
+  my $charged = $charged_sth->fetchrow_arrayref->[0] || 0;
+
+  push @{$data{charged}}, $charged;
+
+  #accounts receivable
+#  my $ar_sql2 = "SELECT SUM(amount) FROM cust_credit $where";
+  my $credited_sql = "SELECT SUM(cust_credit_bill.amount) FROM cust_credit_bill, cust_bill WHERE cust_bill.invnum = cust_credit_bill.invnum AND cust_bill._date >= $speriod AND cust_bill._date < $eperiod";
+  my $credited_sth = dbh->prepare($credited_sql) or die dbh->errstr;
+  $credited_sth->execute or die $credited_sth->errstr;
+  my $credited = $credited_sth->fetchrow_arrayref->[0] || 0;
+
+    #horrible local kludge
+    my $expenses_sql = "SELECT SUM(cust_bill_pkg.setup) FROM cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill._date >= $speriod AND cust_bill._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{ar}}, $charged-$credited-$expenses;
+
+  #deferred revenue
+#  push @{$data{defer}}, '0';
+
+  #cashflow
+  my $paid_sql = "SELECT SUM(paid) FROM cust_pay $where";
+  my $paid_sth = dbh->prepare($paid_sql) or die dbh->errstr;
+  $paid_sth->execute or die $paid_sth->errstr;
+  my $paid = $paid_sth->fetchrow_arrayref->[0] || 0;
+
+  my $refunded_sql = "SELECT SUM(refund) FROM cust_refund $where";
+  my $refunded_sth = dbh->prepare($refunded_sql) or die dbh->errstr;
+  $refunded_sth->execute or die $refunded_sth->errstr;
+  my $refunded = $refunded_sth->fetchrow_arrayref->[0] || 0;
+
+  push @{$data{cash}}, $paid-$refunded;
+
+}
+
+#my $chart = Chart::LinesPoints->new(1024,480);
+my $chart = Chart::LinesPoints->new(768,480);
+
+$chart->set(
+  #'min_val' => 0,
+  'legend' => 'bottom',
+  'legend_labels' => [ #'Invoiced (cust_bill)',
+                       'Accounts receivable (invoices - applied credits)',
+                       #'Deferred revenue',
+                       'Actual cashflow (payments - refunds)' ],
+);
+
+my @data = ( \@labels,
+             #map $data{$_}, qw( ar defer cash )
+             #map $data{$_}, qw( charged ar cash )
+             map $data{$_}, qw( ar cash )
+           );
+
+#my $gd = $chart->plot(\@data);
+#open (IMG, ">i_r_c.png");
+#print IMG $gd->png;
+#close IMG;
+
+#$chart->png("i_r_c.png", \@data);
+
+#$chart->cgi_png(\@data);
+
+http_header('Content-Type' => 'image/png' );
+$Response->{ContentType} = 'image/png';
+
+$chart->_set_colors();
+
+%><%= $chart->scalar_png(\@data) %>
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
new file mode 100644
index 000000000..d6c35434b
--- /dev/null
+++ b/httemplate/graph/money_time.cgi
@@ -0,0 +1,43 @@
+<HTML>
+  <HEAD>
+    <TITLE>Graphing monetary values over time</TITLE>
+  </HEAD>
+<BODY BGCOLOR="#e8e8e8">
+<IMG SRC="money_time-graph.cgi" WIDTH="768" HEIGHT="480">
+<BR>
+<FORM METHOD="POST">
+<INPUT TYPE="checkbox" NAME="ar">
+  Accounts receivable (invoices - applied credits)<BR>
+<INPUT TYPE="checkbox" NAME="charged">
+  Just Invoices<BR>
+<INPUT TYPE="checkbox" NAME="defer">
+  Accounts receivable, with deferred revenue (invoices - applied credits, with charges for annual/semi-annual/quarterly/etc. services deferred over applicable time period) (there has got to be a shorter description for this)<BR>
+<INPUT TYPE="checkbox" NAME="cash">
+  Cashflow (payments - refunds)<BR>
+<BR>
+From <SELECT NAME="smonth">
+<% my @m = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+   foreach my $m ( 1..12 ) { %>
+<OPTION VALUE="<%= $m %>"><%= $m[$m-1] %>
+<% } %>
+</SELECT>
+<SELECT NAME="syear">
+<% foreach my $y ( 1999 .. 2010 ) { %>
+<OPTION VALUE="<%= $y %>"><%= $y %>
+<% } %>
+</SELECT>
+ to <SELECT NAME="emonth">
+<% foreach my $m ( 1..12 ) { %>
+<OPTION VALUE="<%= $m %>"><%= $m[$m-1] %>
+<% } %>
+</SELECT>
+<SELECT NAME="eyear">
+<% foreach my $y ( 1999 .. 2010 ) { %>
+<OPTION VALUE="<%= $y %>"><%= $y %>
+<% } %>
+</SELECT>
+
+<INPUT TYPE="submit" VALUE="Graph">
+</FORM>
+</BODY>
+</HTML>
-- 
cgit v1.2.1


From 6e98f45f5fb306a76bef37c746a6eaf9c9184f88 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Nov 2002 02:15:41 +0000
Subject: local kludge

---
 httemplate/graph/money_time-graph.cgi | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'httemplate/graph')

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;
 
 }
 
-- 
cgit v1.2.1


From d2f7bc5bcdb39f689d4a72946f0728325d0c09c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Nov 2002 05:41:13 +0000
Subject: lala

---
 httemplate/graph/money_time-graph.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/graph')

diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index 32c2d89e3..ca8f6e86b 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -6,7 +6,7 @@ my $smonth = 8;
 
 #find last month
 my $eyear = 2002;
-my $emonth = 11;
+my $emonth = 12;
 
 my @labels;
 my %data;
-- 
cgit v1.2.1


From 7b636e0d0a90e05e37ebe778bde29709f3323813 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 16 Dec 2002 10:47:38 +0000
Subject: working date range selector that defaults to the past year!

---
 httemplate/graph/money_time-graph.cgi | 12 ++++++++----
 httemplate/graph/money_time.cgi       | 26 +++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)

(limited to 'httemplate/graph')

diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index ca8f6e86b..944019a7a 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -1,12 +1,16 @@
 <%
 
+#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+my ($curmon,$curyear) = (localtime(time))[4,5];
+
 #find first month
-my $syear = 2001;
-my $smonth = 8;
+my $syear = $cgi->param('syear') || 1899+$curyear;
+my $smonth = $cgi->param('smonth') || $curmon+1;
 
 #find last month
-my $eyear = 2002;
-my $emonth = 12;
+my $eyear = $cgi->param('eyear') || 1900+$curyear;
+my $emonth = $cgi->param('emonth') || $curmon+1;
+if ( $emonth++>12 ) { $emonth-=12; $eyear++; }
 
 my @labels;
 my %data;
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index d6c35434b..e24157ccb 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -1,9 +1,25 @@
+<!-- mason kludge %>
+<%
+
+#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+my ($curmon,$curyear) = (localtime(time))[4,5];
+
+#find first month
+my $syear = $cgi->param('syear') || 1899+$curyear;
+my $smonth = $cgi->param('smonth') || $curmon+1;
+
+#find last month
+my $eyear = $cgi->param('eyear') || 1900+$curyear;
+my $emonth = $cgi->param('emonth') || $curmon+1;
+
+%>
+
 <HTML>
   <HEAD>
     <TITLE>Graphing monetary values over time</TITLE>
   </HEAD>
 <BODY BGCOLOR="#e8e8e8">
-<IMG SRC="money_time-graph.cgi" WIDTH="768" HEIGHT="480">
+<IMG SRC="money_time-graph.cgi?<%= $cgi->query_string %>" WIDTH="768" HEIGHT="480">
 <BR>
 <FORM METHOD="POST">
 <INPUT TYPE="checkbox" NAME="ar">
@@ -18,22 +34,22 @@
 From <SELECT NAME="smonth">
 <% my @m = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
    foreach my $m ( 1..12 ) { %>
-<OPTION VALUE="<%= $m %>"><%= $m[$m-1] %>
+<OPTION VALUE="<%= $m %>"<%= $m == $smonth ? ' SELECTED' : '' %>><%= $m[$m-1] %>
 <% } %>
 </SELECT>
 <SELECT NAME="syear">
 <% foreach my $y ( 1999 .. 2010 ) { %>
-<OPTION VALUE="<%= $y %>"><%= $y %>
+<OPTION VALUE="<%= $y %>"<%= $y == $syear ? ' SELECTED' : '' %>><%= $y %>
 <% } %>
 </SELECT>
  to <SELECT NAME="emonth">
 <% foreach my $m ( 1..12 ) { %>
-<OPTION VALUE="<%= $m %>"><%= $m[$m-1] %>
+<OPTION VALUE="<%= $m %>"<%= $m == $emonth ? ' SELECTED' : '' %>><%= $m[$m-1] %>
 <% } %>
 </SELECT>
 <SELECT NAME="eyear">
 <% foreach my $y ( 1999 .. 2010 ) { %>
-<OPTION VALUE="<%= $y %>"><%= $y %>
+<OPTION VALUE="<%= $y %>"<%= $y == $eyear ? ' SELECTED' : '' %>><%= $y %>
 <% } %>
 </SELECT>
 
-- 
cgit v1.2.1


From ef7bb336cc67f127fb1d77532ad3da1369c0ae36 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 8 Aug 2003 02:02:41 +0000
Subject: - fix Mason profiling to pass-through images (for graph/) - fix
 graph/money-time.cgi use of $m interfering with Mason - fix
 graph/money-time-graph.cgi to set content-type in a Mason/ASP-independant  
 fashion - (beginning of) includes! - (beginning of) moving SQL search to
 including generic elements/search.html - fix global.asa typo - fix masonize
 to not prepend an extraneous blank line (breaking  
 graph/money-time-graph.cgi)

---
 httemplate/graph/money_time-graph.cgi | 14 +++++++-------
 httemplate/graph/money_time.cgi       | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'httemplate/graph')

diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index 944019a7a..76f1bd7bd 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -62,14 +62,14 @@ while ( $syear < $eyear || ( $syear == $eyear && $smonth < $emonth ) ) {
   my $refunded = $refunded_sth->fetchrow_arrayref->[0] || 0;
 
     #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_sql2 = "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;
+#    my $expenses_sql2 = "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_sth2 = dbh->prepare($expenses_sql2) or die dbh->errstr;
+    $expenses_sth2->execute or die $expenses_sth2->errstr;
+    my $expenses2 = $expenses_sth2->fetchrow_arrayref->[0] || 0;
 
-  push @{$data{cash}}, $paid-$refunded-$expenses;
+  push @{$data{cash}}, $paid-$refunded-$expenses2;
 
 }
 
@@ -101,7 +101,7 @@ my @data = ( \@labels,
 #$chart->cgi_png(\@data);
 
 http_header('Content-Type' => 'image/png' );
-$Response->{ContentType} = 'image/png';
+#$Response->{ContentType} = 'image/png';
 
 $chart->_set_colors();
 
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index e24157ccb..de8f6ee0c 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -1,4 +1,4 @@
-<!-- mason kludge %>
+<!-- mason kludge -->
 <%
 
 #my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
@@ -32,9 +32,9 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
   Cashflow (payments - refunds)<BR>
 <BR>
 From <SELECT NAME="smonth">
-<% my @m = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
-   foreach my $m ( 1..12 ) { %>
-<OPTION VALUE="<%= $m %>"<%= $m == $smonth ? ' SELECTED' : '' %>><%= $m[$m-1] %>
+<% my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); %>
+<% foreach my $mon ( 1..12 ) { %>
+<OPTION VALUE="<%= $mon %>"<%= $mon == $smonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
 <% } %>
 </SELECT>
 <SELECT NAME="syear">
@@ -43,8 +43,8 @@ From <SELECT NAME="smonth">
 <% } %>
 </SELECT>
  to <SELECT NAME="emonth">
-<% foreach my $m ( 1..12 ) { %>
-<OPTION VALUE="<%= $m %>"<%= $m == $emonth ? ' SELECTED' : '' %>><%= $m[$m-1] %>
+<% foreach my $mon ( 1..12 ) { %>
+<OPTION VALUE="<%= $mon %>"<%= $mon == $emonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
 <% } %>
 </SELECT>
 <SELECT NAME="eyear">
-- 
cgit v1.2.1


From 654234a526b5447ec02970962cccb1cf879796c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Mar 2004 14:34:24 +0000
Subject: beginning of OO reporting interface, create acadia-requested crosstab
 reports

---
 httemplate/graph/money_time-graph.cgi | 116 +++++++++++-----------------------
 httemplate/graph/money_time.cgi       |  60 +++++++++++++++++-
 2 files changed, 94 insertions(+), 82 deletions(-)

(limited to 'httemplate/graph')

diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index 76f1bd7bd..55e8982b4 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -10,98 +10,56 @@ my $smonth = $cgi->param('smonth') || $curmon+1;
 #find last month
 my $eyear = $cgi->param('eyear') || 1900+$curyear;
 my $emonth = $cgi->param('emonth') || $curmon+1;
-if ( $emonth++>12 ) { $emonth-=12; $eyear++; }
+#if ( $emonth++>12 ) { $emonth-=12; $eyear++; }
 
-my @labels;
-my %data;
+#my @labels;
+#my %data;
 
-while ( $syear < $eyear || ( $syear == $eyear && $smonth < $emonth ) ) {
-  push @labels, "$smonth/$syear";
-
-  my $speriod = timelocal(0,0,0,1,$smonth-1,$syear);
-  if ( ++$smonth == 13 ) { $syear++; $smonth=1; }
-  my $eperiod = timelocal(0,0,0,1,$smonth-1,$syear);
-
-  my $where = "WHERE _date >= $speriod AND _date < $eperiod";
-
-  # Invoiced
-  my $charged_sql = "SELECT SUM(charged) FROM cust_bill $where";
-  my $charged_sth = dbh->prepare($charged_sql) or die dbh->errstr;
-  $charged_sth->execute or die $charged_sth->errstr;
-  my $charged = $charged_sth->fetchrow_arrayref->[0] || 0;
-
-  push @{$data{charged}}, $charged;
-
-  #accounts receivable
-#  my $ar_sql2 = "SELECT SUM(amount) FROM cust_credit $where";
-  my $credited_sql = "SELECT SUM(cust_credit_bill.amount) FROM cust_credit_bill, cust_bill WHERE cust_bill.invnum = cust_credit_bill.invnum AND cust_bill._date >= $speriod AND cust_bill._date < $eperiod";
-  my $credited_sth = dbh->prepare($credited_sql) or die dbh->errstr;
-  $credited_sth->execute or die $credited_sth->errstr;
-  my $credited = $credited_sth->fetchrow_arrayref->[0] || 0;
-
-    #horrible local kludge
-    my $expenses_sql = "SELECT SUM(cust_bill_pkg.setup) FROM cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill._date >= $speriod AND cust_bill._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{ar}}, $charged-$credited-$expenses;
-
-  #deferred revenue
-#  push @{$data{defer}}, '0';
-
-  #cashflow
-  my $paid_sql = "SELECT SUM(paid) FROM cust_pay $where";
-  my $paid_sth = dbh->prepare($paid_sql) or die dbh->errstr;
-  $paid_sth->execute or die $paid_sth->errstr;
-  my $paid = $paid_sth->fetchrow_arrayref->[0] || 0;
-
-  my $refunded_sql = "SELECT SUM(refund) FROM cust_refund $where";
-  my $refunded_sth = dbh->prepare($refunded_sql) or die dbh->errstr;
-  $refunded_sth->execute or die $refunded_sth->errstr;
-  my $refunded = $refunded_sth->fetchrow_arrayref->[0] || 0;
-
-    #horrible local kludge that doesn't even really work right
-    my $expenses_sql2 = "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_sql2 = "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_sth2 = dbh->prepare($expenses_sql2) or die dbh->errstr;
-    $expenses_sth2->execute or die $expenses_sth2->errstr;
-    my $expenses2 = $expenses_sth2->fetchrow_arrayref->[0] || 0;
-
-  push @{$data{cash}}, $paid-$refunded-$expenses2;
+my @items = qw( invoiced netsales credits receipts );
+my %label = (
+ 'invoiced' => 'Gross Sales (invoiced)', 
+ 'netsales' => 'Net Sales (invoiced - applied credits)',
+ 'credits'  => 'Credits',
+ 'receipts' => 'Receipts/Cashflow (payments - refunds)',
+);
+my %color = (
+  'invoiced' => [ 153, 153, 255 ], #light blue
+  'netsales' => [   0,   0, 204 ], #blue
+  'credits'  => [ 204,   0,   0 ], #red
+  'receipts' => [   0, 204,   0 ], #green
+);
 
-}
+my $report = new FS::Report::Table::Monthly (
+  'items' => \@items,
+  'start_month' => $smonth,
+  'start_year'  => $syear,
+  'end_month'   => $emonth,
+  'end_year'    => $eyear,
+);
+my %data = %{$report->data};
 
 #my $chart = Chart::LinesPoints->new(1024,480);
-my $chart = Chart::LinesPoints->new(768,480);
+#my $chart = Chart::LinesPoints->new(768,480);
+my $chart = Chart::LinesPoints->new(976,384);
 
+my $d = 0;
 $chart->set(
   #'min_val' => 0,
   'legend' => 'bottom',
-  'legend_labels' => [ #'Invoiced (cust_bill)',
-                       'Accounts receivable (invoices - applied credits)',
-                       #'Deferred revenue',
-                       'Actual cashflow (payments - refunds)' ],
+  'colors' => { ( map { 'dataset'.$d++ => $color{$_} } @items ),
+                #'grey_background' => [ 211, 211, 211 ],
+                'grey_background' => 'white',
+                'background' => [ 0xe8, 0xe8, 0xe8 ], #grey
+              },
+  #'grey_background' => 'false',
+  'legend_labels' => [ map { $label{$_} } @items ],
+  'brush_size' => 4,
+  #'pt_size' => 12,
 );
 
-my @data = ( \@labels,
-             #map $data{$_}, qw( ar defer cash )
-             #map $data{$_}, qw( charged ar cash )
-             map $data{$_}, qw( ar cash )
-           );
-
-#my $gd = $chart->plot(\@data);
-#open (IMG, ">i_r_c.png");
-#print IMG $gd->png;
-#close IMG;
-
-#$chart->png("i_r_c.png", \@data);
-
-#$chart->cgi_png(\@data);
+my @data = map { $data{$_} } ( 'label', @items );
 
 http_header('Content-Type' => 'image/png' );
-#$Response->{ContentType} = 'image/png';
 
 $chart->_set_colors();
 
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index de8f6ee0c..14af0f246 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -19,9 +19,63 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
     <TITLE>Graphing monetary values over time</TITLE>
   </HEAD>
 <BODY BGCOLOR="#e8e8e8">
-<IMG SRC="money_time-graph.cgi?<%= $cgi->query_string %>" WIDTH="768" HEIGHT="480">
+<IMG SRC="money_time-graph.cgi?<%= $cgi->query_string %>" WIDTH="976" HEIGHT="384">
+<BR>
+
+<%= table('e8e8e8') %>
+<%
+
+my @items = qw( invoiced netsales credits receipts );
+my %label = (
+  'invoiced' => 'Gross Sales',
+  'netsales' => 'Net Sales',
+  'credits'  => 'Credits',
+  'receipts' => 'Receipts',
+);
+my %color = (
+  'invoiced' => '9999ff', #light blue
+  'netsales' => '0000cc', #blue
+  'credits'  => 'cc0000', #red
+  'receipts' => '00cc00', #green
+);
+
+my $report = new FS::Report::Table::Monthly (
+  'items' => \@items,
+  'start_month' => $smonth,
+  'start_year'  => $syear,
+  'end_month'   => $emonth,
+  'end_year'    => $eyear,
+);
+my $data = $report->data;
+
+
+my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+
+%>
+
+<TR><TD></TD>
+<% foreach my $column ( @{$data->{label}} ) {
+     #$column =~ s/^(\d+)\//$mon[$1-1]<BR>/e;
+     $column =~ s/^(\d+)\//$mon[$1-1]<BR>/;
+     %>
+     <TH><%= $column %></TH>
+<% } %>
+</TR>
+
+<% foreach my $row (@items) { %>
+  <TR><TH><FONT COLOR="#<%= $color{$row} %>"><%= $label{$row} %></FONT></TH>
+  <% foreach my $column ( @{$data->{$row}} ) { %>
+    <TD ALIGN="right" BGCOLOR="#ffffff">
+      <FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $column) %></FONT>
+    </TD>
+  <% } %>
+  </TR>
+<% } %>
+</TABLE>
+
 <BR>
 <FORM METHOD="POST">
+<!--
 <INPUT TYPE="checkbox" NAME="ar">
   Accounts receivable (invoices - applied credits)<BR>
 <INPUT TYPE="checkbox" NAME="charged">
@@ -31,8 +85,8 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
 <INPUT TYPE="checkbox" NAME="cash">
   Cashflow (payments - refunds)<BR>
 <BR>
+-->
 From <SELECT NAME="smonth">
-<% my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); %>
 <% foreach my $mon ( 1..12 ) { %>
 <OPTION VALUE="<%= $mon %>"<%= $mon == $smonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
 <% } %>
@@ -53,7 +107,7 @@ From <SELECT NAME="smonth">
 <% } %>
 </SELECT>
 
-<INPUT TYPE="submit" VALUE="Graph">
+<INPUT TYPE="submit" VALUE="Redisplay">
 </FORM>
 </BODY>
 </HTML>
-- 
cgit v1.2.1


From c13536bec93ca007d6b339dfbc7edc81ae58c082 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Mar 2004 12:11:58 +0000
Subject: fix title

---
 httemplate/graph/money_time.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/graph')

diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index 14af0f246..e5903168d 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -16,7 +16,7 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
 
 <HTML>
   <HEAD>
-    <TITLE>Graphing monetary values over time</TITLE>
+    <TITLE>Sales, Credits and Receipts Summary</TITLE>
   </HEAD>
 <BODY BGCOLOR="#e8e8e8">
 <IMG SRC="money_time-graph.cgi?<%= $cgi->query_string %>" WIDTH="976" HEIGHT="384">
-- 
cgit v1.2.1


From 87227cd405166484ca7b791b2bd3c8829ce8d969 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Apr 2004 12:19:40 +0000
Subject: credit report, add some links to sales/credits/receipts summary, move
 payment search to template

---
 httemplate/graph/money_time-graph.cgi |  6 ++++--
 httemplate/graph/money_time.cgi       | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'httemplate/graph')

diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index 55e8982b4..bb3d23aae 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -15,17 +15,19 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
 #my @labels;
 #my %data;
 
-my @items = qw( invoiced netsales credits receipts );
+my @items = qw( invoiced netsales credits payments receipts );
 my %label = (
  'invoiced' => 'Gross Sales (invoiced)', 
  'netsales' => 'Net Sales (invoiced - applied credits)',
  'credits'  => 'Credits',
- 'receipts' => 'Receipts/Cashflow (payments - refunds)',
+ 'payments' => 'Gross Receipts (payments)',
+ 'receipts' => 'Net Receipts/Cashflow (payments - refunds)',
 );
 my %color = (
   'invoiced' => [ 153, 153, 255 ], #light blue
   'netsales' => [   0,   0, 204 ], #blue
   'credits'  => [ 204,   0,   0 ], #red
+  'payments' => [ 153, 204, 153 ], #light green
   'receipts' => [   0, 204,   0 ], #green
 );
 
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index e5903168d..1c7d54266 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -25,19 +25,26 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
 <%= table('e8e8e8') %>
 <%
 
-my @items = qw( invoiced netsales credits receipts );
+my @items = qw( invoiced netsales credits payments receipts );
 my %label = (
   'invoiced' => 'Gross Sales',
   'netsales' => 'Net Sales',
   'credits'  => 'Credits',
-  'receipts' => 'Receipts',
+  'payments' => 'Gross Receipts',
+  'receipts' => 'Net Receipts',
 );
 my %color = (
   'invoiced' => '9999ff', #light blue
   'netsales' => '0000cc', #blue
   'credits'  => 'cc0000', #red
+  'payments' => '99cc99', #light green
   'receipts' => '00cc00', #green
 );
+my %link = (
+  'invoiced' => "${p}search/cust_bill.html?",
+  'credits'  => "${p}search/cust_credit.html?",
+  'payments' => "${p}search/cust_pay.cgi?magic=_date;",
+);
 
 my $report = new FS::Report::Table::Monthly (
   'items' => \@items,
@@ -48,7 +55,6 @@ my $report = new FS::Report::Table::Monthly (
 );
 my $data = $report->data;
 
-
 my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 
 %>
@@ -64,9 +70,15 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 
 <% foreach my $row (@items) { %>
   <TR><TH><FONT COLOR="#<%= $color{$row} %>"><%= $label{$row} %></FONT></TH>
+  <% my $link = exists($link{$row})
+       ? qq(<A HREF="$link{$row})
+       : '';
+     my @speriod = @{$data->{speriod}};
+     my @eperiod = @{$data->{eperiod}};
+  %>
   <% foreach my $column ( @{$data->{$row}} ) { %>
     <TD ALIGN="right" BGCOLOR="#ffffff">
-      <FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $column) %></FONT>
+      <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $column) %></FONT><%= $link ? '</A>' : '' %>
     </TD>
   <% } %>
   </TR>
-- 
cgit v1.2.1