projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
freeside inc. web services for address normalizaion and printing, RT#33849
[freeside.git]
/
FS
/
FS
/
option_Common.pm
diff --git
a/FS/FS/option_Common.pm
b/FS/FS/option_Common.pm
index
c1dda22
..
8c69089
100644
(file)
--- a/
FS/FS/option_Common.pm
+++ b/
FS/FS/option_Common.pm
@@
-3,6
+3,7
@@
package FS::option_Common;
use strict;
use base qw( FS::Record );
use vars qw( $DEBUG );
use strict;
use base qw( FS::Record );
use vars qw( $DEBUG );
+use Carp qw( cluck );
use Scalar::Util qw( blessed );
use FS::Record qw( qsearch qsearchs dbh );
use Scalar::Util qw( blessed );
use FS::Record qw( qsearch qsearchs dbh );
@@
-134,13
+135,7
@@
sub delete {
my $oldAutoCommit = $FS::UID::AutoCommit;
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
my $oldAutoCommit = $FS::UID::AutoCommit;
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
-
- my $error = $self->SUPER::delete;
- if ( $error ) {
- $dbh->rollback if $oldAutoCommit;
- return $error;
- }
-
+
my $pkey = $self->primary_key;
#my $option_table = $self->option_table;
my $pkey = $self->primary_key;
#my $option_table = $self->option_table;
@@
-152,6
+147,12
@@
sub delete {
}
}
}
}
+ my $error = $self->SUPER::delete;
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return $error;
+ }
+
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
'';
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
'';
@@
-344,7
+345,7
@@
sub option {
$pkey => $self->get($pkey),
$namecol => shift,
};
$pkey => $self->get($pkey),
$namecol => shift,
};
-
warn
"$self -> option: searching for ".
+
cluck
"$self -> option: searching for ".
join(' / ', map { "$_ => ". $hashref->{$_} } keys %$hashref )
if $DEBUG;
my $obj = qsearchs($option_table, $hashref);
join(' / ', map { "$_ => ". $hashref->{$_} } keys %$hashref )
if $DEBUG;
my $obj = qsearchs($option_table, $hashref);