Fixed bug. (from r1005)

[mfinanz.git] / SL / GL.pm

diff --git a/SL/GL.pm b/SL/GL.pm
index ef4ec7bda51b00ecc1d4f6fd7a8dd770556215c7..b3b0e0580010f6833f392d1b59b941f790b8aa4c 100644 (file)
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -38,9 +38,12 @@
 
 package GL;
 
 
 package GL;
 

+use Data::Dumper;
+

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

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

   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 


@@ -53,28 +56,30 @@ sub delete_transaction {
   # commit and redirect
   my $rc = $dbh->commit;
   $dbh->disconnect;
   # commit and redirect
   my $rc = $dbh->commit;
   $dbh->disconnect;

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

   $rc;
   $rc;

-  
-}

 
 

+}

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

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

   my ($debit, $credit) = (0, 0);
   my $project_id;
 
   my $i;
   my ($debit, $credit) = (0, 0);
   my $project_id;
 
   my $i;

+

   # check if debit and credit balances
   # check if debit and credit balances

-  
+

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

-       $debit = $debit * -1;
-       $credit = $credit * -1;
-       $tax = $tax * -1;
-       $form->{reference} = "Storno-".$form->{reference};
-       $form->{description} = "Storno-".$form->{description};
-  }  
+    $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);


@@ -94,15 +99,16 @@ sub post_transaction {
   if (!$form->{taxincluded}) {
     $form->{taxincluded} = 0;
   }
   if (!$form->{taxincluded}) {
     $form->{taxincluded} = 0;
   }

-  
+

   my ($query, $sth);
   my ($query, $sth);

-  
+

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

+

     # delete individual transactions
     $query = qq|DELETE FROM acc_trans 
                 WHERE trans_id = $form->{id}|;
     $dbh->do($query) || $form->dberror($query);
     # delete individual transactions
     $query = qq|DELETE FROM acc_trans 
                 WHERE trans_id = $form->{id}|;
     $dbh->do($query) || $form->dberror($query);

-    
+

   } else {
     my $uid = time;
     $uid .= $form->{login};
   } else {
     my $uid = time;
     $uid .= $form->{login};


@@ -111,7 +117,7 @@ sub post_transaction {
                 VALUES ('$uid', (SELECT e.id FROM employee e
                                 WHERE e.login = '$form->{login}'))|;
     $dbh->do($query) || $form->dberror($query);
                 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);
     $query = qq|SELECT g.id FROM gl g
                 WHERE g.reference = '$uid'|;
     $sth = $dbh->prepare($query);


@@ -121,10 +127,10 @@ sub post_transaction {
     $sth->finish;
 
   }
     $sth->finish;
 
   }

-  
+

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

-  
+

   $query = qq|UPDATE gl SET 
              reference = '$form->{reference}',
              description = '$form->{description}',
   $query = qq|UPDATE gl SET 
              reference = '$form->{reference}',
              description = '$form->{description}',


@@ -133,97 +139,98 @@ sub post_transaction {
              department_id = $department_id,
              taxincluded = '$form->{taxincluded}'
              WHERE id = $form->{id}|;
              department_id = $department_id,
              taxincluded = '$form->{taxincluded}'
              WHERE id = $form->{id}|;

-          
+

   $dbh->do($query) || $form->dberror($query);
   ($taxkey, $rate) = split(/--/, $form->{taxkey});
 
   $dbh->do($query) || $form->dberror($query);
   ($taxkey, $rate) = split(/--/, $form->{taxkey});
 

-

   # 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"});
     my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
     my $amount = 0;
     # extract accno
     my ($accno) = split(/--/, $form->{"accno_$i"});
     my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
     my $amount = 0;

-    my $debit = $form->{"debit_$i"};
+    my $debit  = $form->{"debit_$i"};

     my $credit = $form->{"credit_$i"};
     my $credit = $form->{"credit_$i"};

-    my $tax = $form->{"tax_$i"};
-    
+    my $tax    = $form->{"tax_$i"};
+

     if ($credit) {
       $amount = $credit;
       $posted = 0;
     }
     if ($debit) {
       $amount = $debit * -1;
     if ($credit) {
       $amount = $credit;
       $posted = 0;
     }
     if ($debit) {
       $amount = $debit * -1;

-      $tax = $tax * -1;
+      $tax    = $tax * -1;

       $posted = 0;
     }
 
       $posted = 0;
     }
 

-

     # 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'; 
+      $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'),
       $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|,
+                  $amount, '$form->{transdate}', |
+        . $dbh->quote($form->{"source_$i"}) . qq|, |
+        . $dbh->quote($form->{"memo_$i"}) . qq|,

                  $project_id, $taxkey)|;
                  $project_id, $taxkey)|;

-    
+

       $dbh->do($query) || $form->dberror($query);
     }
       $dbh->do($query) || $form->dberror($query);
     }

-  
-    if ($tax !=0) {
-          # 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,
+
+    if ($tax != 0) {
+
+      # 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),
                   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|,
+                  $amount, '$form->{transdate}', |
+        . $dbh->quote($form->{"source_$i"}) . qq|, |
+        . $dbh->quote($form->{"memo_$i"}) . qq|,

                           $project_id, $taxkey)|;
                           $project_id, $taxkey)|;

-          
-          $dbh->do($query) || $form->dberror($query);
+
+      $dbh->do($query) || $form->dberror($query);

     }
   }
 
     }
   }
 

-  my %audittrail = ( tablename  => 'gl',
-                     reference  => $form->{reference},
-                    formname   => 'transaction',
-                    action     => 'posted',
-                    id         => $form->{id} );
- 
+  my %audittrail = (tablename => 'gl',
+                    reference => $form->{reference},
+                    formname  => 'transaction',
+                    action    => 'posted',
+                    id        => $form->{id});
+

   # $form->audittrail($dbh, "", \%audittrail);
 
   # commit and redirect
   my $rc = $dbh->commit;
   $dbh->disconnect;
   # $form->audittrail($dbh, "", \%audittrail);
 
   # commit and redirect
   my $rc = $dbh->commit;
   $dbh->disconnect;

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

 
   $rc;
 
 }
 
 
   $rc;
 
 }
 

-
-

 sub all_transactions {
   my ($self, $myconfig, $form) = @_;
 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 ($glwhere, $arwhere, $apwhere) = ("1 = 1", "1 = 1", "1 = 1");
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   my ($query, $sth, $source, $null);
 
   my ($glwhere, $arwhere, $apwhere) = ("1 = 1", "1 = 1", "1 = 1");

-  
+

   if ($form->{reference}) {
     $source = $form->like(lc $form->{reference});
     $glwhere .= " AND lower(g.reference) LIKE '$source'";
   if ($form->{reference}) {
     $source = $form->like(lc $form->{reference});
     $glwhere .= " AND lower(g.reference) LIKE '$source'";


@@ -276,22 +283,26 @@ sub all_transactions {
     $apwhere .= " AND c.gifi_accno = '$form->{gifi_accno}'";
   }
   if ($form->{category} ne 'X') {
     $apwhere .= " AND c.gifi_accno = '$form->{gifi_accno}'";
   }
   if ($form->{category} ne 'X') {

-    $glwhere .= " AND c.category = '$form->{category}'";
-    $arwhere .= " AND c.category = '$form->{category}'";
-    $apwhere .= " AND c.category = '$form->{category}'";
+    $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}'))";
+    $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}'))";
+    $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}'))";

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

+

     # get category for account
     $query = qq|SELECT c.category
                 FROM chart c
                WHERE c.accno = '$form->{accno}'|;
     # get category for account
     $query = qq|SELECT c.category
                 FROM chart c
                WHERE c.accno = '$form->{accno}'|;

-    $sth = $dbh->prepare($query); 
+    $sth = $dbh->prepare($query);
+
+    $sth->execute || $form->dberror($query);
+    ($form->{ml}) = $sth->fetchrow_array;
+    $sth->finish;

 
 

-    $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
     if ($form->{datefrom}) {
       $query = qq|SELECT SUM(ac.amount)
                  FROM acc_trans ac, chart c


@@ -306,18 +317,19 @@ sub all_transactions {
       $sth->finish;
     }
   }
       $sth->finish;
     }
   }

-  
+

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

+

     # get category for account
     $query = qq|SELECT c.category
                 FROM chart c
                WHERE c.gifi_accno = '$form->{gifi_accno}'|;
     # get category for account
     $query = qq|SELECT c.category
                 FROM chart c
                WHERE c.gifi_accno = '$form->{gifi_accno}'|;

-    $sth = $dbh->prepare($query); 
+    $sth = $dbh->prepare($query);
+
+    $sth->execute || $form->dberror($query);
+    ($form->{ml}) = $sth->fetchrow_array;
+    $sth->finish;

 
 

-    $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
     if ($form->{datefrom}) {
       $query = qq|SELECT SUM(ac.amount)
                  FROM acc_trans ac, chart c


@@ -333,10 +345,24 @@ sub all_transactions {
     }
   }
 
     }
   }
 

-  my $false = ($myconfig->{dbdriver} eq 'Pg') ? FALSE : q|'0'|;
+  my $false = ($myconfig->{dbdriver} eq 'Pg') ? FALSE: q|'0'|;

 
 

-  
-  my $query = qq|SELECT g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, t.taxkey AS sorttax,
+  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 $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
                  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


@@ -345,7 +371,7 @@ sub all_transactions {
                 AND ac.chart_id = c.id
                 AND g.id = ac.trans_id
        UNION
                 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, t.taxkey AS sorttax,
+                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
                 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


@@ -355,7 +381,7 @@ sub all_transactions {
                 AND a.customer_id = ct.id
                 AND a.id = ac.trans_id
        UNION
                 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, t.taxkey AS sorttax,
+                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
                 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


@@ -364,108 +390,155 @@ sub all_transactions {
                 AND ac.chart_id = c.id
                 AND a.vendor_id = ct.id
                 AND a.id = ac.trans_id
                 AND ac.chart_id = c.id
                 AND a.vendor_id = ct.id
                 AND a.id = ac.trans_id

-                ORDER BY transdate, trans_id, taxkey DESC, sorttax DESC, oid|;
+                ORDER BY $sortorder transdate, trans_id, taxkey DESC, oid|;
+
+  # 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 $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);

-  
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    print(STDERR $ref->{id}, " Transaction\n");
-    # gl
-    if ($ref->{type} eq "gl") {
-      $ref->{module} = "gl";
-    }
+  my $trans_id  = "";
+  my $trans_id2 = "";

 
 

-    # ap
-    if ($ref->{type} eq "ap") {
-      if ($ref->{invoice}) {
-        $ref->{module} = "ir";
-      } else {
-        $ref->{module} = "ap";
+  while (my $ref0 = $sth->fetchrow_hashref(NAME_lc)) {
+    
+    $trans_id = $ref0->{id};
+    
+    if ($trans_id != $trans_id2) {
+    
+      if ($trans_id2) {
+        push @{ $form->{GL} }, $ref;
+        $balance = 0;

       }
       }

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

 
 

-    # ar
-    if ($ref->{type} eq "ar") {
-      if ($ref->{invoice}) {
-        $ref->{module} = "is";
-      } else {
-        $ref->{module} = "ar";
+      # gl
+      if ($ref->{type} eq "gl") {
+        $ref->{module} = "gl";

       }
       }

-    }
-    $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};
+
+      # ap
+      if ($ref->{type} eq "ap") {
+        if ($ref->{invoice}) {
+          $ref->{module} = "ir";
+        } else {
+          $ref->{module} = "ap";

         }
         }

-      else {
-        $ref->{debit}{$k} = $ref->{amount} * -1;
-        $ref->{debit_accno}{$k} = $ref->{accno};
-        $ref->{debit_taxkey}{$k} = $ref->{taxkey};
+      }
+
+      # ar
+      if ($ref->{type} eq "ar") {
+        if ($ref->{invoice}) {
+          $ref->{module} = "is";
+        } else {
+          $ref->{module} = "ar";

         }
         }

-    } else {
-      if ($ref->{chart_id} >0) {
-        $ref->{credit_tax}{$j} = $ref->{amount};
-        $ref->{credit_tax_accno}{$j} = $ref->{accno};
+      }
+    
+      $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};
+        } else {
+          $ref->{debit}{$k}        = $ref->{amount} * -1;
+          $ref->{debit_accno}{$k}  = $ref->{accno};
+          $ref->{debit_taxkey}{$k} = $ref->{taxkey};

         }
         }

-      else {
-        $ref->{credit}{$l} = $ref->{amount};
-        $ref->{credit_accno}{$l} = $ref->{accno};
-        $ref->{credit_taxkey}{$l} = $ref->{taxkey};
+
+      } else {
+
+        if ($ref->{chart_id} > 0) {
+          $ref->{credit_tax}{$j}       = $ref->{amount};
+          $ref->{credit_tax_accno}{$j} = $ref->{accno};
+        } else {
+          $ref->{credit}{$l}        = $ref->{amount};
+          $ref->{credit_accno}{$l}  = $ref->{accno};
+          $ref->{credit_taxkey}{$l} = $ref->{taxkey};

         }
         }

-    }

 
 

-    while (abs($balance)>=0.015) {
-      my $ref2 = $sth->fetchrow_hashref(NAME_lc) || $form->error("Unbalanced ledger!");
+      }
+
+    } else {
+
+      $ref2      = $ref0;
+      $trans_old  =$trans_id2;
+      $trans_id2 = $ref2->{id};
+  
+      $balance =
+        (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;

 
 

-      $balance = (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
-      print(STDERR $balance," BAlance\n");

       if ($ref2->{amount} < 0) {
       if ($ref2->{amount} < 0) {

-        if ($ref2->{chart_id} >0) {
+
+        if ($ref2->{chart_id} > 0) {
+

           if ($ref->{debit_tax_accno}{$i} ne "") {
             $i++;
           }
           if ($ref->{debit_tax_accno}{$i} ne "") {
             $i++;
           }

-          $ref->{debit_tax}{$i} = $ref2->{amount} * -1;
-          $ref->{debit_tax_accno}{$i} = $ref2->{accno};
+
+          if ($ref2->{link} =~ /AR_tax/) {
+            $ref->{credit_tax}{$j}       = $ref2->{amount};
+            $ref->{credit_tax_accno}{$j} = $ref2->{accno};              
+          }
+          if ($ref2->{link} =~ /AP_tax/) {
+            $ref->{debit_tax}{$j}       = $ref2->{amount} * -1;
+            $ref->{debit_tax_accno}{$j} = $ref2->{accno};   

           }
           }

-        else {
+          
+        } else {
+

           if ($ref->{debit_accno}{$k} ne "") {
             $k++;
           }
           if ($ref->{debit_accno}{$k} ne "") {
             $k++;
           }

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

           $ref->{debit_taxkey}{$k} = $ref2->{taxkey};
           $ref->{debit_taxkey}{$k} = $ref2->{taxkey};

-          }
+        }
+

       } else {
       } else {

-        if ($ref2->{chart_id} >0) {
+
+        if ($ref2->{chart_id} > 0) {
+

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

-          $ref->{credit_tax}{$j} = $ref2->{amount};
-          $ref->{credit_tax_accno}{$j} = $ref2->{accno};
+
+          if ($ref2->{link} =~ /AR_tax/) {
+            $ref->{credit_tax}{$j}       = $ref2->{amount};
+            $ref->{credit_tax_accno}{$j} = $ref2->{accno}; 

           }
           }

-        else {
+          if ($ref2->{link} =~ /AP_tax/) {
+            $ref->{debit_tax}{$j}       = $ref2->{amount} * -1;
+            $ref->{debit_tax_accno}{$j} = $ref2->{accno};  
+          }
+
+        } else {
+

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

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

           $ref->{credit_taxkey}{$l} = $ref2->{taxkey};
           $ref->{credit_taxkey}{$l} = $ref2->{taxkey};

-          }
+        }

       }
     }
       }
     }

-#    print(STDERR Dumper($ref));       
-    push @{ $form->{GL} }, $ref;
-    $balance=0;

   }
   }

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

   $sth->finish;
 
   if ($form->{accno}) {
   $sth->finish;
 
   if ($form->{accno}) {

-    $query = qq|SELECT c.description FROM chart c WHERE c.accno = '$form->{accno}'|;
+    $query =
+      qq|SELECT c.description FROM chart c WHERE c.accno = '$form->{accno}'|;

     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
 
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
 


@@ -473,24 +546,26 @@ sub all_transactions {
     $sth->finish;
   }
   if ($form->{gifi_accno}) {
     $sth->finish;
   }
   if ($form->{gifi_accno}) {

-    $query = qq|SELECT g.description FROM gifi g WHERE g.accno = '$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;
   }
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
 
     ($form->{gifi_account_description}) = $sth->fetchrow_array;
     $sth->finish;
   }

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

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

-

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

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

   my ($query, $sth, $ref);
   my ($query, $sth, $ref);

-  
+

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


@@ -514,31 +589,31 @@ sub transaction {
     $ref = $sth->fetchrow_hashref(NAME_lc);
     map { $form->{$_} = $ref->{$_} } keys %$ref;
     $sth->finish;
     $ref = $sth->fetchrow_hashref(NAME_lc);
     map { $form->{$_} = $ref->{$_} } keys %$ref;
     $sth->finish;

-  
+

     # retrieve individual rows
     # retrieve individual rows

-    $query = "SELECT c.accno, a.amount, project_id,
+    $query = "SELECT c.accno, c.taxkey_id AS accnotaxkey, a.amount, project_id,

                 (SELECT p.projectnumber FROM project p
                 (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
+                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);
              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;
     }
 
     while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
       push @{ $form->{GL} }, $ref;
     }
 

-      # get tax description
-    $query = qq| SELECT * FROM tax t|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($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;
     }
     $form->{TAX} = ();
     while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
       push @{ $form->{TAX} }, $ref;
     }

-  
+

     $sth->finish;
   } else {
     $query = "SELECT current_date AS transdate, closedto, revtrans
     $sth->finish;
   } else {
     $query = "SELECT current_date AS transdate, closedto, revtrans


@@ -546,12 +621,13 @@ sub transaction {
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
 
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
 

-    ($form->{transdate}, $form->{closedto}, $form->{revtrans}) = $sth->fetchrow_array;
-    
-      # get tax description
+    ($form->{transdate}, $form->{closedto}, $form->{revtrans}) =
+      $sth->fetchrow_array;
+
+    # get tax description

     $query = qq| SELECT * FROM tax t order by t.taxkey|;
     $query = qq| SELECT * FROM tax t order by t.taxkey|;

-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);  
+    $sth   = $dbh->prepare($query);
+    $sth->execute || $form->dberror($query);

     $form->{TAX} = ();
     while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
       push @{ $form->{TAX} }, $ref;
     $form->{TAX} = ();
     while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
       push @{ $form->{TAX} }, $ref;


@@ -572,15 +648,13 @@ sub transaction {
     push @{ $form->{chart} }, $ref;
   }
   $sth->finish;
     push @{ $form->{chart} }, $ref;
   }
   $sth->finish;

-  

 
 

-  

   $sth->finish;
   $sth->finish;

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

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

-

 1;
 
 1;