projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f73668e
)
RT# 79353 Update discount report - include waived setup fees
author
Mitch Jackson
<mitch@freeside.biz>
Mon, 16 Apr 2018 19:37:05 +0000
(19:37 +0000)
committer
Mitch Jackson
<mitch@freeside.biz>
Mon, 16 Apr 2018 19:37:05 +0000
(19:37 +0000)
httemplate/search/cust_bill_pkg_discount.html
patch
|
blob
|
history
diff --git
a/httemplate/search/cust_bill_pkg_discount.html
b/httemplate/search/cust_bill_pkg_discount.html
index
d0f9bcf
..
a669e6c
100644
(file)
--- 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',{
if ( $_[0]->pkgdiscountnum ) {
# Standard discount, not a waived setup fee
my $discount = qsearchs('discount',{
-
pkgdiscountnum => $_[0]->pkg
discountnum
+
discountnum => $_[0]->
discountnum
});
return $discount->description;
} else {
});
return $discount->description;
} else {
@@
-71,9
+71,7
@@
Parameters:
sub {
my $row = shift;
if ($row->pkgdiscountnum) {
sub {
my $row = shift;
if ($row->pkgdiscountnum) {
- $row->setuprecur eq 'setup'
- ? 'Setup'
- : sprintf( '%.2f', $row->months ),
+ return sprintf( '%.2f', $row->months );
} else {
return 'Setup';
}
} else {
return 'Setup';
}
@@
-144,7
+142,6
@@
my @select = (qw(
cust_main.custnum
cust_main.custnum
- cust_pkg_discount.setuprecur
cust_pkg_discount.discountnum
cust_pkg.waive_setup),
cust_pkg_discount.discountnum
cust_pkg.waive_setup),