projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3f596ab
)
fix removing a flag from a service definition column
author
ivan
<ivan>
Wed, 28 Oct 2009 18:16:57 +0000
(18:16 +0000)
committer
ivan
<ivan>
Wed, 28 Oct 2009 18:16:57 +0000
(18:16 +0000)
FS/FS/part_svc.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_svc.pm
b/FS/FS/part_svc.pm
index
e57efe4
..
db39ea9
100644
(file)
--- a/
FS/FS/part_svc.pm
+++ b/
FS/FS/part_svc.pm
@@
-267,6
+267,7
@@
sub replace {
|| $new->getfield($svcdb.'__'.$_.'_label') !~ /^\s*$/ )
} (fields($svcdb),@fields)
) {
|| $new->getfield($svcdb.'__'.$_.'_label') !~ /^\s*$/ )
} (fields($svcdb),@fields)
) {
+
my $part_svc_column = $new->part_svc_column($field);
my $previous = qsearchs('part_svc_column', {
'svcpart' => $new->svcpart,
my $part_svc_column = $new->part_svc_column($field);
my $previous = qsearchs('part_svc_column', {
'svcpart' => $new->svcpart,
@@
-279,12
+280,15
@@
sub replace {
if ( uc($flag) =~ /^([A-Z])$/ || $label !~ /^\s*$/ ) {
if ( uc($flag) =~ /^([A-Z])$/ ) {
if ( uc($flag) =~ /^([A-Z])$/ || $label !~ /^\s*$/ ) {
if ( uc($flag) =~ /^([A-Z])$/ ) {
+ $part_svc_column->setfield('columnflag', $1);
my $parser = FS::part_svc->svc_table_fields($svcdb)->{$field}->{parse}
|| sub { shift };
my $parser = FS::part_svc->svc_table_fields($svcdb)->{$field}->{parse}
|| sub { shift };
- $part_svc_column->setfield('columnflag', $1);
$part_svc_column->setfield('columnvalue',
&$parser($new->getfield($svcdb.'__'.$field))
);
$part_svc_column->setfield('columnvalue',
&$parser($new->getfield($svcdb.'__'.$field))
);
+ } else {
+ $part_svc_column->setfield('columnflag', '');
+ $part_svc_column->setfield('columnvalue', '');
}
$part_svc_column->setfield('columnlabel', $label)
}
$part_svc_column->setfield('columnlabel', $label)