invoice_sections_with_taxes per-agent, RT#79636

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

diff --git a/httemplate/graph/elements/report.html b/httemplate/graph/elements/report.html
index b5d2148..6e6c382 100644 (file)
--- a/httemplate/graph/elements/report.html
+++ b/httemplate/graph/elements/report.html
@@ -52,10 +52,10 @@ any delimiter and linked from the elements in @data.
 %
 %   my @bottom_total = ();
 %   my $row = 0;
-%   foreach ( @items ) {
+%   foreach my $i ( @items ) {
 %
 %     my $col = 0;
-%     my @row = map { sprintf($sprintf, $_) } @{ shift(@data) };
+%     my @row = map { sprintf($sprintf_fields->{$i} ? $sprintf_fields->{$i} : $sprintf, $_) } @{ shift(@data) };
 %     my $total = sum(@row);
 %     push @row, sprintf($sprintf, $total) unless $opt{'nototal'};
 %     unless ($opt{'no_graph'}[$row]) {
@@ -101,7 +101,7 @@ any delimiter and linked from the elements in @data.
 %   }
 %
 %   my @bottom_total = ();
-%   foreach ( @items ) {
+%   foreach my $i ( @items ) {
 %     $row++;
 %     $col = 0;
 %     my $total = 0;
@@ -109,7 +109,7 @@ any delimiter and linked from the elements in @data.
 %     foreach ( @{ shift( @data ) } ) {
 %       $total += $_;
 %       $bottom_total[$col-1] += $_ unless $opt{no_graph}[$row];
-%       $worksheet->write_number($row, $col++,  sprintf($sprintf, $_) );
+%       $worksheet->write_number($row, $col++,  sprintf($sprintf_fields->{$i} ? $sprintf_fields->{$i} : $sprintf, $_) );
 %     }
 %     if ( !$opt{'nototal'} ) {
 %       $bottom_total[$col-1] += $total unless $opt{no_graph}[$row]; 
@@ -249,7 +249,7 @@ any delimiter and linked from the elements in @data.
 %   my $e = 0;
 %   foreach ( @$data_row ) {
 %     my $entry = $_;
-%     $entry = $money_char . sprintf($sprintf, $entry);
+%     $entry = $money_char . sprintf($sprintf_fields->{$row} ? $sprintf_fields->{$row} : $sprintf, $entry);
 %     $entry = $link_prefix . shift(@$links) . "\">$entry</A>" if $link_prefix;
 %     push @{$cell[$i]}, $entry;
 %     $bottom_total[$e++] += $_ unless $opt{no_graph}[$i-1];
@@ -343,6 +343,7 @@ my $conf = new FS::Conf;
 my $money_char = $opt{'disable_money'} ? '' : $conf->config('money_char');
 
 my @items = @{ $opt{'items'} };
+my $sprintf_fields = $opt{'sprintf_fields'};
 
 foreach my $other (qw( col_labels row_labels graph_labels axis_labels colors links )) {
   if ( ref($opt{$other}) eq 'HASH' ) {