From: Mark Wells <mark@freeside.biz>
Date: Fri, 19 Jun 2015 00:15:50 +0000 (-0700)
Subject: silence many spurious warnings from part_pkg options
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=e6443cfd58409903ab5d487c5248e0a22906dbd7;p=freeside.git

silence many spurious warnings from part_pkg options
---

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 4407ec6dd..0e9ee05fb 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -1392,6 +1392,11 @@ sub option {
   my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
                      split("\n", $self->get('plandata') );
   return $plandata{$opt} if exists $plandata{$opt};
+
+  # check whether the option is defined in plan info (if so, don't warn)
+  if (exists $plans{ $self->plan }->{fields}->{$opt}) {
+    return '';
+  }
   cluck "WARNING: (pkgpart ". $self->pkgpart. ") Package def option $opt ".
         "not found in options or plandata!\n"
     unless $ornull;