X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Foption_Common.pm;h=c1dda22af9ffe074306169d8237cebd09e8ce2b6;hb=c7bc6770f2f0b4413b788f8fc9abde6ad5548da3;hp=b29cf44bb36d9534e4253b66725657530ffe0333;hpb=03dc5996825a284a3bb922324402730f9f2e404f;p=freeside.git

diff --git a/FS/FS/option_Common.pm b/FS/FS/option_Common.pm
index b29cf44bb..c1dda22af 100644
--- a/FS/FS/option_Common.pm
+++ b/FS/FS/option_Common.pm
@@ -67,13 +67,8 @@ sub insert {
 
   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;
@@ -208,8 +203,8 @@ sub replace {
   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;
     }