X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Fmoney_time-graph.cgi;h=fc8207a81dcbeb630eef201380b9b8c574e9189f;hb=02ffd747f8cbc05815c0d96f437c507cfac04ba6;hp=55e8982b452b085a93ea023bf17c08d880964c03;hpb=eb9668a6f3181ee02cb335272c5ee4616e61fd09;p=freeside.git diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi index 55e8982b4..fc8207a81 100755 --- a/httemplate/graph/money_time-graph.cgi +++ b/httemplate/graph/money_time-graph.cgi @@ -12,20 +12,28 @@ my $eyear = $cgi->param('eyear') || 1900+$curyear; my $emonth = $cgi->param('emonth') || $curmon+1; #if ( $emonth++>12 ) { $emonth-=12; $eyear++; } +# XXX or virtual +my $agentnum = ''; +if ( $cgi->param('agentnum') =~ /^(\d*)$/ ) { + $agentnum = $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 ); @@ -35,6 +43,7 @@ my $report = new FS::Report::Table::Monthly ( 'start_year' => $syear, 'end_month' => $emonth, 'end_year' => $eyear, + 'agentnum' => $agentnum, ); my %data = %{$report->data};