X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Fmoney_time.cgi;h=73f9d23a23b626cadd19dafa5f6099ce84b99245;hb=f29c752d6f9e813c10295b334eefb924216e34cf;hp=bc789cb7e83cf91401836f7188a6770f921d4acd;hpb=aa9fd844aeeb385cfc1e934eb7b7a08b1353a4ea;p=freeside.git
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index bc789cb7e..73f9d23a2 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -1,16 +1,15 @@
-
<%
-#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 ) = ('', '');
@@ -20,10 +19,8 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
die "agentnum $agentnum not found!" unless $agent;
}
my $agentname = $agent ? $agent->agent.' ' : '';
-warn $agentname;
%>
-
<%= include('/elements/header.html',
$agentname. 'Sales, Credits and Receipts Summary'
)
@@ -36,6 +33,10 @@ warn $agentname;
<%
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',
@@ -43,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
@@ -50,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?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,
@@ -102,43 +110,4 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
<% } %>
-
-