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:13:14 -0700 |
| commit | 0d678bcd0d18621ede25d0465b71e919e1c5212e (patch) | |
| tree | f81aee0ad4e71e0717307fed8f47c474350044ae | |
| parent | 471305e3debe7bd92742e63439a21f1905a91737 (diff) | |
but still show credited amount on line item report, #18676 fixes
| -rw-r--r-- | httemplate/search/cust_bill_pkg.cgi | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi index 06716c797..fcf211005 100644 --- a/httemplate/search/cust_bill_pkg.cgi +++ b/httemplate/search/cust_bill_pkg.cgi @@ -41,8 +41,8 @@ @peritem, 'invnum', '_date', - '', #'pay_amount', - '', #'credit_amount', + 'pay_amount', + 'credit_amount', FS::UI::Web::cust_sort_fields(), ], 'links' => [ @@ -437,15 +437,6 @@ if ( $cgi->param('nottax') ) { USING (billpkgnum)"; } - # 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, @@ -689,7 +680,6 @@ if ( $cgi->param('nottax') ) { } # nottax / istax - #total payments my $pay_sub = "SELECT SUM(cust_bill_pay_pkg.amount) FROM cust_bill_pay_pkg @@ -697,6 +687,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 |