From d78dbf68b3c5d558cb33dc731f7caaa25a5a344b Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 27 Dec 2012 19:17:03 -0800 Subject: [PATCH] backport ignore_quantity fixes from 3.x, RT#18227 --- FS/FS/cust_svc.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm index ff8ba9f5c..32002190b 100644 --- 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 - unless $part_svc; + unless $part_svc || $ignore_quantity; 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; -- 2.20.1