Will things ever be the same again?

It's the final masonize

5 files changed, 336 insertions, 333 deletions

diff --git a/httemplate/graph/cust_bill_pkg.cgi b/httemplate/graph/cust_bill_pkg.cgi
index acd39b025..ea5ae0b2b 100644
--- a/httemplate/graph/cust_bill_pkg.cgi
+++ b/httemplate/graph/cust_bill_pkg.cgi
@@ -1,103 +1,104 @@
-<%
-
-
-#find first month
-my $syear = $cgi->param('start_year'); # || 1899+$curyear;
-my $smonth = $cgi->param('start_month'); # || $curmon+1;
-
-#find last month
-my $eyear = $cgi->param('end_year'); # || 1900+$curyear;
-my $emonth = $cgi->param('end_month'); # || $curmon+1;
-
-#XXX or virtual
-my( $agentnum, $sel_agent ) = ('', '');
-if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-  $agentnum = $1;
-  $sel_agent = qsearchs('agent', { 'agentnum' => $agentnum } );
-  die "agentnum $agentnum not found!" unless $sel_agent;
-}
-my $title = $sel_agent ? $sel_agent->agent.' ' : '';
-
-#false lazinessish w/search/cust_pkg.cgi
-my $classnum = 0;
-my @pkg_class = ();
-if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
-  $classnum = $1;
-  if ( $classnum ) {
-    @pkg_class = ( qsearchs('pkg_class', { 'classnum' => $classnum } ) );
-    die "classnum $classnum not found!" unless $pkg_class[0];
-    $title .= $pkg_class[0]->classname.' ';
-  } elsif ( $classnum eq '' ) {
-    $title .= 'Empty class ';
-    @pkg_class = ( '(empty class)' );
-  } elsif ( $classnum eq '0' ) {
-    @pkg_class = qsearch('pkg_class', {} ); # { 'disabled' => '' } );
-    push @pkg_class, '(empty class)';
-  }
-}
-#eslaf
-
-my $hue = 0;
-#my $hue_increment = 170;
-#my $hue_increment = 145;
-my $hue_increment = 125;
-
-my @items  = ();
-my @params = ();
-my @labels = ();
-my @colors = ();
-my @links  = ();
-
-my $link = "${p}search/cust_bill_pkg.cgi?nottax=1;include_comp_cust=1";
-
-foreach my $agent ( $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
-
-  my $col_scheme = Color::Scheme->new
-                     ->from_hue($hue) #->from_hex($agent->color)
-                     ->scheme('analogic')
-                   ;
-  my @recur_colors = ();
-  my @onetime_colors = ();
-
-  ### fixup the color handling for package classes...
-  my $n = 0;
-
-  foreach my $pkg_class ( @pkg_class ) {
-
-    push @items, 'cust_bill_pkg';
-
-
-    push @labels,
-      ( $sel_agent ? '' : $agent->agent.' ' ).
-      ( $classnum eq '0'
-          ? ( ref($pkg_class) ? $pkg_class->classname : $pkg_class ) 
-          : ''
-      );
-
-    my $row_classnum = ref($pkg_class) ? $pkg_class->classnum : 0;
-    my $row_agentnum = $agent->agentnum;
-    push @params, [ 'classnum' => $row_classnum,
-                    'agentnum' => $row_agentnum,
-                  ];
-
-    push @links, "$link;agentnum=$row_agentnum;classnum=$row_classnum;";
-
-    @recur_colors = ($col_scheme->colors)[0,4,8,1,5,9]
-      unless @recur_colors;
-    @onetime_colors = ($col_scheme->colors)[2,6,10,3,7,11]
-      unless @onetime_colors;
-    push @colors, shift @recur_colors;
-
-  }
-
-  $hue += $hue_increment;
-
-}
-
-#use Data::Dumper;
-#warn Dumper(\@items);
-
-%><%= include('elements/monthly.html',
+%
+%
+%
+%#find first month
+%my $syear = $cgi->param('start_year'); # || 1899+$curyear;
+%my $smonth = $cgi->param('start_month'); # || $curmon+1;
+%
+%#find last month
+%my $eyear = $cgi->param('end_year'); # || 1900+$curyear;
+%my $emonth = $cgi->param('end_month'); # || $curmon+1;
+%
+%#XXX or virtual
+%my( $agentnum, $sel_agent ) = ('', '');
+%if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+%  $agentnum = $1;
+%  $sel_agent = qsearchs('agent', { 'agentnum' => $agentnum } );
+%  die "agentnum $agentnum not found!" unless $sel_agent;
+%}
+%my $title = $sel_agent ? $sel_agent->agent.' ' : '';
+%
+%#false lazinessish w/search/cust_pkg.cgi
+%my $classnum = 0;
+%my @pkg_class = ();
+%if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
+%  $classnum = $1;
+%  if ( $classnum ) {
+%    @pkg_class = ( qsearchs('pkg_class', { 'classnum' => $classnum } ) );
+%    die "classnum $classnum not found!" unless $pkg_class[0];
+%    $title .= $pkg_class[0]->classname.' ';
+%  } elsif ( $classnum eq '' ) {
+%    $title .= 'Empty class ';
+%    @pkg_class = ( '(empty class)' );
+%  } elsif ( $classnum eq '0' ) {
+%    @pkg_class = qsearch('pkg_class', {} ); # { 'disabled' => '' } );
+%    push @pkg_class, '(empty class)';
+%  }
+%}
+%#eslaf
+%
+%my $hue = 0;
+%#my $hue_increment = 170;
+%#my $hue_increment = 145;
+%my $hue_increment = 125;
+%
+%my @items  = ();
+%my @params = ();
+%my @labels = ();
+%my @colors = ();
+%my @links  = ();
+%
+%my $link = "${p}search/cust_bill_pkg.cgi?nottax=1;include_comp_cust=1";
+%
+%foreach my $agent ( $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
+%
+%  my $col_scheme = Color::Scheme->new
+%                     ->from_hue($hue) #->from_hex($agent->color)
+%                     ->scheme('analogic')
+%                   ;
+%  my @recur_colors = ();
+%  my @onetime_colors = ();
+%
+%  ### fixup the color handling for package classes...
+%  my $n = 0;
+%
+%  foreach my $pkg_class ( @pkg_class ) {
+%
+%    push @items, 'cust_bill_pkg';
+%
+%
+%    push @labels,
+%      ( $sel_agent ? '' : $agent->agent.' ' ).
+%      ( $classnum eq '0'
+%          ? ( ref($pkg_class) ? $pkg_class->classname : $pkg_class ) 
+%          : ''
+%      );
+%
+%    my $row_classnum = ref($pkg_class) ? $pkg_class->classnum : 0;
+%    my $row_agentnum = $agent->agentnum;
+%    push @params, [ 'classnum' => $row_classnum,
+%                    'agentnum' => $row_agentnum,
+%                  ];
+%
+%    push @links, "$link;agentnum=$row_agentnum;classnum=$row_classnum;";
+%
+%    @recur_colors = ($col_scheme->colors)[0,4,8,1,5,9]
+%      unless @recur_colors;
+%    @onetime_colors = ($col_scheme->colors)[2,6,10,3,7,11]
+%      unless @onetime_colors;
+%    push @colors, shift @recur_colors;
+%
+%  }
+%
+%  $hue += $hue_increment;
+%
+%}
+%
+%#use Data::Dumper;
+%#warn Dumper(\@items);
+%
+%
+<% include('elements/monthly.html',
                 'title'        => $title. 'Sales Report (Gross)',
                 'graph_type'   => 'Mountain',
                 'items'        => \@items,
diff --git a/httemplate/graph/elements/monthly.html b/httemplate/graph/elements/monthly.html
index 3b9f73aa1..f5789a2a2 100644
--- a/httemplate/graph/elements/monthly.html
+++ b/httemplate/graph/elements/monthly.html
@@ -1,206 +1,207 @@
-<%
-
-  # options example...
-  #
-  # 'title'        => 'Page title',
-  # 'items'        => \@items,
-  # 'params'       => \@params, # opt,
-  # 'labels'       => \@labels,       # or \%labels (keys are items)
-  # 'graph_labels' => \@graph_labels, # or \%graph_labels,
-  # 'colors'       => \@colors,       # or \%colors,
-  # 'links         => \@links,        # or \%link, #opt
-  # 'start_month'  => $smonth,
-  # 'start_year'   => $syear,
-  # 'end_month'    => $emonth,
-  # 'end_year'     => $eyear,
-  # 'agentnum'     => $agentnum, #opt
-  # 'nototal'      => 1, #opt,
-  # 'graph_type'   => 'LinesPoints', #opt
-  # 'remove_empty' => 1, #opt,
-  # 'bottom_total' => 1, #opt,
-
-  my(%opt) = @_;
-  my @items = @{ $opt{'items'} };
-
-  foreach my $other (qw( labels graph_labels colors links )) {
-  #foreach my $other (qw( labels graph_labels colors )) {
-    if ( ref($opt{$other}) eq 'HASH' ) {
-      $opt{$other} = [ map $opt{$other}{$_}, @items ];
-    }
-  }
-
-  my $report = new FS::Report::Table::Monthly (
-
-    #'items'       => $opt{'items'},
-    'items'        => \@items,
-    'params'       => $opt{'params'},
-    'item_labels'  => ( $cgi->param('_type') =~ /^(png)$/
-                          ? $opt{'graph_labels'}
-                          : $opt{'labels'}
-                      ),
-    'colors'       => $opt{'colors'},
-    'links'        => $opt{'links'},
-
-    'start_month'  => $opt{'start_month'},
-    'start_year'   => $opt{'start_year'},
-    'end_month'    => $opt{'end_month'},
-    'end_year'     => $opt{'end_year'},
-
-    'agentnum'     => $opt{'agentnum'},
-    'remove_empty' => $opt{'remove_empty'},
-  );
-  my $data = $report->data;
-
-  if ( $cgi->param('_type') =~ /^(png)$/ ) {
-
-    #my $chart = Chart::LinesPoints->new(1024,480);
-    #my $chart = Chart::LinesPoints->new(768,480);
-
-    my $graph_type = 'LinesPoints';
-    if ( $opt{'graph_type'} =~ /^(LinesPoints|Mountain)$/ ) {
-      $graph_type = $1;
-    }
-    my $class = "Chart::$graph_type";
-
-    my $chart = $class->new(976,384);
-    
-    my $d = 0;
-    $chart->set(
-      #'min_val' => 0,
-      'legend' => 'bottom',
-      'colors' => { ( 
-                      map { my $color = $_;
-                            'dataset'.$d++ =>
-                              [ map hex($_), unpack 'a2a2a2', $color ]
-                          }
-                          #@{ $opt{'colors'} }
-                          @{ $data->{'colors'} }
-                    ),
-                    #'grey_background' => [ 211, 211, 211 ],
-                    'grey_background' => 'white',
-                    'background' => [ 0xe8, 0xe8, 0xe8 ], #grey
-                  },
-      #'grey_background' => 'false',
-      'legend_labels' => $data->{'item_labels'},
-      'brush_size' => 4,
-      #'pt_size' => 12,
-    );
-
-    #my @data = map { $data->{$_} } ( 'label', @items );
-    my @data = @{ $data->{data} };
-    unshift @data, $data->{'label'};
-    
-    http_header('Content-Type' => 'image/png' );
-
-    $chart->_set_colors();
-
-    %><%= $chart->scalar_png(\@data) %><%
-
-  } else {
-
-    my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
-
-%><%= include('/elements/header.html', $opt{'title'} ) %>
-
-<% $cgi->param('_type', 'png'); %>
-<IMG SRC="<%= $cgi->self_url %>" WIDTH="976" HEIGHT="384">
+%
+%
+%  # options example...
+%  #
+%  # 'title'        => 'Page title',
+%  # 'items'        => \@items,
+%  # 'params'       => \@params, # opt,
+%  # 'labels'       => \@labels,       # or \%labels (keys are items)
+%  # 'graph_labels' => \@graph_labels, # or \%graph_labels,
+%  # 'colors'       => \@colors,       # or \%colors,
+%  # 'links         => \@links,        # or \%link, #opt
+%  # 'start_month'  => $smonth,
+%  # 'start_year'   => $syear,
+%  # 'end_month'    => $emonth,
+%  # 'end_year'     => $eyear,
+%  # 'agentnum'     => $agentnum, #opt
+%  # 'nototal'      => 1, #opt,
+%  # 'graph_type'   => 'LinesPoints', #opt
+%  # 'remove_empty' => 1, #opt,
+%  # 'bottom_total' => 1, #opt,
+%
+%  my(%opt) = @_;
+%  my @items = @{ $opt{'items'} };
+%
+%  foreach my $other (qw( labels graph_labels colors links )) {
+%  #foreach my $other (qw( labels graph_labels colors )) {
+%    if ( ref($opt{$other}) eq 'HASH' ) {
+%      $opt{$other} = [ map $opt{$other}{$_}, @items ];
+%    }
+%  }
+%
+%  my $report = new FS::Report::Table::Monthly (
+%
+%    #'items'       => $opt{'items'},
+%    'items'        => \@items,
+%    'params'       => $opt{'params'},
+%    'item_labels'  => ( $cgi->param('_type') =~ /^(png)$/
+%                          ? $opt{'graph_labels'}
+%                          : $opt{'labels'}
+%                      ),
+%    'colors'       => $opt{'colors'},
+%    'links'        => $opt{'links'},
+%
+%    'start_month'  => $opt{'start_month'},
+%    'start_year'   => $opt{'start_year'},
+%    'end_month'    => $opt{'end_month'},
+%    'end_year'     => $opt{'end_year'},
+%
+%    'agentnum'     => $opt{'agentnum'},
+%    'remove_empty' => $opt{'remove_empty'},
+%  );
+%  my $data = $report->data;
+%
+%  if ( $cgi->param('_type') =~ /^(png)$/ ) {
+%
+%    #my $chart = Chart::LinesPoints->new(1024,480);
+%    #my $chart = Chart::LinesPoints->new(768,480);
+%
+%    my $graph_type = 'LinesPoints';
+%    if ( $opt{'graph_type'} =~ /^(LinesPoints|Mountain)$/ ) {
+%      $graph_type = $1;
+%    }
+%    my $class = "Chart::$graph_type";
+%
+%    my $chart = $class->new(976,384);
+%    
+%    my $d = 0;
+%    $chart->set(
+%      #'min_val' => 0,
+%      'legend' => 'bottom',
+%      'colors' => { ( 
+%                      map { my $color = $_;
+%                            'dataset'.$d++ =>
+%                              [ map hex($_), unpack 'a2a2a2', $color ]
+%                          }
+%                          #@{ $opt{'colors'} }
+%                          @{ $data->{'colors'} }
+%                    ),
+%                    #'grey_background' => [ 211, 211, 211 ],
+%                    'grey_background' => 'white',
+%                    'background' => [ 0xe8, 0xe8, 0xe8 ], #grey
+%                  },
+%      #'grey_background' => 'false',
+%      'legend_labels' => $data->{'item_labels'},
+%      'brush_size' => 4,
+%      #'pt_size' => 12,
+%    );
+%
+%    #my @data = map { $data->{$_} } ( 'label', @items );
+%    my @data = @{ $data->{data} };
+%    unshift @data, $data->{'label'};
+%    
+%    http_header('Content-Type' => 'image/png' );
+%
+%    $chart->_set_colors();
+%
+%    
+<% $chart->scalar_png(\@data) %>
+%
+%
+%  } else {
+%
+%    my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+%
+%
+<% include('/elements/header.html', $opt{'title'} ) %>
+% $cgi->param('_type', 'png'); 
+
+<IMG SRC="<% $cgi->self_url %>" WIDTH="976" HEIGHT="384">
 <BR>
 
-<%= table('e8e8e8') %>
+<% table('e8e8e8') %>
 
 <TR>
 
   <TD></TD>
+% foreach my $column ( @{$data->{label}} ) {
+%       #$column =~ s/^(\d+)\//$mon[$1-1]<BR>/e;
+%       $column =~ s/^(\d+)\//$mon[$1-1]<BR>/;
+%  
 
-  <% foreach my $column ( @{$data->{label}} ) {
-       #$column =~ s/^(\d+)\//$mon[$1-1]<BR>/e;
-       $column =~ s/^(\d+)\//$mon[$1-1]<BR>/;
-  %>
-    <TH><%= $column %></TH>
-  <% } %>
+    <TH><% $column %></TH>
+% } 
+% unless ( $opt{'nototal'} ) { 
 
-  <% unless ( $opt{'nototal'} ) { %>
     <TH>Total</TH>
-  <% } %>
+% } 
 
-</TR>
 
-<% my @bottom_total = ();
-   foreach my $row ( @{ $data->{'items'} } ) {
+</TR>
+% my @bottom_total = ();
+%   foreach my $row ( @{ $data->{'items'} } ) {
+%
+%     #my $color = shift( @{ $opt{'colors'} } );
+%     my $color = shift( @{ $data->{'colors'} } );
+%     my $link = shift( @{ $data->{'links'} } );
+%     $link = $link ? qq(<A HREF="$link) : '';
+%
 
-     #my $color = shift( @{ $opt{'colors'} } );
-     my $color = shift( @{ $data->{'colors'} } );
-     my $link = shift( @{ $data->{'links'} } );
-     $link = $link ? qq(<A HREF="$link) : '';
-%>
 
   <TR>
 
-    <TH><FONT COLOR="#<%= $color %>"><%= shift( @{ $data->{'item_labels'} } ) %></FONT></TH>
+    <TH><FONT COLOR="#<% $color %>"><% shift( @{ $data->{'item_labels'} } ) %></FONT></TH>
+% #my $link = exists($opt{'links'}{$row})
+%       #  ? qq(<A HREF="$opt{'links'}{$row})
+%       #  : '';
+%       my @speriod = @{$data->{speriod}};
+%       my @eperiod = @{$data->{eperiod}};
+%       my $total = 0;
+%    
+% my $col = 0;
+%       foreach my $column ( @{ shift( @{$data->{data}} ) } ) { # ( @{$data->{$row}} ) {
+%    
 
-    <% #my $link = exists($opt{'links'}{$row})
-       #  ? qq(<A HREF="$opt{'links'}{$row})
-       #  : '';
-       my @speriod = @{$data->{speriod}};
-       my @eperiod = @{$data->{eperiod}};
-       my $total = 0;
-    %>
-    <% my $col = 0;
-       foreach my $column ( @{ shift( @{$data->{data}} ) } ) { # ( @{$data->{$row}} ) {
-    %>
 
       <TD ALIGN="right" BGCOLOR="#ffffff">
-        <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %><FONT COLOR="#<%= $color %>">$<%= sprintf("%.2f", $column) %></FONT><%= $link ? '</A>' : '' %>
+        <% $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %><FONT COLOR="#<% $color %>">$<% sprintf("%.2f", $column) %></FONT><% $link ? '</A>' : '' %>
       </TD>
-      <%
-         $total += $column;
-         $bottom_total[$col++] += $column;
-      %>
-
-    <% } %>
+%
+%         $total += $column;
+%         $bottom_total[$col++] += $column;
+%      
+% } 
+% unless ( $opt{'nototal'} ) { 
 
-    <% unless ( $opt{'nototal'} ) { %>
 
       <TD ALIGN="right" BGCOLOR="#f5f6be">
-        <%= $link ? $link. 'begin='. ${$data->{speriod}}[0]. ';end='. ${$data->{eperiod}}[-1]. '">' : '' %><FONT COLOR="#<%= $color %>">$<%= sprintf("%.2f", $total) %></FONT><%= $link ? '</A>' : '' %>
+        <% $link ? $link. 'begin='. ${$data->{speriod}}[0]. ';end='. ${$data->{eperiod}}[-1]. '">' : '' %><FONT COLOR="#<% $color %>">$<% sprintf("%.2f", $total) %></FONT><% $link ? '</A>' : '' %>
       </TD>
+% $bottom_total[$col++] += $total; 
+% } 
 
-      <% $bottom_total[$col++] += $total; %>
-
-    <% } %>
 
   </TR>
+% } 
+% if ( $opt{'bottom_total'} ) {
+%     my @speriod = ( @{$data->{speriod}}, ${$data->{speriod}}[0] );
+%     my @eperiod = ( @{$data->{eperiod}}, ${$data->{eperiod}}[-1] );
+%
 
-<% } %>
-
-<% if ( $opt{'bottom_total'} ) {
-     my @speriod = ( @{$data->{speriod}}, ${$data->{speriod}}[0] );
-     my @eperiod = ( @{$data->{eperiod}}, ${$data->{eperiod}}[-1] );
-%>
 
   <TR>
     <TH>Total</TH>
+% foreach my $total ( @bottom_total ) { 
 
-    <% foreach my $total ( @bottom_total ) { %>
 
       <TD ALIGN="right" BGCOLOR="#f5f6be">
-        <%= $opt{'bottom_link'}
+        <% $opt{'bottom_link'}
               ? '<A HREF="'. $opt{'bottom_link'}.
                 'begin='. shift(@speriod).
                 ';end='. shift(@eperiod). '">'
               : ''
-        %>$<%= sprintf("%.2f", $total) %><%= $opt{'bottom_link'} ? '</A>' : '' %>
+        %>$<% sprintf("%.2f", $total) %><% $opt{'bottom_link'} ? '</A>' : '' %>
 
       </TD>
+% } 
 
-    <% } %>
 
   </TR>
+% } 
 
-<% } %>
 
 </TABLE>
 
-<%= include('/elements/footer.html') %>
+<% include('/elements/footer.html') %>
+% } 
 
-<% } %>
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index f085c2264..829b1e66f 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -1,68 +1,69 @@
-<%
-
-#find first month
-my $syear = $cgi->param('start_year'); # || 1899+$curyear;
-my $smonth = $cgi->param('start_month'); # || $curmon+1;
-
-#find last month
-my $eyear = $cgi->param('end_year'); # || 1900+$curyear;
-my $emonth = $cgi->param('end_month'); # || $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.' ' : '';
-
-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',
-  'credits'  => 'Credits',
-  'payments' => 'Gross Receipts',
-  'receipts' => 'Net Receipts',
-);
-
-my %graph_suffix = (
- 'invoiced' => ' (invoiced)', 
- 'netsales' => ' (invoiced - applied credits)',
- 'credits'  => '',
- 'payments' => ' (payments)',
- 'receipts' => '/Cashflow (payments - refunds)',
-);
-my %graph_label = map { $_ => $label{$_}.$graph_suffix{$_} } keys %label;
-
-$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)"
-  foreach keys %label;
-
-$graph_label{$_.'_12mo'} = $graph_label{$_}. " (previous 12 months)"
-  foreach keys %graph_label;
-
-my %color = (
-  'invoiced' => '9999ff', #light blue
-  'netsales' => '0000cc', #blue
-  'credits'  => 'cc0000', #red
-  '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?
-
-%><%= include('elements/monthly.html',
+%
+%
+%#find first month
+%my $syear = $cgi->param('start_year'); # || 1899+$curyear;
+%my $smonth = $cgi->param('start_month'); # || $curmon+1;
+%
+%#find last month
+%my $eyear = $cgi->param('end_year'); # || 1900+$curyear;
+%my $emonth = $cgi->param('end_month'); # || $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.' ' : '';
+%
+%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',
+%  'credits'  => 'Credits',
+%  'payments' => 'Gross Receipts',
+%  'receipts' => 'Net Receipts',
+%);
+%
+%my %graph_suffix = (
+% 'invoiced' => ' (invoiced)', 
+% 'netsales' => ' (invoiced - applied credits)',
+% 'credits'  => '',
+% 'payments' => ' (payments)',
+% 'receipts' => '/Cashflow (payments - refunds)',
+%);
+%my %graph_label = map { $_ => $label{$_}.$graph_suffix{$_} } keys %label;
+%
+%$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)"
+%  foreach keys %label;
+%
+%$graph_label{$_.'_12mo'} = $graph_label{$_}. " (previous 12 months)"
+%  foreach keys %graph_label;
+%
+%my %color = (
+%  'invoiced' => '9999ff', #light blue
+%  'netsales' => '0000cc', #blue
+%  'credits'  => 'cc0000', #red
+%  '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?
+%
+%
+<% include('elements/monthly.html',
                 'title'        => $agentname.
                                   'Sales, Credits and Receipts Summary',
                 'items'        => \@items,
diff --git a/httemplate/graph/report_cust_bill_pkg.html b/httemplate/graph/report_cust_bill_pkg.html
index 4f29b761f..664aab74e 100644
--- a/httemplate/graph/report_cust_bill_pkg.html
+++ b/httemplate/graph/report_cust_bill_pkg.html
@@ -1,14 +1,14 @@
-<%= include('/elements/header.html', 'Sales Report' ) %>
+<% include('/elements/header.html', 'Sales Report' ) %>
 
 <FORM ACTION="cust_bill_pkg.cgi" METHOD="GET">
 
 <TABLE>
 
-<%= include('/elements/tr-select-from_to.html' ) %>
+<% include('/elements/tr-select-from_to.html' ) %>
 
-<%= include('/elements/tr-select-agent.html', 'label' => 'For agent: ' ) %>
+<% include('/elements/tr-select-agent.html', 'label' => 'For agent: ' ) %>
 
-<%= include('/elements/tr-select-pkg_class.html', '',
+<% include('/elements/tr-select-pkg_class.html', '',
               'pre_options' => [ '0' => 'all' ],
               'empty_label' => '(empty class)',
            )
@@ -26,4 +26,4 @@
 <BR><INPUT TYPE="submit" VALUE="Display">
 </FORM>
 
-<%= include('/elements/footer.html') %>
+<% include('/elements/footer.html') %>
diff --git a/httemplate/graph/report_money_time.html b/httemplate/graph/report_money_time.html
index 564749686..b80696b65 100644
--- a/httemplate/graph/report_money_time.html
+++ b/httemplate/graph/report_money_time.html
@@ -1,4 +1,4 @@
-<%= include('/elements/header.html', 'Sales, Credits and Receipts Summary' ) %>
+<% include('/elements/header.html', 'Sales, Credits and Receipts Summary' ) %>
 
 <FORM ACTION="money_time.cgi" METHOD="GET">
 
@@ -16,9 +16,9 @@
 
 <TABLE>
 
-<%= include('/elements/tr-select-from_to.html' ) %>
+<% include('/elements/tr-select-from_to.html' ) %>
 
-<%= include('/elements/tr-select-agent.html', '', 'label' => 'For agent: ' ) %>
+<% include('/elements/tr-select-agent.html', '', 'label' => 'For agent: ' ) %>
 
 <TR>
   <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="12mo" VALUE="1"></TD>
@@ -30,4 +30,4 @@
 <BR><INPUT TYPE="submit" VALUE="Display">
 </FORM>
 
-<%= include('/elements/footer.html') %>
+<% include('/elements/footer.html') %>