[freeside-commits] branch FREESIDE_2_3_BRANCH updated. d78dbf68b3c5d558cb33dc731f7caaa25a5a344b
Ivan
ivan at 420.am
Thu Dec 27 19:17:08 PST 2012
The branch, FREESIDE_2_3_BRANCH has been updated
via d78dbf68b3c5d558cb33dc731f7caaa25a5a344b (commit)
from 308b81816960749a9dafaaef46d3558e9c187d38 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d78dbf68b3c5d558cb33dc731f7caaa25a5a344b
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Dec 27 19:17:03 2012 -0800
backport ignore_quantity fixes from 3.x, RT#18227
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index ff8ba9f..3200219 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;
-----------------------------------------------------------------------
Summary of changes:
FS/FS/cust_svc.pm | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
More information about the freeside-commits
mailing list