X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Fmoney_time.cgi;h=874f58b095de8b52677dfbf6358af48b02a30a78;hb=02ffd747f8cbc05815c0d96f437c507cfac04ba6;hp=14af0f2465bab67f63b5805e25a2d98e99d3c79a;hpb=654234a526b5447ec02970962cccb1cf879796c8;p=freeside.git
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index 14af0f246..874f58b09 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -12,32 +12,49 @@ my $smonth = $cgi->param('smonth') || $curmon+1;
my $eyear = $cgi->param('eyear') || 1900+$curyear;
my $emonth = $cgi->param('emonth') || $curmon+1;
+#XXX or virtual
+my( $agentnum, $agent ) = ('', '');
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+ $agentnum = $1;
+ $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
+ die "agentnum $agentnum not found!" unless $agent;
+}
+my $agentname = $agent ? $agent->agent.' ' : '';
+warn $agentname;
+
+%>
+
+<%= include('/elements/header.html',
+ $agentname. 'Sales, Credits and Receipts Summary'
+ )
%>
-
-
- Graphing monetary values over time
-
-
<%= 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?agentnum=$agentnum;",
+ 'credits' => "${p}search/cust_credit.html?agentnum=$agentnum;",
+ 'payments' => "${p}search/cust_pay.cgi?magic=_date;agentnum=$agentnum;",
+);
my $report = new FS::Report::Table::Monthly (
'items' => \@items,
@@ -45,10 +62,10 @@ my $report = new FS::Report::Table::Monthly (
'start_year' => $syear,
'end_month' => $emonth,
'end_year' => $eyear,
+ 'agentnum' => $agentnum,
);
my $data = $report->data;
-
my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
%>
@@ -64,9 +81,15 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
<% foreach my $row (@items) { %>
| <%= $label{$row} %> |
+ <% my $link = exists($link{$row})
+ ? qq(
- $<%= sprintf("%.2f", $column) %>
+ <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %>$<%= sprintf("%.2f", $column) %><%= $link ? '' : '' %>
<% } %>
|---|
@@ -107,6 +130,8 @@ From
+for agent: <%= include('/elements/select-agent.html', $agentnum) %>
+