Adding line 246 "edit global pockage definitions costs" back in

[freeside.git] / FS / FS / option_Common.pm

diff --git a/FS/FS/option_Common.pm b/FS/FS/option_Common.pm
index b29cf44..c1dda22 100644 (file)
--- 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;
     }