Refactoring von orphaned in AM get_account

[mfinanz.git] / SL / AM.pm

diff --git a/SL/AM.pm b/SL/AM.pm
index 2cf6a43f14c07f0fc816fdc48a3ad517c32e398c..b991acf394e1d05f84215bf69e55af9c3ecb9392 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -55,6 +55,9 @@ sub get_account {
 
   my ($self, $myconfig, $form) = @_;
 
 
   my ($self, $myconfig, $form) = @_;
 

+
+  my $chart_obj = SL::DB::Manager::Chart->find_by(id => $form->{id}) || die "Can't open chart";
+

   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   my $query = qq{
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   my $query = qq{


@@ -173,16 +176,9 @@ sub get_account {
     $sth->finish;
 
   }
     $sth->finish;
 
   }

-  # check if we have any transactions
-  $query = qq|SELECT a.trans_id FROM acc_trans a
-              WHERE a.chart_id = ?|;
-  $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query");
-  $sth = $dbh->prepare($query);
-  $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})");

 
 

-  ($form->{orphaned}) = $sth->fetchrow_array;
-  $form->{orphaned} = !$form->{orphaned};
-  $sth->finish;
+  # check if there any transactions for this chart
+  $form->{orphaned} = $chart_obj->has_transaction ? 0 : 1;

 
   # check if new account is active
   $form->{new_chart_valid} = 0;
 
   # check if new account is active
   $form->{new_chart_valid} = 0;