diff options
| -rw-r--r-- | FS/FS/part_svc.pm | 12 | ||||
| -rwxr-xr-x | httemplate/edit/part_svc.cgi | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm index 06c15ed2a..63bc2ad1c 100644 --- a/FS/FS/part_svc.pm +++ b/FS/FS/part_svc.pm @@ -265,12 +265,12 @@ COLUMNNAME, or a new part_svc_column object if none exists. =cut sub part_svc_column { - my $self = shift; - my $columnname = shift; - qsearchs('part_svc_column', { - 'svcpart' => $self->svcpart, - 'columnname' => $columnname, - } + my( $self, $columnname) = @_; + $self->svcpart && + qsearchs('part_svc_column', { + 'svcpart' => $self->svcpart, + 'columnname' => $columnname, + } ) or new FS::part_svc_column { 'svcpart' => $self->svcpart, 'columnname' => $columnname, diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi index 0ee0a468a..d0cc9b645 100755 --- a/httemplate/edit/part_svc.cgi +++ b/httemplate/edit/part_svc.cgi @@ -160,7 +160,8 @@ my %defs = ( $html .= '<TD><INPUT TYPE="checkbox"'. ' NAME="exportnum'. $part_export->exportnum. '" VALUE="1" '; $html .= 'CHECKED' - if qsearchs( 'export_svc', { + if ( $clone || $part_svc->svcpart ) #null svcpart search causing error + && qsearchs( 'export_svc', { exportnum => $part_export->exportnum, svcpart => $clone || $part_svc->svcpart }); $html .= '>'. $part_export->exportnum. ': '. $part_export->exporttype. |