diff options
| author | Mark Wells <mark@freeside.biz> | 2015-08-17 12:13:14 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-08-17 12:14:54 -0700 |
| commit | ef2bc5dcb69e67077ce45a624c107894765e3907 (patch) | |
| tree | 252d7e27a7b5df991bca733ff8630ab3699eb779 /httemplate | |
| parent | 45b87d63b047f23626a3ad9301a0dc0fd8797cae (diff) | |
but still show credited amount on line item report, #18676 fixes
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/search/cust_bill_pkg.cgi | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi index ac686eab8..4fb9b662b 100644 --- a/httemplate/search/cust_bill_pkg.cgi +++ b/httemplate/search/cust_bill_pkg.cgi @@ -44,8 +44,8 @@ @currency, 'invnum', '_date', - '', #'pay_amount', - '', #'credit_amount', + 'pay_amount', + 'credit_amount', 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, @@ -704,7 +695,15 @@ my $pay_sub = "SELECT SUM(cust_bill_pay_pkg.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 |