projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3dc4bee
)
fix new tax report w/FS::tax_rate_location->location_sql, RT#12332
author
ivan
<ivan>
Fri, 15 Apr 2011 23:44:36 +0000
(23:44 +0000)
committer
ivan
<ivan>
Fri, 15 Apr 2011 23:44:36 +0000
(23:44 +0000)
FS/FS/tax_rate.pm
patch
|
blob
|
history
httemplate/search/report_newtax.cgi
patch
|
blob
|
history
diff --git
a/FS/FS/tax_rate.pm
b/FS/FS/tax_rate.pm
index
8185d99
..
54b388c
100644
(file)
--- a/
FS/FS/tax_rate.pm
+++ b/
FS/FS/tax_rate.pm
@@
-1904,7
+1904,7
@@
sub generate_liability_report {
my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
- my $x = &{$scalar_sql}($t, [
$t->itemdesc, $t->itemdesc
], $sql );
+ my $x = &{$scalar_sql}($t, [
'itemdesc', 'itemdesc'
], $sql );
$tax += $x;
$taxes{$label}->{'tax'} += $x;
$tax += $x;
$taxes{$label}->{'tax'} += $x;
@@
-1916,7
+1916,7
@@
sub generate_liability_report {
$sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
" $creditwhere AND cust_bill_pkg.pkgnum = 0";
$sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
" $creditwhere AND cust_bill_pkg.pkgnum = 0";
- my $y = &{$scalar_sql}($t, [
$t->itemdesc, $t->itemdesc
], $sql );
+ my $y = &{$scalar_sql}($t, [
'itemdesc', 'itemdesc'
], $sql );
$credit += $y;
$taxes{$label}->{'credit'} += $y;
$credit += $y;
$taxes{$label}->{'credit'} += $y;
diff --git
a/httemplate/search/report_newtax.cgi
b/httemplate/search/report_newtax.cgi
index
5b8604b
..
09c56ab
100755
(executable)
--- a/
httemplate/search/report_newtax.cgi
+++ b/
httemplate/search/report_newtax.cgi
@@
-131,7
+131,7
@@
foreach my $t (qsearch({ table => 'cust_bill_pkg',
my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
- my $x = scalar_sql($t, [
$t->itemdesc, $t->itemdesc
], $sql );
+ my $x = scalar_sql($t, [
'itemdesc', 'itemdesc'
], $sql );
$tax += $x;
$taxes{$label}->{'tax'} += $x;
$tax += $x;
$taxes{$label}->{'tax'} += $x;
@@
-143,7
+143,7
@@
foreach my $t (qsearch({ table => 'cust_bill_pkg',
$sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
" $creditwhere AND cust_bill_pkg.pkgnum = 0";
$sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
" $creditwhere AND cust_bill_pkg.pkgnum = 0";
- my $y = scalar_sql($t, [
$t->itemdesc, $t->itemdesc
], $sql );
+ my $y = scalar_sql($t, [
'itemdesc', 'itemdesc'
], $sql );
$credit += $y;
$taxes{$label}->{'credit'} += $y;
$credit += $y;
$taxes{$label}->{'credit'} += $y;