[freeside-commits] freeside/httemplate/graph money_time.cgi, 1.19, 1.20

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/graph
In directory wavetail.420.am:/tmp/cvs-serv6670/httemplate/graph

Modified Files:
	money_time.cgi 
Log Message:
make net receipts clickable... and netreceipts != cashflow, really, so separate those concepts, and cashflow gets gross & net variants.  also add gross/net refunds.  #3012

Index: money_time.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/money_time.cgi,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- money_time.cgi	14 Mar 2008 07:48:44 -0000	1.19
+++ money_time.cgi	19 May 2008 04:07:02 -0000	1.20
@@ -25,27 +25,40 @@
 
 my $agentname = $agent ? $agent->agent.' ' : '';
 
-my @items = qw( invoiced netsales credits netcredits payments receipts );
+my @items = qw( invoiced netsales
+                credits  netcredits
+                payments receipts
+                refunds  netrefunds
+                cashflow netcashflow
+              );
 if ( $cgi->param('12mo') == 1 ) {
   @items = map $_.'_12mo', @items;
 }
 
 my %label = (
-  'invoiced'   => 'Gross Sales',
-  'netsales'   => 'Net Sales',
-  'credits'    => 'Gross Credits',
-  'netcredits' => 'Net Credits',
-  'payments'   => 'Gross Receipts',
-  'receipts'   => 'Net Receipts',
+  'invoiced'    => 'Gross Sales',
+  'netsales'    =>   'Net Sales',
+  'credits'     => 'Gross Credits',
+  'netcredits'  =>   'Net Credits',
+  'payments'    => 'Gross Receipts',
+  'receipts'    =>   'Net Receipts',
+  'refunds'     => 'Gross Refunds',
+  'netrefunds'  =>   'Net Refunds',
+  'cashflow'    => 'Gross Cashflow',
+  'netcashflow' =>   'Net Cashflow',
 );
 
 my %graph_suffix = (
- 'invoiced'   => ' (invoiced)', 
- 'netsales'   => ' (invoiced - applied credits)',
- 'credits'    => ' (credited)',
- 'netcredits' => ' (applied credits)',
- 'payments'   => ' (payments)',
- 'receipts'   => '/Cashflow (payments - refunds)',
+ 'invoiced'    => ' (invoiced)', 
+ 'netsales'    => ' (invoiced - applied credits)',
+ 'credits'     => ' (credited)',
+ 'netcredits'  => ' (applied credits)',
+ 'payments'    => ' (payments)',
+ 'receipts'    => ' (applied payments)',
+ 'refunds'     => ' (refunds)',
+ 'netrefunds'  => ' (applied refunds)',
+ 'cashflow'    => ' (payments - refunds)',
+ 'netcashflow' => ' (applied payments - applied refunds)',
 );
 my %graph_label = map { $_ => $label{$_}.$graph_suffix{$_} } keys %label;
 
@@ -56,12 +69,16 @@
   foreach keys %graph_label;
 
 my %color = (
-  'invoiced'   => '9999ff', #light blue
-  'netsales'   => '0000cc', #blue
-  'credits'    => 'ff9999', #light red
-  'netcredits' => 'cc0000', #red
-  'payments'   => '99cc99', #light green
-  'receipts'   => '00cc00', #green
+  'invoiced'    => '9999ff', #light blue
+  'netsales'    => '0000cc', #blue
+  'credits'     => 'ff9999', #light red
+  'netcredits'  => 'cc0000', #red
+  'payments'    => '99cc99', #light green
+  'receipts'    => '00cc00', #green
+  'refunds'     => 'ffcc99', #light orange
+  'netrefunds'  => 'ff9900', #orange
+  'cashflow'    => '99cc33', #light olive
+  'netcashflow' => '339900', #olive
 );
 $color{$_.'_12mo'} = $color{$_}
   foreach keys %color;
@@ -72,6 +89,9 @@
   'credits'    => "${p}search/cust_credit.html?agentnum=$agentnum;",
   'netcredits' => "${p}search/cust_credit_bill.html?agentnum=$agentnum;",
   'payments'   => "${p}search/cust_pay.cgi?magic=_date;agentnum=$agentnum;",
+  'receipts'   => "${p}search/cust_bill_pay.html?agentnum=$agentnum;",
+  'refunds'    => "${p}search/cust_refund.html?magic=_date;agentnum=$agentnum;",
+  'netrefunds' => "${p}search/cust_credit_refund.html?agentnum=$agentnum;",
 );
 # XXX link 12mo?