projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix "credited" report column, #37088
[freeside.git]
/
httemplate
/
search
/
report_tax-xls.cgi
diff --git
a/httemplate/search/report_tax-xls.cgi
b/httemplate/search/report_tax-xls.cgi
index
773b403
..
07fcf7c
100755
(executable)
--- a/
httemplate/search/report_tax-xls.cgi
+++ b/
httemplate/search/report_tax-xls.cgi
@@
-207,11
+207,11
@@
foreach my $row (@rows) {
$x++;
$ws->write_string($y, $x, " \N{U+2212} ", $f->{bigmath}); # MINUS SIGN
$x++;
$x++;
$ws->write_string($y, $x, " \N{U+2212} ", $f->{bigmath}); # MINUS SIGN
$x++;
- $ws->write($y, $x, $row->{
credit
} || 0, $f->{currency});
+ $ws->write($y, $x, $row->{
tax_credited
} || 0, $f->{currency});
$x++;
$ws->write_string($y, $x, " = ", $f->{bigmath});
$x++;
$x++;
$ws->write_string($y, $x, " = ", $f->{bigmath});
$x++;
- $ws->write($y, $x, $row->{tax} - $row->{
credit
}, $f->{currency});
+ $ws->write($y, $x, $row->{tax} - $row->{
tax_credited
}, $f->{currency});
$x++;
$ws->write($y, $x, $row->{tax_paid} || 0, $f->{currency});
$x++;
$ws->write($y, $x, $row->{tax_paid} || 0, $f->{currency});
@@
-221,11
+221,11
@@
foreach my $row (@rows) {
}
# at the end of everything
}
# at the end of everything
-if ( $report->{out
side
} > 0 ) {
+if ( $report->{out
_sales
} > 0 ) {
my $f = $format[0];
$ws->set_row($y, 30); # height
$ws->write($y, 0, mt('Out of taxable region'), $f->{rowhead_outside});
my $f = $format[0];
$ws->set_row($y, 30); # height
$ws->write($y, 0, mt('Out of taxable region'), $f->{rowhead_outside});
- $ws->write($y, 1, $report->{out
side
}, $f->{currency_outside});
+ $ws->write($y, 1, $report->{out
_sales
}, $f->{currency_outside});
$y++;
}
$y++;
}
@@
-292,6
+292,15
@@
foreach my $row (@rows) {
$prev_row = $row;
}
$prev_row = $row;
}
+if ( $report->{out_credit} > 0 ) {
+ my $f = $format[0];
+ $ws->set_row($y, 30); # height
+ $ws->write($y, 0, mt('Out of taxable region'), $f->{rowhead_outside});
+ $ws->write($y, 1, $report->{out_credit}, $f->{currency_outside});
+ $y++;
+}
+
+
for my $x (0..4) {
$ws->set_column($x, $x, $widths[$x]);
}
for my $x (0..4) {
$ws->set_column($x, $x, $widths[$x]);
}