projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
45b87d6
)
but still show credited amount on line item report, #18676 fixes
author
Mark Wells
<mark@freeside.biz>
Mon, 17 Aug 2015 19:13:14 +0000
(12:13 -0700)
committer
Mark Wells
<mark@freeside.biz>
Mon, 17 Aug 2015 19:14:54 +0000
(12:14 -0700)
httemplate/search/cust_bill_pkg.cgi
patch
|
blob
|
history
diff --git
a/httemplate/search/cust_bill_pkg.cgi
b/httemplate/search/cust_bill_pkg.cgi
index
ac686ea
..
4fb9b66
100644
(file)
--- a/
httemplate/search/cust_bill_pkg.cgi
+++ b/
httemplate/search/cust_bill_pkg.cgi
@@
-44,8
+44,8
@@
@currency,
'invnum',
'_date',
@currency,
'invnum',
'_date',
- '
', #'
pay_amount',
- '
', #'
credit_amount',
+ 'pay_amount',
+ 'credit_amount',
FS::UI::Web::cust_sort_fields(),
],
'links' => [
FS::UI::Web::cust_sort_fields(),
],
'links' => [
@@
-461,15
+461,6
@@
if ( $cgi->param('nottax') ) {
}
}
- # This is the only place we should attempt to show credits on here:
- # the total of credit applications to the line item.
-
- my $credit_sub = 'SELECT SUM(amount) AS credit_amount, billpkgnum
- FROM cust_credit_bill_pkg GROUP BY billpkgnum';
-
- $join_pkg .= " LEFT JOIN ($credit_sub) AS item_credit
- ON (cust_bill_pkg.billpkgnum = item_credit.billpkgnum)";
-
if ( @tax_where or $cgi->param('taxable') ) {
# process tax restrictions
unshift @tax_where,
if ( @tax_where or $cgi->param('taxable') ) {
# process tax restrictions
unshift @tax_where,
@@
-704,7
+695,15
@@
my $pay_sub = "SELECT SUM(cust_bill_pay_pkg.amount)
";
push @select, "($pay_sub) AS pay_amount";
";
push @select, "($pay_sub) AS pay_amount";
+#total credits
+my $credit_sub = 'SELECT SUM(amount) AS credit_amount, billpkgnum
+ FROM cust_credit_bill_pkg GROUP BY billpkgnum';
+
+$join_pkg .= " LEFT JOIN ($credit_sub) AS item_credit
+ ON (cust_bill_pkg.billpkgnum = item_credit.billpkgnum)";
+push @select, 'credit_amount';
+# standard customer fields
push @select, 'cust_main.custnum', FS::UI::Web::cust_sql_fields();
#salesnum
push @select, 'cust_main.custnum', FS::UI::Web::cust_sql_fields();
#salesnum