projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#24684: Payments for Online Bill Pay
[freeside.git]
/
FS
/
FS
/
part_pkg.pm
diff --git
a/FS/FS/part_pkg.pm
b/FS/FS/part_pkg.pm
index
e473d09
..
0e9ee05
100644
(file)
--- a/
FS/FS/part_pkg.pm
+++ b/
FS/FS/part_pkg.pm
@@
-797,17
+797,7
@@
src_svcpart and link_type.
=cut
sub part_svc_link {
=cut
sub part_svc_link {
- my( $self, %opt ) = @_;
-
- my $agentnum = $self->agentnum;
-
- qsearch({ 'table' => 'part_svc_link',
- 'hashref' => \%opt,
- 'extra_sql' =>
- $agentnum
- ? "AND ( agentnum IS NULL OR agentnum = $agentnum )"
- : 'AND agentnum IS NULL',
- });
+ FS::part_svc_link->by_agentnum( shift->agentnum, @_ );
}
=item supersede OLD [, OPTION => VALUE ... ]
}
=item supersede OLD [, OPTION => VALUE ... ]
@@
-1402,6
+1392,11
@@
sub option {
my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
split("\n", $self->get('plandata') );
return $plandata{$opt} if exists $plandata{$opt};
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;
cluck "WARNING: (pkgpart ". $self->pkgpart. ") Package def option $opt ".
"not found in options or plandata!\n"
unless $ornull;