Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / httemplate / graph / elements / monthly.html

diff --git a/httemplate/graph/elements/monthly.html b/httemplate/graph/elements/monthly.html
index 072798c..839a387 100644 (file)
--- a/httemplate/graph/elements/monthly.html
+++ b/httemplate/graph/elements/monthly.html
@@ -35,6 +35,7 @@ Example:
 
     #optional
     'agentnum'        => $agentnum,
+    'refnum'          => $refnum,
     'nototal'         => 1,
     'graph_type'      => 'LinesPoints',
     'remove_empty'    => 1,
@@ -92,10 +93,7 @@ $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;
 
-#find end of projection
-$opt{'project_month'} ||= $cgi->param('project_month') || 0;
-$opt{'project_year'}  ||= $cgi->param('project_year') || 0;
-# setting these to zero prevents projection on reports that don't support it
+$opt{'projection'} ||= $cgi->param('projection') ? 1 : 0;
 
 if ( $opt{'daily'} ) { # daily granularity
     $opt{'start_day'} ||= $cgi->param('start_day');
@@ -118,10 +116,9 @@ my %reportopts = (
       'end_day'      => $opt{'end_day'},
       'end_month'    => $opt{'end_month'},
       'end_year'     => $opt{'end_year'},
-      'project_day'    => $opt{'project_day'},
-      'project_month'  => $opt{'project_month'},
-      'project_year'   => $opt{'project_year'},
+      'projection'   => $opt{'projection'},
       'agentnum'     => $opt{'agentnum'},
+      'refnum'       => $opt{'refnum'},
       'remove_empty' => $opt{'remove_empty'},
       'doublemonths' => $opt{'doublemonths'},
 );