projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16824'
[freeside.git]
/
FS
/
FS
/
cust_pkg_discount.pm
diff --git
a/FS/FS/cust_pkg_discount.pm
b/FS/FS/cust_pkg_discount.pm
index
72a1e9c
..
a207940
100644
(file)
--- a/
FS/FS/cust_pkg_discount.pm
+++ b/
FS/FS/cust_pkg_discount.pm
@@
-172,7
+172,7
@@
sub check {
return $error if $error;
return "Discount does not apply to setup fees, and package has no recurring"
return $error if $error;
return "Discount does not apply to setup fees, and package has no recurring"
- if ! $self->discount->setup &&
! $self->cust_pkg->freq
;
+ if ! $self->discount->setup &&
$self->cust_pkg->part_pkg->freq =~ /^0/
;
$self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
$self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;