summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitch Jackson <mitch@freeside.biz>2018-04-16 19:37:05 +0000
committerMitch Jackson <mitch@freeside.biz>2018-04-16 19:37:05 +0000
commitf1dc2a40887b13ca52169ef2812795d9d686a1fd (patch)
treed15fee6d1556415eee6a2665138c158e2319b02f
parentf73668e8c904fd91881c583a80b206851b7d5e83 (diff)
RT# 79353 Update discount report - include waived setup fees
-rw-r--r--httemplate/search/cust_bill_pkg_discount.html7
1 files changed, 2 insertions, 5 deletions
diff --git a/httemplate/search/cust_bill_pkg_discount.html b/httemplate/search/cust_bill_pkg_discount.html
index d0f9bcf7a..a669e6c33 100644
--- a/httemplate/search/cust_bill_pkg_discount.html
+++ b/httemplate/search/cust_bill_pkg_discount.html
@@ -38,7 +38,7 @@ Parameters:
if ( $_[0]->pkgdiscountnum ) {
# Standard discount, not a waived setup fee
my $discount = qsearchs('discount',{
- pkgdiscountnum => $_[0]->pkgdiscountnum
+ discountnum => $_[0]->discountnum
});
return $discount->description;
} else {
@@ -71,9 +71,7 @@ Parameters:
sub {
my $row = shift;
if ($row->pkgdiscountnum) {
- $row->setuprecur eq 'setup'
- ? 'Setup'
- : sprintf( '%.2f', $row->months ),
+ return sprintf( '%.2f', $row->months );
} else {
return 'Setup';
}
@@ -144,7 +142,6 @@ my @select = (qw(
cust_main.custnum
- cust_pkg_discount.setuprecur
cust_pkg_discount.discountnum
cust_pkg.waive_setup),