projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1eda1b0
)
fix for Pg 7.3, are there others?
author
ivan
<ivan>
Mon, 16 Dec 2002 21:52:01 +0000
(21:52 +0000)
committer
ivan
<ivan>
Mon, 16 Dec 2002 21:52:01 +0000
(21:52 +0000)
FS/FS/part_svc.pm
patch
|
blob
|
history
httemplate/edit/part_svc.cgi
patch
|
blob
|
history
diff --git
a/FS/FS/part_svc.pm
b/FS/FS/part_svc.pm
index
06c15ed
..
63bc2ad
100644
(file)
--- 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 {
=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,
) 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
0ee0a46
..
d0cc9b6
100755
(executable)
--- 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'
$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.
exportnum => $part_export->exportnum,
svcpart => $clone || $part_svc->svcpart });
$html .= '>'. $part_export->exportnum. ': '. $part_export->exporttype.