projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 78019 - Added total revenue line to Package churn report
[freeside.git]
/
httemplate
/
graph
/
elements
/
monthly.html
diff --git
a/httemplate/graph/elements/monthly.html
b/httemplate/graph/elements/monthly.html
index
4b988f1
..
cfe5a3c
100644
(file)
--- a/
httemplate/graph/elements/monthly.html
+++ b/
httemplate/graph/elements/monthly.html
@@
-27,7
+27,7
@@
Example:
'start_year' => $syear,
'end_month' => $emonth,
'end_year' => $eyear,
'start_year' => $syear,
'end_month' => $emonth,
'end_year' => $eyear,
-
+ '12mo' => 0,
#optional, pulled from CGI params if not specified,
#only if 'daily' option is given
#optional, pulled from CGI params if not specified,
#only if 'daily' option is given
@@
-59,6
+59,7
@@
Example:
'no_graph' => \@no_graph,
'bottom_link' => \@bottom_link,
'transpose' => $opt{'daily'},
'no_graph' => \@no_graph,
'bottom_link' => \@bottom_link,
'transpose' => $opt{'daily'},
+ 'sprintf_fields' => $sprintf_fields,
map { $_, $opt{$_} } (qw(title
nototal
graph_type
map { $_, $opt{$_} } (qw(title
nototal
graph_type
@@
-79,6
+80,7
@@
my $fromparam = $opt{'link_fromparam'} || 'begin';
my $toparam = $opt{'link_toparam'} || 'end';
my @items = @{ $opt{'items'} };
my $toparam = $opt{'link_toparam'} || 'end';
my @items = @{ $opt{'items'} };
+my $sprintf_fields = $opt{'sprintf_fields'};
foreach my $other (qw( labels graph_labels colors links )) {
if ( ref($opt{$other}) eq 'HASH' ) {
foreach my $other (qw( labels graph_labels colors links )) {
if ( ref($opt{$other}) eq 'HASH' ) {
@@
-96,6
+98,8
@@
$opt{'start_year'} ||= $cgi->param('start_year'); # || 1899+$curyear;
$opt{'end_month'} ||= $cgi->param('end_month'); # || $curmon+1;
$opt{'end_year'} ||= $cgi->param('end_year'); # || 1900+$curyear;
$opt{'end_month'} ||= $cgi->param('end_month'); # || $curmon+1;
$opt{'end_year'} ||= $cgi->param('end_year'); # || 1900+$curyear;
+$opt{'12mo'} ||= $cgi->param('12mo') ? 1 : 0;
+
$opt{'projection'} ||= $cgi->param('projection') ? 1 : 0;
if ( $opt{'daily'} ) { # daily granularity
$opt{'projection'} ||= $cgi->param('projection') ? 1 : 0;
if ( $opt{'daily'} ) { # daily granularity
@@
-119,6
+123,7
@@
my %reportopts = (
'end_day' => $opt{'end_day'},
'end_month' => $opt{'end_month'},
'end_year' => $opt{'end_year'},
'end_day' => $opt{'end_day'},
'end_month' => $opt{'end_month'},
'end_year' => $opt{'end_year'},
+ '12mo' => $opt{'12mo'},
'projection' => $opt{'projection'},
'agentnum' => $opt{'agentnum'},
'refnum' => $opt{'refnum'},
'projection' => $opt{'projection'},
'agentnum' => $opt{'agentnum'},
'refnum' => $opt{'refnum'},