Dialogbuchen: Anzeige der letzten Buchungsnummer und des Datums, an dem diese Buchung...

[mfinanz.git] / SL / GL.pm

diff --git a/SL/GL.pm b/SL/GL.pm
index b3b0e0580010f6833f392d1b59b941f790b8aa4c..3d65eac46cda0d2a410af523242db54b28f911fa 100644 (file)
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -39,6 +39,7 @@
 package GL;
 
 use Data::Dumper;
 package GL;
 
 use Data::Dumper;

+use SL::DBUtils;

 
 sub delete_transaction {
   my ($self, $myconfig, $form) = @_;
 
 sub delete_transaction {
   my ($self, $myconfig, $form) = @_;


@@ -47,11 +48,9 @@ sub delete_transaction {
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   # 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);
-
-  $query = qq|DELETE FROM acc_trans WHERE trans_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  my @values = (conv_i($form->{id}));
+  do_query($form, $dbh, qq|DELETE FROM acc_trans WHERE trans_id = ?|, @values);
+  do_query($form, $dbh, qq|DELETE FROM gl WHERE id = ?|, @values);

 
   # commit and redirect
   my $rc = $dbh->commit;
 
   # commit and redirect
   my $rc = $dbh->commit;


@@ -71,16 +70,6 @@ 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);
 
   # connect to database, turn off AutoCommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 


@@ -93,9 +82,6 @@ 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;
   }


@@ -105,50 +91,47 @@ sub post_transaction {
   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}, $form->{login});
+    do_query($form, $dbh, $query, @values);

   }
 
   }
 

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

   $department_id *= 1;
 
   $department_id *= 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 = ?, department_id = ?, taxincluded = ?,
+         storno = ?, storno_id = ?
+       WHERE id = ?|;

 
 

-  $dbh->do($query) || $form->dberror($query);
-  ($taxkey, $rate) = split(/--/, $form->{taxkey});
+  @values = ($form->{reference}, $form->{description}, $form->{notes},
+             conv_date($form->{transdate}), $department_id, $form->{taxincluded},
+             $form->{storno} ? 't' : 'f', conv_i($form->{storno_id}),
+             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}) {

-

     # extract accno
     my ($accno) = split(/--/, $form->{"accno_$i"});
     # extract accno
     my ($accno) = split(/--/, $form->{"accno_$i"});

-    my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+    ($form->{"tax_id_$i"}) = split(/--/, $form->{"taxchart_$i"});
+    if ($form->{"tax_id_$i"} ne "") {
+      $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 $debit  = $form->{"debit_$i"};
     my $credit = $form->{"credit_$i"};
     my $amount = 0;
     my $debit  = $form->{"debit_$i"};
     my $credit = $form->{"credit_$i"};


@@ -164,61 +147,44 @@ 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)
+           VALUES (?, (SELECT id FROM chart WHERE accno = ?),
+                   ?, ?, ?, ?, ?, ?)|;
+      @values = (conv_i($form->{id}), $accno, $amount, conv_date($form->{transdate}),
+                 $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey);
+      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.taxkey = $taxkey),
-                  $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)
+           VALUES (?, (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);
+      do_query($form, $dbh, $query, @values);

     }
   }
 
     }
   }
 

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

 
   # commit and redirect
   my $rc = $dbh->commit;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
 
 
   # commit and redirect
   my $rc = $dbh->commit;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
 

-  $rc;
-
+  return $rc;

 }
 
 sub all_transactions {
 }
 
 sub all_transactions {


@@ -230,188 +196,201 @@ sub all_transactions {
   my ($query, $sth, $source, $null);
 
   my ($glwhere, $arwhere, $apwhere) = ("1 = 1", "1 = 1", "1 = 1");
   my ($query, $sth, $source, $null);
 
   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, '%' . $form->{reference} . '%');
+    push(@arvalues, '%' . $form->{reference} . '%');
+    push(@apvalues, '%' . $form->{reference} . '%');

   }
   }

+

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

   }
 
   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.source ILIKE ?";
+    $arwhere .= " AND ac.source ILIKE ?";
+    $apwhere .= " AND ac.source ILIKE ?";
+    push(@glvalues, '%' . $form->{source} . '%');
+    push(@arvalues, '%' . $form->{source} . '%');
+    push(@apvalues, '%' . $form->{source} . '%');

   }
   }

+

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

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

   }
   }

+

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

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

   }
   }

+

   if ($form->{description}) {
   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'";
+    $glwhere .= " AND g.description ILIKE ?";
+    $arwhere .= " AND ct.name ILIKE ?";
+    $apwhere .= " AND ct.name ILIKE ?";
+    push(@glvalues, '%' . $form->{description} . '%');
+    push(@arvalues, '%' . $form->{description} . '%');
+    push(@apvalues, '%' . $form->{description} . '%');

   }
   }

+

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

     $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 ar.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN
+                          (SELECT id FROM chart c2 WHERE c2.category = ?))|;

     $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 ap.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->{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;
-    }
+  if ($form->{project_id}) {
+    $glwhere .= qq| AND g.id IN (SELECT DISTINCT trans_id FROM acc_trans WHERE project_id = ?)|;
+    $arwhere .=
+      qq| AND ((a.globalproject_id = ?) OR
+               (a.id IN (SELECT DISTINCT trans_id FROM acc_trans WHERE project_id = ?)))|;
+    $apwhere .=
+      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->{gifi_accno}) {
+  my ($project_columns, %project_join);
+  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)|;
+  }

 
 

+  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.transdate < ?)|;
+      ($form->{balance}) = selectrow_query($form, $dbh, $query, $form->{accno}, conv_date($form->{datefrom}));

     }
   }
 
   my $false = ($myconfig->{dbdriver} eq 'Pg') ? FALSE: q|'0'|;
 
     }
   }
 
   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;
+  my $sortorder;

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

+    $form->{sort} =~ s/[^a-zA-Z_]//g;

     $sortorder = $form->{sort} . ",";
     $sortorder = $form->{sort} . ",";

-  } else {
-    $sortorder = "";

   }
 
   my $query =
   }
 
   my $query =

-    qq|SELECT 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 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 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, trans_id, taxkey DESC, oid|;
+    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, g.notes, t.chart_id, ac.oid
+        $project_columns
+      FROM gl g, 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.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, a.notes, t.chart_id, ac.oid
+        $project_columns
+      FROM ar a, 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.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, a.notes, t.chart_id, ac.oid
+        $project_columns
+      FROM ap a, 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 transdate, trans_id, acoid, taxkey DESC|;
+
+  my @values = (@glvalues, @arvalues, @apvalues);

 
   # Show all $query in Debuglevel LXDebug::QUERY
   $callingdetails = (caller (0))[3];
 
   # 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);
+  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 ($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};

-    
-    if ($trans_id != $trans_id2) {
-    
+
+    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};
 


@@ -437,98 +416,116 @@ sub all_transactions {
           $ref->{module} = "ar";
         }
       }
           $ref->{module} = "ar";
         }
       }

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

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

-    
-      $i       = 0;
-      $j       = 0;
-      $k       = 0;
-      $l       = 0;
-
-      if ($ref->{amount} < 0) {
-        if ($ref->{chart_id} > 0) {
-          $ref->{debit_tax}{$i}       = $ref->{amount} * -1;
-          $ref->{debit_tax_accno}{$i} = $ref->{accno};
+
+      # 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
+
+
+      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};
+          }
+          if ($ref->{link} =~ /AP_tax/) {
+            $ref->{debit_tax}{$i}       = $ref->{amount} * -1;
+            $ref->{debit_tax_accno}{$i} = $ref->{accno};
+          }

         } else {
         } else {

+          if ($ref->{link} =~ /AR_tax/) {
+            $ref->{credit_tax}{$j}       = $ref->{amount};
+            $ref->{credit_tax_accno}{$j} = $ref->{accno};
+          }
+          if ($ref->{link} =~ /AP_tax/) {
+            $ref->{debit_tax}{$i}       = $ref->{amount} * -1;
+            $ref->{debit_tax_accno}{$i} = $ref->{accno};
+          }
+        }
+      } 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};
           $ref->{debit}{$k}        = $ref->{amount} * -1;
           $ref->{debit_accno}{$k}  = $ref->{accno};
           $ref->{debit_taxkey}{$k} = $ref->{taxkey};

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

 
 

-      } else {
-
-        if ($ref->{chart_id} > 0) {
-          $ref->{credit_tax}{$j}       = $ref->{amount};
-          $ref->{credit_tax_accno}{$j} = $ref->{accno};

         } else {
         } else {

-          $ref->{credit}{$l}        = $ref->{amount};
+          $ref->{credit}{$l}        = $ref->{amount} * 1;

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

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

 
 

+
+        }

       }
 
       }
 

-    } else {
+    } else { # following lines of a booking, line increasing

 
       $ref2      = $ref0;
 
       $ref2      = $ref0;

-      $trans_old  =$trans_id2;
+      $trans_old = $trans_id2;

       $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;
 

-      if ($ref2->{amount} < 0) {
-
-        if ($ref2->{chart_id} > 0) {
-
-          if ($ref->{debit_tax_accno}{$i} ne "") {
-            $i++;
-          }
+      $ref->{"projectnumbers"}->{$ref2->{"projectnumber"}} = 1 if ($ref2->{"projectnumber"});

 
 

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

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

+            if ($ref->{credit_tax_accno}{$j} ne "") {
+              $j++;
+            }

             $ref->{credit_tax}{$j}       = $ref2->{amount};
             $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 ($ref2->{link} =~ /AP_tax/) {

-            $ref->{debit_tax}{$j}       = $ref2->{amount} * -1;
-            $ref->{debit_tax_accno}{$j} = $ref2->{accno};   
+            if ($ref->{debit_tax_accno}{$i} ne "") {
+              $i++;
+            }
+            $ref->{debit_tax}{$i}       = $ref2->{amount} * -1;
+            $ref->{debit_tax_accno}{$i} = $ref2->{accno};

           }
           }

-          

         } else {
         } else {

-
-          if ($ref->{debit_accno}{$k} ne "") {
-            $k++;
-          }
-          $ref->{debit}{$k}        = $ref2->{amount} * -1;
-          $ref->{debit_accno}{$k}  = $ref2->{accno};
-          $ref->{debit_taxkey}{$k} = $ref2->{taxkey};
-        }
-
-      } else {
-
-        if ($ref2->{chart_id} > 0) {
-
-          if ($ref->{credit_tax_accno}{$j} ne "") {
-            $j++;
-          }
-

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

+            if ($ref->{credit_tax_accno}{$j} ne "") {
+              $j++;
+            }

             $ref->{credit_tax}{$j}       = $ref2->{amount};
             $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 ($ref2->{link} =~ /AP_tax/) {

-            $ref->{debit_tax}{$j}       = $ref2->{amount} * -1;
-            $ref->{debit_tax_accno}{$j} = $ref2->{accno};  
+            if ($ref->{debit_tax_accno}{$i} ne "") {
+              $i++;
+            }
+            $ref->{debit_tax}{$i}       = $ref2->{amount} * -1;
+            $ref->{debit_tax_accno}{$i} = $ref2->{accno};

           }
           }

-
+        }
+      } else { # all other accounts, following lines
+        if ($ref2->{amount} < 0) {
+          if ($ref->{debit_accno}{$k} ne "") {
+            $k++;
+          }
+          $ref->{debit}{$k}        = $ref2->{amount} * - 1;
+          $ref->{debit_accno}{$k}  = $ref2->{accno};
+          $ref->{debit_taxkey}{$k} = $ref2->{taxkey};
+          $ref->{ac_transdate}{$k} = $ref2->{transdate};

         } else {
         } else {

-

           if ($ref->{credit_accno}{$l} ne "") {
             $l++;
           }
           $ref->{credit}{$l}        = $ref2->{amount};
           $ref->{credit_accno}{$l}  = $ref2->{accno};
           $ref->{credit_taxkey}{$l} = $ref2->{taxkey};
           if ($ref->{credit_accno}{$l} ne "") {
             $l++;
           }
           $ref->{credit}{$l}        = $ref2->{amount};
           $ref->{credit_accno}{$l}  = $ref2->{accno};
           $ref->{credit_taxkey}{$l} = $ref2->{taxkey};

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

         }
       }
     }
         }
       }
     }


@@ -537,124 +534,108 @@ sub all_transactions {
   $sth->finish;
 
   if ($form->{accno}) {
   $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;
-  }
-  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;
+    $query = qq|SELECT c.description FROM chart c WHERE c.accno = ?|;
+    ($form->{account_description}) = selectrow_query($form, $dbh, $query, $form->{accno});

   }
   }

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

 
   $dbh->disconnect;
 
 
   $dbh->disconnect;
 

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

 }
 
 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);

 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
 
   # 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.storno, g.storno_id,
+           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 = ?|;
+    $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 = "SELECT c.accno, c.taxkey_id AS accnotaxkey, a.amount, project_id,
-                (SELECT p.projectnumber FROM project p
-                WHERE a.project_id = p.id) AS projectnumber, a.taxkey, (SELECT c1.accno FROM chart c1, tax t WHERE t.taxkey=a.taxkey AND c1.id=t.chart_id) AS taxaccno, (SELECT t1.rate FROM tax t1 WHERE t1.taxkey=a.taxkey) AS taxrate 
-             FROM acc_trans a, chart c
-             WHERE a.chart_id = c.id
-             AND a.trans_id = $form->{id}
-             ORDER BY a.oid";
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    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.transdate, a.cleared, a.project_id, p.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 = ?)
+           AND (a.fx_transaction = '0')
+         ORDER BY a.oid, a.transdate|;
+    $form->{GL} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));

 
 

-    $sth->finish;

   } else {
   } else {

-    $query = "SELECT current_date AS transdate, closedto, revtrans
-              FROM defaults";
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    ($form->{transdate}, $form->{closedto}, $form->{revtrans}) =
-      $sth->fetchrow_array;
-
-    # 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 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;
+  # 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.taxkey_id
-              FROM chart c
-             WHERE c.charttype = 'A'
-              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;
-
-  $sth->finish;
-  $main::lxdebug->leave_sub();
+  $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}));

 
   $dbh->disconnect;
 
 
   $dbh->disconnect;
 

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

 }
 
 1;
 }
 
 1;

-