X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Fmoney_time.cgi;h=166735fc6f9d6a7775897b930722f9d253cc9285;hb=64948ee373a03fa156ebc89cb39adfa6d4d2c3d5;hp=c30ff207a9148988adbeda8732d75fe2a03ffd5b;hpb=1f8e84ae7baed672430fd6ba261f7e58e0424a99;p=freeside.git

diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index c30ff207a..166735fc6 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -1,5 +1,5 @@
 <% include('elements/monthly.html',
-                'title'        => $agentname.
+                'title'        => $agentname. $referralname.
                                   'Sales, Credits and Receipts Summary',
                 'items'        => \@items,
                 'labels'       => \%label,
@@ -7,6 +7,7 @@
                 'colors'       => \%color,
                 'links'        => \%link,
                 'agentnum'     => $agentnum,
+                'refnum'       => $refnum,
                 'nototal'      => scalar($cgi->param('12mo')),
              )
 %>
@@ -22,52 +23,86 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
   $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
   die "agentnum $agentnum not found!" unless $agent;
 }
-
 my $agentname = $agent ? $agent->agent.' ' : '';
 
-my @items = qw( invoiced netsales credits payments receipts );
+my( $refnum, $part_referral ) = ('', '');
+if ( $cgi->param('refnum') =~ /^(\d+)$/ ) {
+  $refnum = $1;
+  $part_referral = qsearchs('part_referral', { 'refnum' => $refnum } );
+  die "refnum $refnum not found!" unless $part_referral;
+}
+my $referralname = $part_referral ? $part_referral->referral.' ' : '';
+
+
+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'  => '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'  => '',
- '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;
 
-$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)"
+$label{$_.'_12mo'} = $label{$_}. " (prev 12 months)"
   foreach keys %label;
 
-$graph_label{$_.'_12mo'} = $graph_label{$_}. " (previous 12 months)"
+$graph_label{$_.'_12mo'} = $graph_label{$_}. " (prev 12 months)"
   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
+  'refunds'     => 'ffcc99', #light orange
+  'netrefunds'  => 'ff9900', #orange
+  'cashflow'    => '99cc33', #light olive
+  'netcashflow' => '339900', #olive
 );
 $color{$_.'_12mo'} = $color{$_}
   foreach keys %color;
 
+my $ar = "agentnum=$agentnum;refnum=$refnum";
+
 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?$ar;",
+  'netsales'   => "${p}search/cust_bill.html?$ar;net=1;",
+  'credits'    => "${p}search/cust_credit.html?$ar;",
+  'netcredits' => "${p}search/cust_credit_bill.html?$ar;",
+  'payments'   => "${p}search/cust_pay.html?magic=_date;$ar;",
+  'receipts'   => "${p}search/cust_bill_pay.html?$ar;",
+  'refunds'    => "${p}search/cust_refund.html?magic=_date;$ar;",
+  'netrefunds' => "${p}search/cust_credit_refund.html?$ar;",
 );
 # XXX link 12mo?