Dialogbuchung: Web-Template: Id nicht als Input rendern

[mfinanz.git] / SL / GL.pm

diff --git a/SL/GL.pm b/SL/GL.pm
index 4dbd703c7940b0ceb3a75093e95ab92350354832..4c892e764713f886230f733968c1be7a88222ebf 100644 (file)
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -25,7 +25,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software

-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.

 #======================================================================
 #
 # General ledger backend code
 #======================================================================
 #
 # General ledger backend code


@@ -38,31 +39,41 @@
 
 package GL;
 
 
 package GL;
 

+use List::Util qw(first);
+

 use Data::Dumper;
 use Data::Dumper;

+use SL::DATEV qw(:CONSTANTS);
+use SL::DBUtils;
+use SL::DB::Chart;
+use SL::DB::Draft;
+use SL::Util qw(trim);
+use SL::DB;
+
+use strict;

 
 sub delete_transaction {
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 
 
 sub delete_transaction {
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 

-  # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig);
-
-  my $query = qq|DELETE FROM gl WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  SL::DB->client->with_transaction(sub {
+    do_query($form, SL::DB->client->dbh, qq|DELETE FROM gl WHERE id = ?|, conv_i($form->{id}));
+    1;
+  }) or do { die SL::DB->client->error };

 
 

-  $query = qq|DELETE FROM acc_trans WHERE trans_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
-
-  # commit and redirect
-  my $rc = $dbh->commit;
-  $dbh->disconnect;

   $main::lxdebug->leave_sub();
   $main::lxdebug->leave_sub();

+}
+
+sub post_transaction {
+  my ($self, $myconfig, $form) = @_;
+  $main::lxdebug->enter_sub();

 
 

-  $rc;
+  my $rc = SL::DB->client->with_transaction(\&_post_transaction, $self, $myconfig, $form);

 
 

+  $::lxdebug->leave_sub;
+  return $rc;

 }
 
 }
 

-sub post_transaction {
+sub _post_transaction {

   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 


@@ -71,18 +82,7 @@ sub post_transaction {
 
   my $i;
 
 
   my $i;
 

-  # check if debit and credit balances
-
-  if ($form->{storno}) {
-    $debit               = $debit * -1;
-    $credit              = $credit * -1;
-    $tax                 = $tax * -1;
-    $form->{reference}   = "Storno-" . $form->{reference};
-    $form->{description} = "Storno-" . $form->{description};
-  }
-
-  # connect to database, turn off AutoCommit
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $dbh = SL::DB->client->dbh;

 
   # post the transaction
   # make up a unique handle and store in reference field
 
   # post the transaction
   # make up a unique handle and store in reference field


@@ -93,75 +93,52 @@ sub post_transaction {
   # if there is a $form->{id} replace the old transaction
   # delete all acc_trans entries and add the new ones
 
   # if there is a $form->{id} replace the old transaction
   # delete all acc_trans entries and add the new ones
 

-  # escape '
-  map { $form->{$_} =~ s/\'/\'\'/g } qw(reference description notes);
-

   if (!$form->{taxincluded}) {
     $form->{taxincluded} = 0;
   }
 
   if (!$form->{taxincluded}) {
     $form->{taxincluded} = 0;
   }
 

-  my ($query, $sth);
+  my ($query, $sth, @values, $taxkey, $rate, $posted);

 
   if ($form->{id}) {
 
     # delete individual transactions
 
   if ($form->{id}) {
 
     # delete individual transactions

-    $query = qq|DELETE FROM acc_trans 
-                WHERE trans_id = $form->{id}|;
-    $dbh->do($query) || $form->dberror($query);
+    $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
+    @values = (conv_i($form->{id}));
+    do_query($form, $dbh, $query, @values);

 
   } else {
 
   } else {

-    my $uid = time;
-    $uid .= $form->{login};
-
-    $query = qq|INSERT INTO gl (reference, employee_id)
-                VALUES ('$uid', (SELECT e.id FROM employee e
-                                WHERE e.login = '$form->{login}'))|;
-    $dbh->do($query) || $form->dberror($query);
-
-    $query = qq|SELECT g.id FROM gl g
-                WHERE g.reference = '$uid'|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    ($form->{id}) = $sth->fetchrow_array;
-    $sth->finish;
+    $query = qq|SELECT nextval('glid')|;
+    ($form->{id}) = selectrow_query($form, $dbh, $query);

 
 

+    $query =
+      qq|INSERT INTO gl (id, employee_id) | .
+      qq|VALUES (?, (SELECT id FROM employee WHERE login = ?))|;
+    @values = ($form->{id}, $::myconfig{login});
+    do_query($form, $dbh, $query, @values);

   }
 
   }
 

-  my ($null, $department_id) = split /--/, $form->{department};
-  $department_id *= 1;
+  $form->{ob_transaction} *= 1;
+  $form->{cb_transaction} *= 1;

 
 

-  $query = qq|UPDATE gl SET 
-             reference = '$form->{reference}',
-             description = '$form->{description}',
-             notes = '$form->{notes}',
-             transdate = '$form->{transdate}',
-             department_id = $department_id,
-             taxincluded = '$form->{taxincluded}'
-             WHERE id = $form->{id}|;
+  $query =
+    qq|UPDATE gl SET
+         reference = ?, description = ?, notes = ?,
+         transdate = ?, deliverydate = ?, tax_point = ?, department_id = ?, taxincluded = ?,
+         storno = ?, storno_id = ?, ob_transaction = ?, cb_transaction = ?
+       WHERE id = ?|;

 
 

-  $dbh->do($query) || $form->dberror($query);
-  ($taxkey, $rate) = split(/--/, $form->{taxkey});
+  @values = ($form->{reference}, $form->{description}, $form->{notes},
+             conv_date($form->{transdate}), conv_date($form->{deliverydate}), conv_date($form->{tax_point}), conv_i($form->{department_id}), $form->{taxincluded} ? 't' : 'f',
+             $form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f',
+             conv_i($form->{id}));
+  do_query($form, $dbh, $query, @values);

 
   # insert acc_trans transactions
   for $i (1 .. $form->{rowcount}) {
 
   # insert acc_trans transactions
   for $i (1 .. $form->{rowcount}) {

-    my $taxkey;
-    my $rate;
-    # extract accno
-    print(STDERR $form->{"taxchart_$i"}, "TAXCHART\n");
-    my ($accno) = split(/--/, $form->{"accno_$i"});
-    my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
-    ($form->{"tax_id_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
+    ($form->{"tax_id_$i"}) = split(/--/, $form->{"taxchart_$i"});

     if ($form->{"tax_id_$i"} ne "") {
     if ($form->{"tax_id_$i"} ne "") {

-      $query = qq|SELECT t.taxkey, t.rate
-              FROM tax t
-              WHERE t.id=$form->{"tax_id_$i"}|;
-  
-      $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
-      ($taxkey, $rate) =
-        $sth->fetchrow_array;
-      $sth->finish;
+      $query = qq|SELECT taxkey, rate FROM tax WHERE id = ?|;
+      ($taxkey, $rate) = selectrow_query($form, $dbh, $query, conv_i($form->{"tax_id_$i"}));

     }
 
     my $amount = 0;
     }
 
     my $amount = 0;


@@ -179,254 +156,321 @@ sub post_transaction {
       $posted = 0;
     }
 
       $posted = 0;
     }
 

+    $project_id = conv_i($form->{"project_id_$i"});
+

     # if there is an amount, add the record
     if ($amount != 0) {
     # if there is an amount, add the record
     if ($amount != 0) {

-      $project_id =
-        ($form->{"project_id_$i"}) ? $form->{"project_id_$i"} : 'NULL';
-      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
-                  source, memo, project_id, taxkey)
-                 VALUES
-                 ($form->{id}, (SELECT c.id
-                                FROM chart c
-                                WHERE c.accno = '$accno'),
-                  $amount, '$form->{transdate}', |
-        . $dbh->quote($form->{"source_$i"}) . qq|, |
-        . $dbh->quote($form->{"memo_$i"}) . qq|,
-                 $project_id, $taxkey)|;
-
-      $dbh->do($query) || $form->dberror($query);
+      $query =
+        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
+                                  source, memo, project_id, taxkey, ob_transaction, cb_transaction, tax_id, chart_link)
+           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT link FROM chart WHERE id = ?))|;
+      @values = (conv_i($form->{id}), $form->{"accno_id_$i"}, $amount, conv_date($form->{transdate}),
+                 $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey, $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f', conv_i($form->{"tax_id_$i"}), $form->{"accno_id_$i"});
+      do_query($form, $dbh, $query, @values);

     }
 
     if ($tax != 0) {
     }
 
     if ($tax != 0) {

-

       # add taxentry
       # add taxentry

-      $amount = $tax;
-
-      $project_id =
-        ($form->{"project_id_$i"}) ? $form->{"project_id_$i"} : 'NULL';
-      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
-                  source, memo, project_id, taxkey)
-                  VALUES
-                  ($form->{id}, (SELECT t.chart_id
-                  FROM tax t
-                  WHERE t.id = $form->{"tax_id_$i"}),
-                  $amount, '$form->{transdate}', |
-        . $dbh->quote($form->{"source_$i"}) . qq|, |
-        . $dbh->quote($form->{"memo_$i"}) . qq|,
-                          $project_id, $taxkey)|;
-
-      $dbh->do($query) || $form->dberror($query);
+      $query =
+        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
+                                  source, memo, project_id, taxkey, tax_id, chart_link)
+           VALUES (?, (SELECT chart_id FROM tax WHERE id = ?),
+                   ?, ?, ?, ?, ?, ?, ?, (SELECT link
+                                         FROM chart
+                                         WHERE id = (SELECT chart_id
+                                                     FROM tax
+                                                     WHERE id = ?)))|;
+      @values = (conv_i($form->{id}), conv_i($form->{"tax_id_$i"}),
+                 $tax, conv_date($form->{transdate}), $form->{"source_$i"},
+                 $form->{"memo_$i"}, $project_id, $taxkey, conv_i($form->{"tax_id_$i"}), conv_i($form->{"tax_id_$i"}));
+      do_query($form, $dbh, $query, @values);

     }
   }
 
     }
   }
 

-  my %audittrail = (tablename => 'gl',
-                    reference => $form->{reference},
-                    formname  => 'transaction',
-                    action    => 'posted',
-                    id        => $form->{id});
+  if ($form->{storno} && $form->{storno_id}) {
+    do_query($form, $dbh, qq|UPDATE gl SET storno = 't' WHERE id = ?|, conv_i($form->{storno_id}));
+  }

 
 

-  # $form->audittrail($dbh, "", \%audittrail);
+  if ($form->{draft_id}) {
+    SL::DB::Manager::Draft->delete_all(where => [ id => delete($form->{draft_id}) ]);
+  }

 
 

-  # commit and redirect
-  my $rc = $dbh->commit;
-  $dbh->disconnect;
-  $main::lxdebug->leave_sub();
+  # safety check datev export
+  if ($::instance_conf->get_datev_check_on_gl_transaction) {

 
 

-  $rc;
+    # create datev object
+    my $datev = SL::DATEV->new(
+      dbh        => $dbh,
+      trans_id   => $form->{id},
+    );
+
+    $datev->generate_datev_data;
+
+    if ($datev->errors) {
+      die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors;
+    }
+  }

 
 

+  return 1;

 }
 
 sub all_transactions {
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 
 }
 
 sub all_transactions {
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 

-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-  my ($query, $sth, $source, $null);
+  my $dbh = SL::DB->client->dbh;
+  my ($query, $sth, $source, $null, $space);

 
   my ($glwhere, $arwhere, $apwhere) = ("1 = 1", "1 = 1", "1 = 1");
 
   my ($glwhere, $arwhere, $apwhere) = ("1 = 1", "1 = 1", "1 = 1");

+  my (@glvalues, @arvalues, @apvalues);

 
   if ($form->{reference}) {
 
   if ($form->{reference}) {

-    $source = $form->like(lc $form->{reference});
-    $glwhere .= " AND lower(g.reference) LIKE '$source'";
-    $arwhere .= " AND lower(a.invnumber) LIKE '$source'";
-    $apwhere .= " AND lower(a.invnumber) LIKE '$source'";
+    $glwhere .= qq| AND g.reference ILIKE ?|;
+    $arwhere .= qq| AND a.invnumber ILIKE ?|;
+    $apwhere .= qq| AND a.invnumber ILIKE ?|;
+    push(@glvalues, like($form->{reference}));
+    push(@arvalues, like($form->{reference}));
+    push(@apvalues, like($form->{reference}));

   }
   }

-  if ($form->{department}) {
-    ($null, $source) = split /--/, $form->{department};
-    $glwhere .= " AND g.department_id = $source";
-    $arwhere .= " AND a.department_id = $source";
-    $apwhere .= " AND a.department_id = $source";
+
+  if ($form->{department_id}) {
+    $glwhere .= qq| AND g.department_id = ?|;
+    $arwhere .= qq| AND a.department_id = ?|;
+    $apwhere .= qq| AND a.department_id = ?|;
+    push(@glvalues, $form->{department_id});
+    push(@arvalues, $form->{department_id});
+    push(@apvalues, $form->{department_id});

   }
 
   if ($form->{source}) {
   }
 
   if ($form->{source}) {

-    $source = $form->like(lc $form->{source});
-    $glwhere .= " AND lower(ac.source) LIKE '$source'";
-    $arwhere .= " AND lower(ac.source) LIKE '$source'";
-    $apwhere .= " AND lower(ac.source) LIKE '$source'";
+    $glwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)";
+    $arwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)";
+    $apwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)";
+    push(@glvalues, like($form->{source}));
+    push(@arvalues, like($form->{source}));
+    push(@apvalues, like($form->{source}));

   }
   }

-  if ($form->{datefrom}) {
-    $glwhere .= " AND ac.transdate >= '$form->{datefrom}'";
-    $arwhere .= " AND ac.transdate >= '$form->{datefrom}'";
-    $apwhere .= " AND ac.transdate >= '$form->{datefrom}'";
+
+  # default Datumseinschränkung falls nicht oder falsch übergeben (sollte nie passieren)
+  $form->{datesort} = 'transdate' unless $form->{datesort} =~ /^(transdate|gldate)$/;
+
+  if (trim($form->{datefrom})) {
+    $glwhere .= " AND ac.$form->{datesort} >= ?";
+    $arwhere .= " AND ac.$form->{datesort} >= ?";
+    $apwhere .= " AND ac.$form->{datesort} >= ?";
+    push(@glvalues, trim($form->{datefrom}));
+    push(@arvalues, trim($form->{datefrom}));
+    push(@apvalues, trim($form->{datefrom}));

   }
   }

-  if ($form->{dateto}) {
-    $glwhere .= " AND ac.transdate <= '$form->{dateto}'";
-    $arwhere .= " AND ac.transdate <= '$form->{dateto}'";
-    $apwhere .= " AND ac.transdate <= '$form->{dateto}'";
+
+  if (trim($form->{dateto})) {
+    $glwhere .= " AND ac.$form->{datesort} <= ?";
+    $arwhere .= " AND ac.$form->{datesort} <= ?";
+    $apwhere .= " AND ac.$form->{datesort} <= ?";
+    push(@glvalues, trim($form->{dateto}));
+    push(@arvalues, trim($form->{dateto}));
+    push(@apvalues, trim($form->{dateto}));

   }
   }

-  if ($form->{description}) {
-    my $description = $form->like(lc $form->{description});
-    $glwhere .= " AND lower(g.description) LIKE '$description'";
-    $arwhere .= " AND lower(ct.name) LIKE '$description'";
-    $apwhere .= " AND lower(ct.name) LIKE '$description'";
+
+  if (trim($form->{description})) {
+    $glwhere .= " AND g.description ILIKE ?";
+    $arwhere .= " AND ct.name ILIKE ?";
+    $apwhere .= " AND ct.name ILIKE ?";
+    push(@glvalues, like($form->{description}));
+    push(@arvalues, like($form->{description}));
+    push(@apvalues, like($form->{description}));

   }
   }

-  if ($form->{notes}) {
-    my $notes = $form->like(lc $form->{notes});
-    $glwhere .= " AND lower(g.notes) LIKE '$notes'";
-    $arwhere .= " AND lower(a.notes) LIKE '$notes'";
-    $apwhere .= " AND lower(a.notes) LIKE '$notes'";
+
+  if ($form->{employee_id}) {
+    $glwhere .= " AND g.employee_id = ? ";
+    $arwhere .= " AND a.employee_id = ? ";
+    $apwhere .= " AND a.employee_id = ? ";
+    push(@glvalues, conv_i($form->{employee_id}));
+    push(@arvalues, conv_i($form->{employee_id}));
+    push(@apvalues, conv_i($form->{employee_id}));
+  }
+
+  if (trim($form->{notes})) {
+    $glwhere .= " AND g.notes ILIKE ?";
+    $arwhere .= " AND a.notes ILIKE ?";
+    $apwhere .= " AND a.notes ILIKE ?";
+    push(@glvalues, like($form->{notes}));
+    push(@arvalues, like($form->{notes}));
+    push(@apvalues, like($form->{notes}));

   }
   }

+

   if ($form->{accno}) {
     $glwhere .= " AND c.accno = '$form->{accno}'";
     $arwhere .= " AND c.accno = '$form->{accno}'";
     $apwhere .= " AND c.accno = '$form->{accno}'";
   }
   if ($form->{accno}) {
     $glwhere .= " AND c.accno = '$form->{accno}'";
     $arwhere .= " AND c.accno = '$form->{accno}'";
     $apwhere .= " AND c.accno = '$form->{accno}'";
   }

-  if ($form->{gifi_accno}) {
-    $glwhere .= " AND c.gifi_accno = '$form->{gifi_accno}'";
-    $arwhere .= " AND c.gifi_accno = '$form->{gifi_accno}'";
-    $apwhere .= " AND c.gifi_accno = '$form->{gifi_accno}'";
-  }
+

   if ($form->{category} ne 'X') {
   if ($form->{category} ne 'X') {

-    $glwhere .=
-      " AND gl.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+    $glwhere .= qq| AND g.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = ?))|;
+    $arwhere .= qq| AND a.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = ?))|;
+    $apwhere .= qq| AND a.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = ?))|;
+    push(@glvalues, $form->{category});
+    push(@arvalues, $form->{category});
+    push(@apvalues, $form->{category});
+  }
+
+  if ($form->{project_id}) {
+    $glwhere .= qq| AND g.id IN (SELECT DISTINCT trans_id FROM acc_trans WHERE project_id = ?)|;

     $arwhere .=
     $arwhere .=

-      " AND ar.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+      qq| AND ((a.globalproject_id = ?) OR
+               (a.id IN (SELECT DISTINCT trans_id FROM acc_trans WHERE project_id = ?)))|;

     $apwhere .=
     $apwhere .=

-      " AND ap.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+      qq| AND ((a.globalproject_id = ?) OR
+               (a.id IN (SELECT DISTINCT trans_id FROM acc_trans WHERE project_id = ?)))|;
+    my $project_id = conv_i($form->{project_id});
+    push(@glvalues, $project_id);
+    push(@arvalues, $project_id, $project_id);
+    push(@apvalues, $project_id, $project_id);

   }
 
   }
 

-  if ($form->{accno}) {
-
-    # get category for account
-    $query = qq|SELECT c.category
-                FROM chart c
-               WHERE c.accno = '$form->{accno}'|;
-    $sth = $dbh->prepare($query);
-
-    $sth->execute || $form->dberror($query);
-    ($form->{ml}) = $sth->fetchrow_array;
-    $sth->finish;
-
-    if ($form->{datefrom}) {
-      $query = qq|SELECT SUM(ac.amount)
-                 FROM acc_trans ac, chart c
-                 WHERE ac.chart_id = c.id
-                 AND c.accno = '$form->{accno}'
-                 AND ac.transdate < date '$form->{datefrom}'
-                 |;
-      $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
-
-      ($form->{balance}) = $sth->fetchrow_array;
-      $sth->finish;
-    }
+  my ($project_columns,            $project_join);
+  my ($arap_globalproject_columns, $arap_globalproject_join);
+  my ($gl_globalproject_columns);
+  if ($form->{"l_projectnumbers"}) {
+    $project_columns            = qq|, ac.project_id, pr.projectnumber|;
+    $project_join               = qq|LEFT JOIN project pr ON (ac.project_id = pr.id)|;
+    $arap_globalproject_columns = qq|, a.globalproject_id, globalpr.projectnumber AS globalprojectnumber|;
+    $arap_globalproject_join    = qq|LEFT JOIN project globalpr ON (a.globalproject_id = globalpr.id)|;
+    $gl_globalproject_columns   = qq|, NULL AS globalproject_id, '' AS globalprojectnumber|;

   }
 
   }
 

-  if ($form->{gifi_accno}) {
-
+  if ($form->{accno}) {

     # get category for account
     # get category for account

-    $query = qq|SELECT c.category
-                FROM chart c
-               WHERE c.gifi_accno = '$form->{gifi_accno}'|;
-    $sth = $dbh->prepare($query);
-
-    $sth->execute || $form->dberror($query);
-    ($form->{ml}) = $sth->fetchrow_array;
-    $sth->finish;
+    $query = qq|SELECT category FROM chart WHERE accno = ?|;
+    ($form->{ml}) = selectrow_query($form, $dbh, $query, $form->{accno});

 
     if ($form->{datefrom}) {
 
     if ($form->{datefrom}) {

-      $query = qq|SELECT SUM(ac.amount)
-                 FROM acc_trans ac, chart c
-                 WHERE ac.chart_id = c.id
-                 AND c.gifi_accno = '$form->{gifi_accno}'
-                 AND ac.transdate < date '$form->{datefrom}'
-                 |;
-      $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
-
-      ($form->{balance}) = $sth->fetchrow_array;
-      $sth->finish;
+      $query =
+        qq|SELECT SUM(ac.amount)
+           FROM acc_trans ac
+           LEFT JOIN chart c ON (ac.chart_id = c.id)
+           WHERE (c.accno = ?) AND (ac.$form->{datesort} < ?)|;
+      ($form->{balance}) = selectrow_query($form, $dbh, $query, $form->{accno}, conv_date($form->{datefrom}));

     }
   }
 
     }
   }
 

-  my $false = ($myconfig->{dbdriver} eq 'Pg') ? FALSE: q|'0'|;
-
-  my $sortorder = join ', ',
-    $form->sort_columns(qw(transdate reference source description accno));
-  my %ordinal = (transdate   => 6,
-                 reference   => 4,
-                 source      => 7,
-                 description => 5);
-  map { $sortorder =~ s/$_/$ordinal{$_}/ } keys %ordinal;
-
-  if ($form->{sort}) {
-    $sortorder = $form->{sort} . ",";
-  } else {
-    $sortorder = "";
+  my %sort_columns =  (
+    'id'           => [ qw(id)                   ],
+    'transdate'    => [ qw(transdate id)         ],
+    'gldate'       => [ qw(gldate id)         ],
+    'reference'    => [ qw(lower_reference id)   ],
+    'description'  => [ qw(lower_description id) ],
+    'accno'        => [ qw(accno transdate id)   ],
+    'department'   => [ qw(department transdate id)   ],
+    );
+  my %lowered_columns =  (
+    'reference'       => { 'gl' => 'g.reference',   'arap' => 'a.invnumber', },
+    'source'          => { 'gl' => 'ac.source',     'arap' => 'ac.source',   },
+    'description'     => { 'gl' => 'g.description', 'arap' => 'ct.name',     },
+    );
+
+  # sortdir = sort direction (ascending or descending)
+  my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
+  my $sortkey   = $sort_columns{$form->{sort}} ? $form->{sort} : $form->{datesort};  # default used to be transdate
+  my $sortorder = join ', ', map { "$_ $sortdir" } @{ $sort_columns{$sortkey} };
+
+  my %columns_for_sorting = ( 'gl' => '', 'arap' => '', );
+  foreach my $spec (@{ $sort_columns{$sortkey} }) {
+    next if ($spec !~ m/^lower_(.*)$/);
+
+    my $column = $1;
+    map { $columns_for_sorting{$_} .= sprintf(', lower(%s) AS lower_%s', $lowered_columns{$column}->{$_}, $column) } qw(gl arap);

   }
 
   }
 

-  my $query =
-    qq|SELECT ac.oid AS acoid, g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, c.link,
-                 g.description, ac.transdate, ac.source, ac.trans_id,
-                ac.amount, c.accno, c.gifi_accno, g.notes, t.chart_id, ac.oid
-                 FROM gl g, acc_trans ac, chart c LEFT JOIN tax t ON
-                 (t.chart_id=c.id)
-                 WHERE $glwhere
-                AND ac.chart_id = c.id
-                AND g.id = ac.trans_id
-       UNION
-                SELECT ac.oid AS acoid, a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
-                ct.name, ac.transdate, ac.source, ac.trans_id,
-                ac.amount, c.accno, c.gifi_accno, a.notes, t.chart_id, ac.oid
-                FROM ar a, acc_trans ac, customer ct, chart c LEFT JOIN tax t ON
-                 (t.chart_id=c.id)
-                WHERE $arwhere
-                AND ac.chart_id = c.id
-                AND a.customer_id = ct.id
-                AND a.id = ac.trans_id
-       UNION
-                SELECT ac.oid AS acoid, a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
-                ct.name, ac.transdate, ac.source, ac.trans_id,
-                ac.amount, c.accno, c.gifi_accno, a.notes, t.chart_id, ac.oid
-                FROM ap a, acc_trans ac, vendor ct, chart c LEFT JOIN tax t ON
-                 (t.chart_id=c.id)
-                WHERE $apwhere
-                AND ac.chart_id = c.id
-                AND a.vendor_id = ct.id
-                AND a.id = ac.trans_id
-                ORDER BY $sortorder transdate,acoid, trans_id, taxkey DESC|;
+  $query =
+    qq|SELECT
+        ac.acc_trans_id, g.id, 'gl' AS type, FALSE AS invoice, g.reference, ac.taxkey, c.link,
+        g.description, ac.transdate, ac.gldate, ac.source, ac.trans_id,
+        ac.amount, c.accno, g.notes, t.chart_id,
+        d.description AS department,
+        CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
+        $project_columns $gl_globalproject_columns
+        $columns_for_sorting{gl}
+      FROM gl g
+      LEFT JOIN employee e ON (g.employee_id = e.id)
+      LEFT JOIN department d ON (g.department_id = d.id),
+      acc_trans ac $project_join, chart c
+      LEFT JOIN tax t ON (t.chart_id = c.id)
+      WHERE $glwhere
+        AND (ac.chart_id = c.id)
+        AND (g.id = ac.trans_id)
+
+      UNION
+
+      SELECT ac.acc_trans_id, a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
+        ct.name, ac.transdate, ac.gldate, ac.source, ac.trans_id,
+        ac.amount, c.accno, a.notes, t.chart_id,
+        d.description AS department,
+        CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
+        $project_columns $arap_globalproject_columns
+        $columns_for_sorting{arap}
+      FROM ar a
+      LEFT JOIN employee e ON (a.employee_id = e.id)
+      LEFT JOIN department d ON (a.department_id = d.id)
+      $arap_globalproject_join,
+      acc_trans ac $project_join, customer ct, chart c
+      LEFT JOIN tax t ON (t.chart_id=c.id)
+      WHERE $arwhere
+        AND (ac.chart_id = c.id)
+        AND (a.customer_id = ct.id)
+        AND (a.id = ac.trans_id)
+
+      UNION
+
+      SELECT ac.acc_trans_id, a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
+        ct.name, ac.transdate, ac.gldate, ac.source, ac.trans_id,
+        ac.amount, c.accno, a.notes, t.chart_id,
+        d.description AS department,
+        CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
+        $project_columns $arap_globalproject_columns
+        $columns_for_sorting{arap}
+      FROM ap a
+      LEFT JOIN employee e ON (a.employee_id = e.id)
+      LEFT JOIN department d ON (a.department_id = d.id)
+      $arap_globalproject_join,
+      acc_trans ac $project_join, vendor ct, chart c
+      LEFT JOIN tax t ON (t.chart_id=c.id)
+      WHERE $apwhere
+        AND (ac.chart_id = c.id)
+        AND (a.vendor_id = ct.id)
+        AND (a.id = ac.trans_id)
+
+      ORDER BY $sortorder, acc_trans_id $sortdir|;
+#      ORDER BY gldate DESC, id DESC, acc_trans_id DESC
+
+  my @values = (@glvalues, @arvalues, @apvalues);

 
   # Show all $query in Debuglevel LXDebug::QUERY
 
   # Show all $query in Debuglevel LXDebug::QUERY

-  $callingdetails = (caller (0))[3];
-  $main::lxdebug->message(LXDebug::QUERY, "$callingdetails \$query=\n $query");
-      
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my $callingdetails = (caller (0))[3];
+  dump_query(LXDebug->QUERY(), "$callingdetails", $query, @values);
+
+  $sth = prepare_execute_query($form, $dbh, $query, @values);

   my $trans_id  = "";
   my $trans_id2 = "";
   my $trans_id  = "";
   my $trans_id2 = "";

+  my $balance;
+
+  my ($i, $j, $k, $l, $ref, $ref2);
+
+  $form->{GL} = [];
+  while (my $ref0 = $sth->fetchrow_hashref("NAME_lc")) {

 
 

-  while (my $ref0 = $sth->fetchrow_hashref(NAME_lc)) {
-    

     $trans_id = $ref0->{id};
     $trans_id = $ref0->{id};

-    
+
+    my $source = $ref0->{source};
+    undef($ref0->{source});
+

     if ($trans_id != $trans_id2) { # first line of a booking
     if ($trans_id != $trans_id2) { # first line of a booking

-    
+

       if ($trans_id2) {
       if ($trans_id2) {

-        push @{ $form->{GL} }, $ref;
+        push(@{ $form->{GL} }, $ref);

         $balance = 0;
       }
         $balance = 0;
       }

-    
+

       $ref       = $ref0;
       $trans_id2 = $ref->{id};
 
       $ref       = $ref0;
       $trans_id2 = $ref->{id};
 


@@ -452,62 +496,67 @@ sub all_transactions {
           $ref->{module} = "ar";
         }
       }
           $ref->{module} = "ar";
         }
       }

-    
+
+      $ref->{"projectnumbers"} = {};
+      $ref->{"projectnumbers"}->{$ref->{"projectnumber"}}       = 1 if ($ref->{"projectnumber"});
+      $ref->{"projectnumbers"}->{$ref->{"globalprojectnumber"}} = 1 if ($ref->{"globalprojectnumber"});
+

       $balance = $ref->{amount};
       $balance = $ref->{amount};

-    
-      # Linenumbers of General Ledger  
+
+      # Linenumbers of General Ledger

       $k       = 0; # Debit      # AP      # Soll
       $l       = 0; # Credit     # AR      # Haben
       $i       = 0; # Debit Tax  # AP_tax  # VSt
       $j       = 0; # Credit Tax # AR_tax  # USt
       $k       = 0; # Debit      # AP      # Soll
       $l       = 0; # Credit     # AR      # Haben
       $i       = 0; # Debit Tax  # AP_tax  # VSt
       $j       = 0; # Credit Tax # AR_tax  # USt

-      

 
       if ($ref->{chart_id} > 0) { # all tax accounts first line, no line increasing
         if ($ref->{amount} < 0) {
           if ($ref->{link} =~ /AR_tax/) {
             $ref->{credit_tax}{$j}       = $ref->{amount};
 
       if ($ref->{chart_id} > 0) { # all tax accounts first line, no line increasing
         if ($ref->{amount} < 0) {
           if ($ref->{link} =~ /AR_tax/) {
             $ref->{credit_tax}{$j}       = $ref->{amount};

-            $ref->{credit_tax_accno}{$j} = $ref->{accno};              
-          }
+            $ref->{credit_tax_accno}{$j} = $ref->{accno};
+         }

           if ($ref->{link} =~ /AP_tax/) {
             $ref->{debit_tax}{$i}       = $ref->{amount} * -1;
           if ($ref->{link} =~ /AP_tax/) {
             $ref->{debit_tax}{$i}       = $ref->{amount} * -1;

-            $ref->{debit_tax_accno}{$i} = $ref->{accno};   
+            $ref->{debit_tax_accno}{$i} = $ref->{accno};

           }
         } else {
           if ($ref->{link} =~ /AR_tax/) {
             $ref->{credit_tax}{$j}       = $ref->{amount};
           }
         } else {
           if ($ref->{link} =~ /AR_tax/) {
             $ref->{credit_tax}{$j}       = $ref->{amount};

-            $ref->{credit_tax_accno}{$j} = $ref->{accno};              
+            $ref->{credit_tax_accno}{$j} = $ref->{accno};

           }
           if ($ref->{link} =~ /AP_tax/) {
             $ref->{debit_tax}{$i}       = $ref->{amount} * -1;
           }
           if ($ref->{link} =~ /AP_tax/) {
             $ref->{debit_tax}{$i}       = $ref->{amount} * -1;

-            $ref->{debit_tax_accno}{$i} = $ref->{accno};   
+            $ref->{debit_tax_accno}{$i} = $ref->{accno};

           }
         }
       } else { #all other accounts first line
           }
         }
       } else { #all other accounts first line

+

         if ($ref->{amount} < 0) {
           $ref->{debit}{$k}        = $ref->{amount} * -1;
           $ref->{debit_accno}{$k}  = $ref->{accno};
           $ref->{debit_taxkey}{$k} = $ref->{taxkey};
         if ($ref->{amount} < 0) {
           $ref->{debit}{$k}        = $ref->{amount} * -1;
           $ref->{debit_accno}{$k}  = $ref->{accno};
           $ref->{debit_taxkey}{$k} = $ref->{taxkey};

-          $ref->{transdate}{$k}    = $ref->{transdate};
-
+          $ref->{ac_transdate}{$k} = $ref->{transdate};
+          $ref->{source}{$k}       = $source;

         } else {
           $ref->{credit}{$l}        = $ref->{amount} * 1;
           $ref->{credit_accno}{$l}  = $ref->{accno};
           $ref->{credit_taxkey}{$l} = $ref->{taxkey};
         } else {
           $ref->{credit}{$l}        = $ref->{amount} * 1;
           $ref->{credit_accno}{$l}  = $ref->{accno};
           $ref->{credit_taxkey}{$l} = $ref->{taxkey};

-          $ref->{transdate}{$l}     = $ref->{transdate};
-
-
+          $ref->{ac_transdate}{$l}  = $ref->{transdate};
+          $ref->{source}{$l}        = $source;

         }
       }
 
     } else { # following lines of a booking, line increasing
 
       $ref2      = $ref0;
         }
       }
 
     } else { # following lines of a booking, line increasing
 
       $ref2      = $ref0;

-      $trans_old  =$trans_id2;
+#      $trans_old = $trans_id2;   # doesn't seem to be used anymore

       $trans_id2 = $ref2->{id};
       $trans_id2 = $ref2->{id};

-  
+

       $balance =
         (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
 
       $balance =
         (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
 

+      $ref->{"projectnumbers"}->{$ref2->{"projectnumber"}}       = 1 if ($ref2->{"projectnumber"});
+      $ref->{"projectnumbers"}->{$ref2->{"globalprojectnumber"}} = 1 if ($ref2->{"globalprojectnumber"});

 
       if ($ref2->{chart_id} > 0) { # all tax accounts, following lines
         if ($ref2->{amount} < 0) {
 
       if ($ref2->{chart_id} > 0) { # all tax accounts, following lines
         if ($ref2->{amount} < 0) {


@@ -516,14 +565,14 @@ sub all_transactions {
               $j++;
             }
             $ref->{credit_tax}{$j}       = $ref2->{amount};
               $j++;
             }
             $ref->{credit_tax}{$j}       = $ref2->{amount};

-            $ref->{credit_tax_accno}{$j} = $ref2->{accno};              
+            $ref->{credit_tax_accno}{$j} = $ref2->{accno};

           }
           if ($ref2->{link} =~ /AP_tax/) {
             if ($ref->{debit_tax_accno}{$i} ne "") {
               $i++;
             }
             $ref->{debit_tax}{$i}       = $ref2->{amount} * -1;
           }
           if ($ref2->{link} =~ /AP_tax/) {
             if ($ref->{debit_tax_accno}{$i} ne "") {
               $i++;
             }
             $ref->{debit_tax}{$i}       = $ref2->{amount} * -1;

-            $ref->{debit_tax_accno}{$i} = $ref2->{accno};   
+            $ref->{debit_tax_accno}{$i} = $ref2->{accno};

           }
         } else {
           if ($ref2->{link} =~ /AR_tax/) {
           }
         } else {
           if ($ref2->{link} =~ /AR_tax/) {


@@ -531,14 +580,14 @@ sub all_transactions {
               $j++;
             }
             $ref->{credit_tax}{$j}       = $ref2->{amount};
               $j++;
             }
             $ref->{credit_tax}{$j}       = $ref2->{amount};

-            $ref->{credit_tax_accno}{$j} = $ref2->{accno};              
+            $ref->{credit_tax_accno}{$j} = $ref2->{accno};

           }
           if ($ref2->{link} =~ /AP_tax/) {
             if ($ref->{debit_tax_accno}{$i} ne "") {
               $i++;
             }
             $ref->{debit_tax}{$i}       = $ref2->{amount} * -1;
           }
           if ($ref2->{link} =~ /AP_tax/) {
             if ($ref->{debit_tax_accno}{$i} ne "") {
               $i++;
             }
             $ref->{debit_tax}{$i}       = $ref2->{amount} * -1;

-            $ref->{debit_tax_accno}{$i} = $ref2->{accno};   
+            $ref->{debit_tax_accno}{$i} = $ref2->{accno};

           }
         }
       } else { # all other accounts, following lines
           }
         }
       } else { # all other accounts, following lines


@@ -546,153 +595,270 @@ sub all_transactions {
           if ($ref->{debit_accno}{$k} ne "") {
             $k++;
           }
           if ($ref->{debit_accno}{$k} ne "") {
             $k++;
           }

+          if ($ref->{source}{$k} ne "") {
+            $space = " | ";
+          } else {
+            $space = "";
+          }

           $ref->{debit}{$k}        = $ref2->{amount} * - 1;
           $ref->{debit_accno}{$k}  = $ref2->{accno};
           $ref->{debit_taxkey}{$k} = $ref2->{taxkey};
           $ref->{debit}{$k}        = $ref2->{amount} * - 1;
           $ref->{debit_accno}{$k}  = $ref2->{accno};
           $ref->{debit_taxkey}{$k} = $ref2->{taxkey};

-          $ref->{transdate}{$k}    = $ref2->{transdate};
+          $ref->{ac_transdate}{$k} = $ref2->{transdate};
+          $ref->{source}{$k}       = $source . $space . $ref->{source}{$k};

         } else {
           if ($ref->{credit_accno}{$l} ne "") {
             $l++;
           }
         } else {
           if ($ref->{credit_accno}{$l} ne "") {
             $l++;
           }

+          if ($ref->{source}{$l} ne "") {
+            $space = " | ";
+          } else {
+            $space = "";
+          }

           $ref->{credit}{$l}        = $ref2->{amount};
           $ref->{credit_accno}{$l}  = $ref2->{accno};
           $ref->{credit_taxkey}{$l} = $ref2->{taxkey};
           $ref->{credit}{$l}        = $ref2->{amount};
           $ref->{credit_accno}{$l}  = $ref2->{accno};
           $ref->{credit_taxkey}{$l} = $ref2->{taxkey};

-          $ref->{transdate}{$l}     = $ref2->{transdate};
+          $ref->{ac_transdate}{$l}  = $ref2->{transdate};
+          $ref->{source}{$l}        = $ref->{source}{$l} . $space . $source;

         }
       }
     }
   }
         }
       }
     }
   }

+

   push @{ $form->{GL} }, $ref;
   $sth->finish;
 
   if ($form->{accno}) {
   push @{ $form->{GL} }, $ref;
   $sth->finish;
 
   if ($form->{accno}) {

-    $query =
-      qq|SELECT c.description FROM chart c WHERE c.accno = '$form->{accno}'|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    ($form->{account_description}) = $sth->fetchrow_array;
-    $sth->finish;
+    $query = qq|SELECT c.description FROM chart c WHERE c.accno = ?|;
+    ($form->{account_description}) = selectrow_query($form, $dbh, $query, $form->{accno});

   }
   }

-  if ($form->{gifi_accno}) {
-    $query =
-      qq|SELECT g.description FROM gifi g WHERE g.accno = '$form->{gifi_accno}'|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);

 
 

-    ($form->{gifi_account_description}) = $sth->fetchrow_array;
-    $sth->finish;
-  }

   $main::lxdebug->leave_sub();
   $main::lxdebug->leave_sub();

-
-  $dbh->disconnect;
-

 }
 
 sub transaction {
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 
 }
 
 sub transaction {
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 

-  my ($query, $sth, $ref);
+  my ($query, $sth, $ref, @values);
+
+  my $dbh = SL::DB->client->dbh;

 
 

-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  $query = qq|SELECT closedto, revtrans FROM defaults|;
+  ($form->{closedto}, $form->{revtrans}) = selectrow_query($form, $dbh, $query);
+
+  $query = qq|SELECT id, gldate
+              FROM gl
+              WHERE id = (SELECT max(id) FROM gl)|;
+  ($form->{previous_id}, $form->{previous_gldate}) = selectrow_query($form, $dbh, $query);

 
   if ($form->{id}) {
 
   if ($form->{id}) {

-    $query = "SELECT closedto, revtrans
-              FROM defaults";
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    ($form->{closedto}, $form->{revtrans}) = $sth->fetchrow_array;
-    $sth->finish;
-
-    $query = "SELECT g.reference, g.description, g.notes, g.transdate,
-              d.description AS department, e.name as employee, g.taxincluded, g.gldate
-              FROM gl g
-           LEFT JOIN department d ON (d.id = g.department_id)  
-           LEFT JOIN employee e ON (e.id = g.employee_id)  
-           WHERE g.id = $form->{id}";
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-    $ref = $sth->fetchrow_hashref(NAME_lc);
+    $query =
+      qq|SELECT g.reference, g.description, g.notes, g.transdate, g.deliverydate, g.tax_point,
+           g.storno, g.storno_id,
+           g.department_id, d.description AS department,
+           e.name AS employee, g.taxincluded, g.gldate,
+         g.ob_transaction, g.cb_transaction
+         FROM gl g
+         LEFT JOIN department d ON (d.id = g.department_id)
+         LEFT JOIN employee e ON (e.id = g.employee_id)
+         WHERE g.id = ?|;
+    $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{id}));

     map { $form->{$_} = $ref->{$_} } keys %$ref;
     map { $form->{$_} = $ref->{$_} } keys %$ref;

-    $sth->finish;

 
     # retrieve individual rows
 
     # retrieve individual rows

-    $query = qq|SELECT c.accno, t.taxkey AS accnotaxkey, a.amount, a.memo,
-                a.transdate, a.cleared, a.project_id, p.projectnumber,(SELECT p.projectnumber FROM project p
-                WHERE a.project_id = p.id) AS projectnumber, a.taxkey, t.rate AS taxrate, t.id, (SELECT c1.accno FROM chart c1, tax t1 WHERE t1.id=t.id AND c1.id=t.chart_id) AS taxaccno, (SELECT tk.tax_id FROM taxkeys tk WHERE tk.chart_id =a.chart_id AND tk.startdate<=a.transdate ORDER BY tk.startdate desc LIMIT 1) AS tax_id
-               FROM acc_trans a
-               JOIN chart c ON (c.id = a.chart_id)
-               LEFT JOIN project p ON (p.id = a.project_id)
-                LEFT JOIN tax t ON (t.id=(SELECT tk.tax_id from taxkeys tk WHERE (tk.taxkey_id=a.taxkey) AND ((CASE WHEN a.chart_id IN (SELECT chart_id FROM taxkeys WHERE taxkey_id=a.taxkey) THEN tk.chart_id=a.chart_id ELSE 1=1 END) OR (c.link LIKE '%tax%')) AND startdate <=a.transdate ORDER BY startdate DESC LIMIT 1)) 
-                WHERE a.trans_id = $form->{id}
-               AND a.fx_transaction = '0'
-               ORDER BY a.oid,a.transdate|;
-
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    $form->{GL} = [];
-    while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-      push @{ $form->{GL} }, $ref;
-    }
-
-    # get tax description
-    $query = qq| SELECT * FROM tax t order by t.taxkey|;
-    $sth   = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-    $form->{TAX} = [];
-    while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-      push @{ $form->{TAX} }, $ref;
-    }
+    $query =
+      qq|SELECT c.accno, t.taxkey AS accnotaxkey, a.amount, a.memo, a.source,
+           a.transdate, a.cleared, a.project_id, p.projectnumber,
+           a.taxkey, t.rate AS taxrate, t.id, a.chart_id,
+           (SELECT c1.accno
+            FROM chart c1, tax t1
+            WHERE (t1.id = t.id) AND (c1.id = t.chart_id)) AS taxaccno,
+           (SELECT tk.tax_id
+            FROM taxkeys tk
+            WHERE (tk.chart_id = a.chart_id) AND (tk.startdate <= a.transdate)
+            ORDER BY tk.startdate desc LIMIT 1) AS tax_id
+         FROM acc_trans a
+         JOIN chart c ON (c.id = a.chart_id)
+         LEFT JOIN project p ON (p.id = a.project_id)
+         LEFT JOIN tax t ON (t.id = a.tax_id)
+         WHERE (a.trans_id = ?)
+           AND (a.fx_transaction = '0')
+         ORDER BY a.acc_trans_id, a.transdate|;
+    $form->{GL} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));

 
 

-    $sth->finish;

   } else {
   } else {

-    $query = "SELECT closedto, revtrans FROM defaults";
-    ($form->{closedto}, $form->{revtrans}) = $dbh->selectrow_array($query);

     $query =
     $query =

-      "SELECT COALESCE(" .
-      "  (SELECT transdate FROM gl WHERE id = " .
-      "    (SELECT MAX(id) FROM gl) LIMIT 1), " .
-      "  current_date)";
-    ($form->{transdate}) = $dbh->selectrow_array($query);
-
-    # get tax description
-    $query = qq| SELECT * FROM tax t order by t.taxkey|;
-    $sth   = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-    $form->{TAX} = ();
-    while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-      push @{ $form->{TAX} }, $ref;
-    }
+      qq|SELECT COALESCE(
+           (SELECT transdate
+            FROM gl
+            WHERE id = (SELECT MAX(id) FROM gl)
+            LIMIT 1),
+           current_date)|;
+    ($form->{transdate}) = selectrow_query($form, $dbh, $query);

   }
 
   }
 

-  $sth->finish;
-  my $transdate = "current_date";
-  if ($form->{transdate}) {
-    $transdate = qq|'$form->{transdate}'|;
-  }
+  # get tax description
+  $query = qq|SELECT * FROM tax ORDER BY taxkey|;
+  $form->{TAX} = selectall_hashref_query($form, $dbh, $query);
+

   # get chart of accounts
   # get chart of accounts

-  $query = qq|SELECT c.accno, c.description, c.link, tk.taxkey_id, tk.tax_id
-                FROM chart c 
-                LEFT JOIN taxkeys tk ON (tk.id = (SELECT id from taxkeys where taxkeys.chart_id =c.id AND startdate<=$transdate ORDER BY startdate desc LIMIT 1))
-                ORDER BY c.accno|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-  $form->{chart} = ();
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{chart} }, $ref;
-  }
-  $sth->finish;
+  $query =
+    qq|SELECT c.accno, c.description, c.link, tk.taxkey_id, tk.tax_id
+       FROM chart c
+       LEFT JOIN taxkeys tk ON (tk.id =
+         (SELECT id
+          FROM taxkeys
+          WHERE (taxkeys.chart_id = c.id)
+            AND (startdate <= ?)
+          ORDER BY startdate DESC
+          LIMIT 1))
+       ORDER BY c.accno|;
+  $form->{chart} = selectall_hashref_query($form, $dbh, $query, conv_date($form->{transdate}));

 
 

-  $sth->finish;

   $main::lxdebug->leave_sub();
   $main::lxdebug->leave_sub();

+}
+
+sub storno {
+  my ($self, $form, $myconfig, $id) = @_;
+  $main::lxdebug->enter_sub();

 
 

-  $dbh->disconnect;
+  my $rc = SL::DB->client->with_transaction(\&_storno, $self, $form, $myconfig, $id);

 
 

+  $::lxdebug->leave_sub;
+  return $rc;
+}
+
+sub _storno {
+  my ($self, $form, $myconfig, $id) = @_;
+
+  my ($query, $new_id, $storno_row, $acc_trans_rows);
+  my $dbh = SL::DB->client->dbh;
+
+  $query = qq|SELECT nextval('glid')|;
+  ($new_id) = selectrow_query($form, $dbh, $query);
+
+  $query = qq|SELECT * FROM gl WHERE id = ?|;
+  $storno_row = selectfirst_hashref_query($form, $dbh, $query, $id);
+
+  $storno_row->{id}          = $new_id;
+  $storno_row->{storno_id}   = $id;
+  $storno_row->{storno}      = 't';
+  $storno_row->{reference}   = 'Storno-' . $storno_row->{reference};
+
+  $query = qq|SELECT id FROM employee WHERE login = ?|;
+  my ($employee_id) = selectrow_query($form, $dbh, $query, $::myconfig{login});
+  $storno_row->{employee_id} = $employee_id;
+
+  delete @$storno_row{qw(itime mtime gldate)};
+
+  $query = sprintf 'INSERT INTO gl (%s) VALUES (%s)', join(', ', keys %$storno_row), join(', ', map '?', values %$storno_row);
+  do_query($form, $dbh, $query, (values %$storno_row));
+
+  $query = qq|UPDATE gl SET storno = 't' WHERE id = ?|;
+  do_query($form, $dbh, $query, $id);
+
+  # now copy acc_trans entries
+  $query = qq|SELECT * FROM acc_trans WHERE trans_id = ?|;
+  my $rowref = selectall_hashref_query($form, $dbh, $query, $id);
+
+  for my $row (@$rowref) {
+    delete @$row{qw(itime mtime acc_trans_id gldate)};
+    $query = sprintf 'INSERT INTO acc_trans (%s) VALUES (%s)', join(', ', keys %$row), join(', ', map '?', values %$row);
+    $row->{trans_id}   = $new_id;
+    $row->{amount}    *= -1;
+    do_query($form, $dbh, $query, (values %$row));
+  }
+
+  return 1;
+}
+
+sub get_chart_balances {
+  my ($self, @chart_ids) = @_;
+
+  return () unless @chart_ids;
+
+  my $placeholders = join ', ', ('?') x scalar(@chart_ids);
+  my $query = qq|SELECT chart_id, SUM(amount) AS sum
+                 FROM acc_trans
+                 WHERE chart_id IN (${placeholders})
+                 GROUP BY chart_id|;
+
+  my %balances = selectall_as_map($::form, $::form->get_standard_dbh(\%::myconfig), $query, 'chart_id', 'sum', @chart_ids);
+
+  return %balances;
+}
+
+sub get_active_taxes_for_chart {
+  my ($self, $chart_id, $transdate, $tax_id) = @_;
+
+  my $chart         = SL::DB::Chart->new(id => $chart_id)->load;
+  my $active_taxkey = $chart->get_active_taxkey($transdate);
+
+  my $where = [ chart_categories => { like => '%' . $chart->category . '%' } ];
+
+  if ( defined $tax_id && $tax_id >= 0 ) {
+    $where = [ or => [ chart_categories => { like => '%' . $chart->category . '%' },
+                       id               => $tax_id
+                     ]
+             ];
+  }
+
+  my $taxes         = SL::DB::Manager::Tax->get_all(
+    where   => $where,
+    sort_by => 'taxkey, rate',
+  );
+
+  my $default_tax            = first { $active_taxkey->tax_id == $_->id } @{ $taxes };
+  $default_tax->{is_default} = 1 if $default_tax;
+
+  return @{ $taxes };

 }
 
 1;
 
 }
 
 1;
 

+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::GL - some useful GL functions
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<get_active_taxes_for_chart> $transdate $tax_id
+
+Returns a list of valid taxes for a certain chart.
+
+If the optional param transdate exists one entry in the returning list
+may get the attribute C<is_default> for this specific tax-dependent date.
+The possible entries are filtered by the charttype of the tax, i.e. only taxes
+whose chart_categories match the category of the chart will be shown.
+
+In the case of existing records, e.g. when opening an old ar record, due to
+changes in the configurations the desired tax might not be available in the
+dropdown anymore. If we are loading an old record and know its tax_id (from
+acc_trans), we can pass $tax_id as the third parameter and be sure that the
+original tax always appears in the dropdown.
+
+The functions returns an array which may be used for building dropdowns in ar/ap/gl code.
+
+=back
+
+=head1 TODO
+
+Nothing here yet.
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+G. Richardson E<lt>grichardson@kivitec.deE<gt>
+
+=cut