projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
308b818
)
backport ignore_quantity fixes from 3.x, RT#18227
author
Ivan Kohler
<ivan@freeside.biz>
Fri, 28 Dec 2012 03:17:03 +0000
(19:17 -0800)
committer
Ivan Kohler
<ivan@freeside.biz>
Fri, 28 Dec 2012 03:17:03 +0000
(19:17 -0800)
FS/FS/cust_svc.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_svc.pm
b/FS/FS/cust_svc.pm
index
ff8ba9f
..
3200219
100644
(file)
--- a/
FS/FS/cust_svc.pm
+++ b/
FS/FS/cust_svc.pm
@@
-313,10
+313,10
@@
sub check {
($part_svc) = grep { $_->svcpart == $self->svcpart } $cust_pkg->part_svc;
return "No svcpart ". $self->svcpart.
" services in pkgpart ". $cust_pkg->pkgpart
($part_svc) = grep { $_->svcpart == $self->svcpart } $cust_pkg->part_svc;
return "No svcpart ". $self->svcpart.
" services in pkgpart ". $cust_pkg->pkgpart
- unless $part_svc;
+ unless $part_svc
|| $ignore_quantity
;
return "Already ". $part_svc->get('num_cust_svc'). " ". $part_svc->svc.
" services for pkgnum ". $self->pkgnum
return "Already ". $part_svc->get('num_cust_svc'). " ". $part_svc->svc.
" services for pkgnum ". $self->pkgnum
- if
$part_svc->get('num_avail') == 0 and !$ignore_quantity
;
+ if
!$ignore_quantity && $part_svc->get('num_avail') <= 0
;
}
$self->SUPER::check;
}
$self->SUPER::check;