projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tax report improvements, #23449, #25935
[freeside.git]
/
FS
/
FS
/
option_Common.pm
diff --git
a/FS/FS/option_Common.pm
b/FS/FS/option_Common.pm
index
b29cf44
..
74adbed
100644
(file)
--- a/
FS/FS/option_Common.pm
+++ b/
FS/FS/option_Common.pm
@@
-67,13
+67,8
@@
sub insert {
my $error;
my $error;
- $error = $self->check_options($options);
- if ( $error ) {
- $dbh->rollback if $oldAutoCommit;
- return $error;
- }
-
- $error = $self->SUPER::insert;
+ $error = $self->check_options($options)
+ || $self->SUPER::insert;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
@@
-139,13
+134,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;
@@
-157,6
+146,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;
'';
@@
-208,8
+203,8
@@
sub replace {
my $error;
if ($options_supplied) {
my $error;
if ($options_supplied) {
-
$error = $self->check_options($options);
-
if ( $error ) {
+ $error = $self->check_options($options);
+ if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
}
$dbh->rollback if $oldAutoCommit;
return $error;
}