X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Fmoney_time.cgi;h=73f9d23a23b626cadd19dafa5f6099ce84b99245;hb=f29c752d6f9e813c10295b334eefb924216e34cf;hp=1c7d54266c04d59e6ea6726b2374ab404438b235;hpb=2041a9143fac20b79ead4a1ae01224dedf5b27c2;p=freeside.git
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index 1c7d54266..73f9d23a2 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -1,24 +1,31 @@
-
<%
-#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-my ($curmon,$curyear) = (localtime(time))[4,5];
+# #my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+# my ($curmon,$curyear) = (localtime(time))[4,5];
#find first month
-my $syear = $cgi->param('syear') || 1899+$curyear;
-my $smonth = $cgi->param('smonth') || $curmon+1;
+my $syear = $cgi->param('syear'); # || 1899+$curyear;
+my $smonth = $cgi->param('smonth'); # || $curmon+1;
#find last month
-my $eyear = $cgi->param('eyear') || 1900+$curyear;
-my $emonth = $cgi->param('emonth') || $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.' ' : '';
+
+%>
+<%= include('/elements/header.html',
+ $agentname. 'Sales, Credits and Receipts Summary'
+ )
%>
-
-
- Sales, Credits and Receipts Summary
-
-
@@ -26,6 +33,10 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
<%
my @items = qw( invoiced netsales credits payments receipts );
+if ( $cgi->param('12mo') == 1 ) {
+ @items = map $_.'_12mo', @items;
+}
+
my %label = (
'invoiced' => 'Gross Sales',
'netsales' => 'Net Sales',
@@ -33,6 +44,9 @@ my %label = (
'payments' => 'Gross Receipts',
'receipts' => 'Net Receipts',
);
+$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)"
+ foreach keys %label;
+
my %color = (
'invoiced' => '9999ff', #light blue
'netsales' => '0000cc', #blue
@@ -40,11 +54,15 @@ my %color = (
'payments' => '99cc99', #light green
'receipts' => '00cc00', #green
);
+$color{$_.'_12mo'} = $color{$_}
+ foreach keys %color;
+
my %link = (
- 'invoiced' => "${p}search/cust_bill.html?",
- 'credits' => "${p}search/cust_credit.html?",
- 'payments' => "${p}search/cust_pay.cgi?magic=_date;",
+ '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;",
);
+# XXX link 12mo?
my $report = new FS::Report::Table::Monthly (
'items' => \@items,
@@ -52,6 +70,7 @@ my $report = new FS::Report::Table::Monthly (
'start_year' => $syear,
'end_month' => $emonth,
'end_year' => $eyear,
+ 'agentnum' => $agentnum,
);
my $data = $report->data;
@@ -66,6 +85,7 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
%>
<%= $column %> |
<% } %>
+ Total |
<% foreach my $row (@items) { %>
@@ -75,51 +95,19 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
: '';
my @speriod = @{$data->{speriod}};
my @eperiod = @{$data->{eperiod}};
+ my $total = 0;
%>
<% foreach my $column ( @{$data->{$row}} ) { %>
<%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %>$<%= sprintf("%.2f", $column) %><%= $link ? '' : '' %>
|
+ <% $total += $column; %>
<% } %>
+
+ <%= $link ? $link. 'begin='. @{$data->{speriod}}[0]. ';end='. @{$data->{eperiod}}[-1]. '">' : '' %>$<%= sprintf("%.2f", $total) %><%= $link ? '' : '' %>
+ |
<% } %>
-
-
-
-
+<%= include('/elements/footer.html') %>