From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 28 Dec 2012 03:17:03 +0000 (-0800)
Subject: backport ignore_quantity fixes from 3.x, RT#18227
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=d78dbf68b3c5d558cb33dc731f7caaa25a5a344b;p=freeside.git

backport ignore_quantity fixes from 3.x, RT#18227
---

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;