[freeside-commits] freeside/httemplate/graph money_time.cgi, 1.16.2.2, 1.16.2.3

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	money_time.cgi 
Log Message:
add net credits to sales/credits/receipts report

Index: money_time.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/money_time.cgi,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -d -r1.16.2.2 -r1.16.2.3
--- money_time.cgi	30 Nov 2007 21:08:13 -0000	1.16.2.2
+++ money_time.cgi	14 Mar 2008 07:48:45 -0000	1.16.2.3
@@ -25,25 +25,27 @@
 
 my $agentname = $agent ? $agent->agent.' ' : '';
 
-my @items = qw( invoiced netsales credits payments receipts );
+my @items = qw( invoiced netsales credits netcredits payments receipts );
 if ( $cgi->param('12mo') == 1 ) {
   @items = map $_.'_12mo', @items;
 }
 
 my %label = (
-  'invoiced' => 'Gross Sales',
-  'netsales' => 'Net Sales',
-  'credits'  => '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',
 );
 
 my %graph_suffix = (
- 'invoiced' => ' (invoiced)', 
- 'netsales' => ' (invoiced - applied credits)',
- 'credits'  => '',
- 'payments' => ' (payments)',
- 'receipts' => '/Cashflow (payments - refunds)',
+ 'invoiced'   => ' (invoiced)', 
+ 'netsales'   => ' (invoiced - applied credits)',
+ 'credits'    => ' (credited)',
+ 'netcredits' => ' (applied credits)',
+ 'payments'   => ' (payments)',
+ 'receipts'   => '/Cashflow (payments - refunds)',
 );
 my %graph_label = map { $_ => $label{$_}.$graph_suffix{$_} } keys %label;
 
@@ -54,20 +56,22 @@
   foreach keys %graph_label;
 
 my %color = (
-  'invoiced' => '9999ff', #light blue
-  'netsales' => '0000cc', #blue
-  'credits'  => '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
 );
 $color{$_.'_12mo'} = $color{$_}
   foreach keys %color;
 
 my %link = (
-  'invoiced' => "${p}search/cust_bill.html?agentnum=$agentnum;",
-  'netsales' => "${p}search/cust_bill.html?agentnum=$agentnum;net=1;",
-  'credits'  => "${p}search/cust_credit.html?agentnum=$agentnum;",
-  'payments' => "${p}search/cust_pay.cgi?magic=_date;agentnum=$agentnum;",
+  'invoiced'   => "${p}search/cust_bill.html?agentnum=$agentnum;",
+  'netsales'   => "${p}search/cust_bill.html?agentnum=$agentnum;net=1;",
+  '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;",
 );
 # XXX link 12mo?