/ - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision c7f9bb36

Von Philip Reetz vor fast 19 Jahren hinzugefügt

ID c7f9bb36eb122b2d79f5aa8c4d080279705ddc7e
Vorgänger 59c1d7e3
Nachfolger b1253e4f

Buchungsjournal um Anzeige von Splitbuchungen erweitert, Splitbuchungen beim Dialogbuchen zu 80% fertig. Neue Maske fuer Splitbuchungen

     package GL;
     use Data::Dumper;
     sub delete_transaction {
       $main::lxdebug->enter_sub();
       my ($self, $myconfig, $form) = @_;
       # connect to database
       my $dbh = $form->dbconnect_noauto($myconfig);
-...
       # commit and redirect
       my $rc = $dbh->commit;
       $dbh->disconnect;
       $main::lxdebug->leave_sub();
       return $rc;
       $rc;
+    }
     sub post_transaction {
       $main::lxdebug->enter_sub();
     sub post_transaction {
       my ($self, $myconfig, $form) = @_;
       my ($debit, $credit) = (0, 0);
       my $project_id;
       my $i;
       # check if debit and credit balances
       $debit  = abs(int($form->round_amount($form->{debit},  3) * 1000));
       $credit = abs(int($form->round_amount($form->{credit}, 3) * 1000));
       $tax    = abs(int($form->round_amount($form->{tax},    3) * 1000));
       if (   (($debit >= $credit) && (abs($debit - ($credit + $tax)) > 4))
           || (($debit < $credit) && (abs(($debit + $tax) - $credit) > 4))) {
         return -2;
+      }
       if (($debit + $credit + $tax) == 0) {
         return -3;
+      }
       $debit  = $form->round_amount($form->{debit},  2);
       $credit = $form->round_amount($form->{credit}, 2);
       $tax    = $form->round_amount($form->{tax},    2);
       debug($debit, $credit, $tax, "Betraege");
       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);
-...
       if (!$form->{taxincluded}) {
         $form->{taxincluded} = 0;
+      }
       my ($query, $sth);
       if ($form->{id}) {
         # delete individual transactions
         $query = qq|DELETE FROM acc_trans
         $query = qq|DELETE FROM acc_trans
                     WHERE trans_id = $form->{id}|;
         $dbh->do($query) || $form->dberror($query);
       } else {
         my $uid = time;
         $uid .= $form->{login};
-...
                     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->finish;
+      }
       my ($null, $department_id) = split /--/, $form->{department};
       $department_id *= 1;
       $query = qq|UPDATE gl SET
       $query = qq|UPDATE gl SET
     	      reference = '$form->{reference}',
     	      description = '$form->{description}',
     	      notes = '$form->{notes}',
-...
     	      department_id = $department_id,
     	      taxincluded = '$form->{taxincluded}'
     	      WHERE id = $form->{id}|;
       $dbh->do($query) || $form->dberror($query);
       ($taxkey, $rate) = split(/--/, $form->{taxkey});
       # insert acc_trans transactions
       foreach $i ((credit, debit)) {
       # insert acc_trans transactions
       for $i (1 .. $form->{rowcount}) {
         # extract accno
         ($accno) = split(/--/, $form->{"${i}chartselected"});
         my ($accno) = split(/--/, $form->{"accno_$i"});
         my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
         my $amount = 0;
         debug("$accno $i Kontonummer");
         if ($i eq "credit") {
         my $debit = $form->{"debit_$i"};
         my $credit = $form->{"credit_$i"};
         my $tax = $form->{"tax_$i"};
         if ($credit) {
           $amount = $credit;
           $posted = 0;
+        }
         if ($i eq "debit") {
         if ($debit) {
           $amount = $debit * -1;
           $tax = $tax * -1;
           $posted = 0;
+        }
         if ($form->{"${i}_splited"}) {
           # if there is an amount, add the record
           for $j (2 .. $form->{"${i}rowcount"}) {
             ($accno) = split(/--/, $form->{"${i}chartselected_$j"});
             $amount = $form->{"${i}_$j"};
             ($taxkey, $taxrate) = split(/--/, $form->{"taxchartselected_$j"});
             if ($i eq "debit") {
               $amount *= -1;
+            }
             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, project_id, taxkey)
                           VALUES
                           ($form->{id}, (SELECT c.id
                                         FROM chart c
                                         WHERE c.accno = '$accno'),
                           $amount, '$form->{transdate}', '$form->{reference}',
                           $project_id, $taxkey)|;
               $dbh->do($query) || $form->dberror($query);
+            }
             $tax = $form->{"tax_$j"};
             print(STDERR $tax, " Steuer bei Durchlauf $j\n\n");
             if ($tax != 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);
+        }
         if ($tax !=0) {
               # add taxentry
               if ($i eq "debit") {
                 $tax = $tax * (-1);
+              }
               $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, project_id, taxkey)
                         VALUES
                         ($form->{id}, (SELECT t.chart_id
                         FROM tax t
                         WHERE t.taxkey = $taxkey),
                         $amount, '$form->{transdate}', '$form->{reference}',
                                 $project_id, $taxkey)|;
               $dbh->do($query) || $form->dberror($query);
+            }
+          }
         } else {
           # if there is an amount, add the record
           ($taxkey, $taxrate) = split(/--/, $form->{"taxchartselected"});
           $taxkey *= 1;
           debug("$amount auf $accno buchen");
           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, project_id, taxkey)
                           VALUES
                           ($form->{id}, (SELECT c.id
                                         FROM chart c
                                         WHERE c.accno = '$accno'),
                           $amount, '$form->{transdate}', '$form->{reference}',
                           $project_id, $taxkey)|;
             $dbh->do($query) || $form->dberror($query);
+          }
+        }
+      }
       if ($tax != 0 && !($form->{credit_splited} || $form->{debit_splited})) {
         # add taxentry
         if ($form->{debittaxkey}) {
           $tax = $tax * (-1);
+        }
         $amount = $tax;
         debug("$amount Steuern buchen");
         $project_id =
           ($form->{"project_id_$i"}) ? $form->{"project_id_$i"} : 'NULL';
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
                       source, project_id, taxkey)
               $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}', '$form->{reference}',
                       $amount, '$form->{transdate}', |.
     		   $dbh->quote($form->{"source_$i"}) .qq|, |.
     		  $dbh->quote($form->{"memo_$i"}).qq|,
                               $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} );
       # $form->audittrail($dbh, "", \%audittrail);
       # commit and redirect
       my $rc = $dbh->commit;
       $dbh->disconnect;
       $main::lxdebug->leave_sub();
       $rc;
       return $rc;
+    }
     sub all_transactions {
       $main::lxdebug->enter_sub();
     sub all_transactions {
       my ($self, $myconfig, $form) = @_;
       # connect to database
-...
       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->{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;
         $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
-...
           $sth->finish;
+        }
+      }
       if ($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->execute || $form->dberror($query);
         ($form->{ml}) = $sth->fetchrow_array;
         $sth->finish;
         $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
-...
+        }
+      }
       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 $query = qq|SELECT g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, t.taxkey AS sorttax,
                      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
-...
     	         ORDER BY transdate, trans_id, taxkey DESC, sorttax DESC, oid|;
       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";
-...
             $ref->{module} = "ar";
+          }
+        }
         $balance = $ref->{amount};
         $i       = 0;
         $j       = 0;
         $k       = 0;
         $l       = 0;
         $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;
           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};
+            }
           else {
             $ref->{debit}{$k} = $ref->{amount} * -1;
             $ref->{debit_accno}{$k} = $ref->{accno};
             $ref->{debit_taxkey}{$k} = $ref->{taxkey};
+          }
+            }
         } else {
           if ($ref->{chart_id} > 0) {
             $ref->{credit_tax}{$j}       = $ref->{amount};
           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};
+            }
           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!");
         while (abs($balance)>=0.015) {
           my $ref2 = $sth->fetchrow_hashref(NAME_lc) || $form->error("Unbalanced ledger!");
           $balance =
             (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
           print(STDERR $balance, " BAlance\n");
           $balance = (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
           print(STDERR $balance," BAlance\n");
           if ($ref2->{amount} < 0) {
             if ($ref2->{chart_id} > 0) {
             if ($ref2->{chart_id} >0) {
               if ($ref->{debit_tax_accno}{$i} ne "") {
                 $i++;
+              }
               $ref->{debit_tax}{$i}       = $ref2->{amount} * -1;
               $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}{$k} = $ref2->{amount} * -1;
               $ref->{debit_accno}{$k} = $ref2->{accno};
               $ref->{debit_taxkey}{$k} = $ref2->{taxkey};
+            }
+              }
           } else {
             if ($ref2->{chart_id} > 0) {
             if ($ref2->{chart_id} >0) {
               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};
             } else {
+              }
             else {
               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};
+            }
+              }
+          }
+        }
         #    print(STDERR Dumper($ref));
     #    print(STDERR Dumper($ref));
         push @{ $form->{GL} }, $ref;
         $balance = 0;
         $balance=0;
+      }
       $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->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;
+      }
       $dbh->disconnect;
       $main::lxdebug->leave_sub();
+    }
     sub transaction {
       $main::lxdebug->enter_sub();
     sub transaction {
       my ($self, $myconfig, $form) = @_;
       my ($query, $sth, $ref);
       # connect to database
       my $dbh = $form->dbconnect($myconfig);
       $form->{creditrowcount} = 1;
       $form->{debitrowcount}  = 1;
       if ($form->{id}) {
         $query = "SELECT closedto, revtrans
                   FROM defaults";
-...
         $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)
     	    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);
         map { $form->{$_} = $ref->{$_} } keys %$ref;
         $sth->finish;
         # retrieve individual rows
         $query = "SELECT c.accno, a.amount, project_id,
                     (SELECT p.projectnumber FROM project p
-...
     	      FROM acc_trans a, chart c
     	      WHERE a.chart_id = c.id
     	      AND a.trans_id = $form->{id}
     	      ORDER BY accno";
     	      ORDER BY a.oid";
         $sth = $dbh->prepare($query);
         $sth->execute || $form->dberror($query);
         $debitcount  = 2;
         $creditcount = 2;
         $taxcount    = 2;
         while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
           if ($ref->{accno} eq $ref->{taxaccno}) {
             $form->{"tax_$taxcount"} = $ref->{amount};
             $form->{"tax"} += $ref->{amount};
             $form->{"taxchartselected_$taxcount"} = $ref->{taxkey};
             $taxcount++;
           } else {
             if ($ref->{amount} < 0) {
               $form->{"debit_$debitcount"} = $ref->{amount} * -1;
               $form->{"debit"} += $ref->{amount} * -1;
               $form->{"debitchartselected_$debitcount"} = $ref->{accno};
               $debitcount++;
+            }
             if ($ref->{amount} > 0) {
               $form->{"credit_$creditcount"} = $ref->{amount};
               $form->{"credit"} += $ref->{amount};
               $form->{"creditchartselected_$creditcount"} = $ref->{accno};
               $creditcount++;
+            }
+          }
           $taxkey = $ref->{taxkey} * 1;
+        }
         if ($creditcount > 3) {
           $form->{credit_splited} = 1;
           $form->{credit}         = $form->{credit} + $form->{tax};
           $form->{creditrowcount} = $creditcount - 1;
         } else {
           $form->{credit}      = $form->{credit_2};
           $form->{amount}      = $form->{amount_2};
           $form->{creditaccno} = $form->{creditchartselected_2};
+        }
         if ($debitcount > 3) {
           $form->{debit_splited} = 1;
           $form->{debit}         = $form->{debit} + $form->{tax};
           $form->{debitrowcount} = $debitcount - 1;
         } else {
           $form->{debit}      = $form->{debit_2};
           $form->{debitaccno} = $form->{debitchartselected_2};
+        }
         if (   (($form->{credit} > $form->{debit}) && (!$form->{taxincluded}))
             || (($form->{credit} > $form->{debit}) && ($form->{taxincluded}))) {
           $form->{amount} = $form->{debit};
             } else {
           $form->{amount} = $form->{credit};
           push @{ $form->{GL} }, $ref;
+        }
         # get tax description
           # get tax description
         $query = qq| SELECT * FROM tax t|;
         $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;
+        }
         $sth->finish;
       } else {
         $query = "SELECT current_date AS transdate, closedto, revtrans
-...
         $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|;
         $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;
-...
         push @{ $form->{chart} }, $ref;
+      }
       $sth->finish;
       $sth->finish;
       $dbh->disconnect;
       $main::lxdebug->leave_sub();
+    }
     sub debug {
       local *OUT;
       if (open(OUT, ">>/tmp/linet.log")) {
         #    chomp(@_);
         print(OUT join("\n", @_), "\n");
         close(OUT);
       } else {
         print(STDERR "noe: $!\n");
+      }
+    }
 ;

+    #
     #======================================================================
     use SL::GL;
     use SL::PE;
     use Data::Dumper;
     require "$form->{path}/arap.pl";
 ;
     # end of main
     # this is for our long dates
     # $locale->text('January')
     # $locale->text('February')
-...
     # $locale->text('Nov')
     # $locale->text('Dec')
     sub add {
       $lxdebug->enter_sub();
       $form->{title} = "Add";
       $form->{callback} =
         "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}"
         unless $form->{callback};
       $form->{callback} = "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}" unless $form->{callback};
       # we use this only to set a default date
       GL->transaction(\%myconfig, \%$form);
       map {
         $chart .=
           "<option value=\"$_->{accno}--$_->{taxkey_id}\">$_->{accno}--$_->{description}</option>"
       } @{ $form->{chart} };
       map {
         $tax .=
           qq|<option value="$_->{taxkey}--$_->{rate}">$_->{taxdescription}  |
           . ($_->{rate} * 100) . qq| %|
       } @{ $form->{TAX} };
       map { $chart .= "<option value=\"$_->{accno}--$_->{taxkey_id}\">$_->{accno}--$_->{description}</option>" } @{ $form->{chart} };
       map { $tax .= qq|<option value="$_->{taxkey}--$_->{rate}">$_->{taxdescription}  |.($_->{rate} * 100).qq| %|} @{ $form->{TAX} };
       $form->{chart} = $chart;
       $form->{chartinit} = $chart;
       $form->{rowcount} = 2;
       $form->{debitchart}  = $chart;
       $form->{debitchart} = $chart;
       $form->{creditchart} = $chart;
       $form->{taxchart}    = $tax;
       $form->{debit}  = 0;
       $form->{taxchart} = $tax;
       $form->{debit} = 0;
       $form->{credit} = 0;
       $form->{tax}    = 0;
       $form->{creditrowcount} = 2;
       $form->{debitrowcount}  = 2;
       $form->{tax} = 0;
       # departments
       $form->all_departments(\%myconfig);
       if (@{ $form->{all_departments} }) {
         $form->{selectdepartment} = "<option>\n";
         map {
           $form->{selectdepartment} .=
             "<option>$_->{description}--$_->{id}\n"
         } (@{ $form->{all_departments} });
         map { $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} });
+      }
       &display_form;
       $lxdebug->leave_sub();
       &display_form(1);
+    }
     sub edit {
       $lxdebug->enter_sub();
       GL->transaction(\%myconfig, \%$form);
       map {
         if ($form->{debitaccno} eq $_->{accno}) {
           $form->{debitchart} .=
             "<option value=\"$_->{accno}--$_->{taxkey_id}\">$_->{accno}--$_->{description}";
+        }
       } @{ $form->{chart} };
       map {
         if ($form->{creditaccno} eq $_->{accno}) {
           $form->{creditchart} .=
             "<option value=\"$_->{accno}--$_->{taxkey_id}\">$_->{accno}--$_->{description}";
+        }
       } @{ $form->{chart} };
       map {
         $tax .=
           qq|<option value="$_->{taxkey}--$_->{rate}">$_->{taxdescription}  |
           . ($_->{rate} * 100) . qq| %|
       } @{ $form->{TAX} };
       if ($form->{creditrowcount} > 2) {
         for $i (2 .. $form->{creditrowcount}) {
           map {
             if ($form->{"creditchartselected_$i"} eq $_->{accno}) {
               $form->{"creditchartselected_$i"} = "$_->{accno}--$_->{taxkey_id}";
+            }
           } @{ $form->{chart} };
           map {
             if ($form->{"taxchartselected_$i"} eq $_->{taxkey}) {
               $form->{"taxchartselected_$i"} = "$_->{taxkey}--$_->{rate}";
+            }
           } @{ $form->{TAX} };
+        }
+      }
       if ($form->{debitrowcount} > 2) {
         for $i (2 .. $form->{debitrowcount}) {
           map {
             if ($form->{"debitchartselected_$i"} eq $_->{accno}) {
               $form->{"debitchartselected_$i"} = "$_->{accno}--$_->{taxkey_id}";
+            }
           } @{ $form->{chart} };
           map {
             if ($form->{"taxchartselected_$i"} eq $_->{taxkey}) {
               $form->{"taxchartselected_$i"} = "$_->{taxkey}--$_->{rate}";
+            }
           } @{ $form->{TAX} };
+        }
+      }
       map {
         $chart .=
           "<option value=\"$_->{accno}--$_->{taxkey_id}\">$_->{accno}--$_->{description}</option>"
       } @{ $form->{chart} };
       map { if ($form->{debitaccno} eq $_->{accno}) {$form->{debitchart} .= "<option value=\"$_->{accno}--$_->{taxkey_id}\">$_->{accno}--$_->{description}"} } @{ $form->{chart} };
       map { if ($form->{creditaccno} eq $_->{accno}) {$form->{creditchart} .= "<option value=\"$_->{accno}--$_->{taxkey_id}\">$_->{accno}--$_->{description}"} } @{ $form->{chart} };
       map { $tax .= qq|<option value="$_->{taxkey}--$_->{rate}">$_->{taxdescription}  |.($_->{rate} * 100).qq| %|} @{ $form->{TAX} };
       $form->{chart} = $chart;
       map {
         $tax .=
           qq|<option value="$_->{taxkey}--$_->{rate}">$_->{taxdescription}  |
           . ($_->{rate} * 100) . qq| %|
       } @{ $form->{TAX} };
       $form->{taxchart} = $tax;
       $form->{taxchart} = $tax;
       if ($form->{tax} < 0) {
         $form->{tax} = $form->{tax} * (-1);
+      }
       $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
       $form->{amount}=$form->format_amount(\%myconfig, $form->{amount}, 2);
       # departments
       $form->all_departments(\%myconfig);
       if (@{ $form->{all_departments} }) {
         $form->{selectdepartment} = "<option>\n";
         map {
           $form->{selectdepartment} .=
             "<option>$_->{description}--$_->{id}\n"
         } (@{ $form->{all_departments} });
         map { $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} });
+      }
       $form->{locked} =
         ($form->datetonum($form->{transdate}, \%myconfig) <=
          $form->datetonum($form->{closedto}, \%myconfig));
        $i = 1;
       foreach $ref (@{ $form->{GL} }) {
         $form->{"accno_$i"} = "$ref->{accno}--$ref->{description}";
         $form->{"projectnumber_$i"} = "$ref->{projectnumber}--$ref->{project_id}";
         for (qw(fx_transaction source memo)) { $form->{"${_}_$i"} = $ref->{$_} }
         if ($ref->{amount} < 0) {
           $form->{totaldebit} -= $ref->{amount};
           $form->{"debit_$i"} = $ref->{amount} * -1;
         } else {
           $form->{totalcredit} += $ref->{amount};
           $form->{"credit_$i"} = $ref->{amount};
+        }
       $form->{title} = "Edit";
         $i++;
+      }
       &form_header;
       $form->{rowcount} = $i;
       $form->{locked} = ($form->datetonum($form->{transdate}, \%myconfig) <= $form->datetonum($form->{closedto}, \%myconfig));
       $form->{title} = "Edit";
       &form_header;
       &display_rows;
       &form_footer;
       $lxdebug->leave_sub();
+    }
     sub search {
       $lxdebug->enter_sub();
       $form->{title} = $locale->text('Buchungsjournal');
       $form->all_departments(\%myconfig);
       # departments
       if (@{ $form->{all_departments} }) {
         $form->{selectdepartment} = "<option>\n";
         map {
           $form->{selectdepartment} .=
             "<option>$_->{description}--$_->{id}\n"
         } (@{ $form->{all_departments} });
         map { $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} });
+      }
       $department = qq|
       	<tr>
     	  <th align=right nowrap>| . $locale->text('Department') . qq|</th>
     	  <th align=right nowrap>|.$locale->text('Department').qq|</th>
     	  <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
     	</tr>
     | if $form->{selectdepartment};
       # use JavaScript Calendar or not
       $form->{jsscript} = $jscalendar;
       $jsscript = "";
       if ($form->{jsscript}) {
       if ($form->{jsscript})
+      {
         # with JavaScript Calendar
         $button1 = qq|
            <td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}">
            <input type=button name=datefrom id="trigger1" value=|
           . $locale->text('button')
           . qq|></td>
            <input type=button name=datefrom id="trigger1" value=|.$locale->text('button').qq|></td>
            |;
         $button2 = qq|
          $button2 = qq|
            <td><input name=dateto id=dateto size=11 title="$myconfig{dateformat}">
            <input type=button name=dateto id="trigger2" value=|
           . $locale->text('button')
           . qq|></td>
            <input type=button name=dateto id="trigger2" value=|.$locale->text('button').qq|></td>
          |;
         #write Trigger
         $jsscript =
           Form->write_trigger(\%myconfig, "2", "datefrom", "BR", "trigger1",
                               "dateto", "BL", "trigger2");
       } else {
         # without JavaScript Calendar
         $button1 =
           qq|<td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}"></td>|;
         $button2 =
           qq|<td><input name=dateto id=dateto size=11 title="$myconfig{dateformat}"></td>|;
+      }
          #write Trigger
          $jsscript = Form->write_trigger(\%myconfig,"2","datefrom","BR","trigger1","dateto","BL","trigger2");
+       }
        else
+       {
           # without JavaScript Calendar
           $button1 = qq|<td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}"></td>|;
           $button2 = qq|<td><input name=dateto id=dateto size=11 title="$myconfig{dateformat}"></td>|;
+        }
       $form->header;
-...
         <td>
           <table>
     	<tr>
     	  <th align=right>| . $locale->text('Reference') . qq|</th>
     	  <th align=right>|.$locale->text('Reference').qq|</th>
     	  <td><input name=reference size=20></td>
     	  <th align=right>| . $locale->text('Source') . qq|</th>
     	  <th align=right>|.$locale->text('Source').qq|</th>
     	  <td><input name=source size=20></td>
     	</tr>
     	$department
     	<tr>
     	  <th align=right>| . $locale->text('Description') . qq|</th>
     	  <th align=right>|.$locale->text('Description').qq|</th>
     	  <td colspan=3><input name=description size=40></td>
     	</tr>
     	<tr>
     	  <th align=right>| . $locale->text('Notes') . qq|</th>
     	  <th align=right>|.$locale->text('Notes').qq|</th>
     	  <td colspan=3><input name=notes size=40></td>
     	</tr>
     	<tr>
     	  <th align=right>| . $locale->text('From') . qq|</th>
     	  <th align=right>|.$locale->text('From').qq|</th>
               $button1
               $button2
     	</tr>
     	<tr>
     	  <th align=right>| . $locale->text('Include in Report') . qq|</th>
     	  <th align=right>|.$locale->text('Include in Report').qq|</th>
     	  <td colspan=3>
     	    <table>
     	      <tr>
     		<td>
     		  <input name="category" class=radio type=radio value=X checked>&nbsp;|
         . $locale->text('All') . qq|
     		  <input name="category" class=radio type=radio value=A>&nbsp;|
         . $locale->text('Asset') . qq|
            		  <input name="category" class=radio type=radio value=L>&nbsp;|
         . $locale->text('Liability') . qq|
     		  <input name="category" class=radio type=radio value=I>&nbsp;|
         . $locale->text('Revenue') . qq|
     		  <input name="category" class=radio type=radio value=E>&nbsp;|
         . $locale->text('Expense') . qq|
     		  <input name="category" class=radio type=radio value=X checked>&nbsp;|.$locale->text('All').qq|
     		  <input name="category" class=radio type=radio value=A>&nbsp;|.$locale->text('Asset').qq|
     		  <input name="category" class=radio type=radio value=C>&nbsp;|.$locale->text('Contra').qq|
     		  <input name="category" class=radio type=radio value=L>&nbsp;|.$locale->text('Liability').qq|
     		  <input name="category" class=radio type=radio value=Q>&nbsp;|.$locale->text('Equity').qq|
     		  <input name="category" class=radio type=radio value=I>&nbsp;|.$locale->text('Revenue').qq|
     		  <input name="category" class=radio type=radio value=E>&nbsp;|.$locale->text('Expense').qq|
     		</td>
     	      </tr>
     	      <tr>
     		<table>
     		  <tr>
     		    <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
     		    <td>| . $locale->text('ID') . qq|</td>
     		    <td>|.$locale->text('ID').qq|</td>
     		    <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
     		    <td>| . $locale->text('Date') . qq|</td>
     		    <td>|.$locale->text('Date').qq|</td>
     		    <td align=right><input name="l_reference" class=checkbox type=checkbox value=Y checked></td>
     		    <td>| . $locale->text('Reference') . qq|</td>
     		    <td>|.$locale->text('Reference').qq|</td>
     		    <td align=right><input name="l_description" class=checkbox type=checkbox value=Y checked></td>
     		    <td>| . $locale->text('Description') . qq|</td>
     		    <td>|.$locale->text('Description').qq|</td>
     		    <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
     		    <td>| . $locale->text('Notes') . qq|</td>
     		    <td>|.$locale->text('Notes').qq|</td>
     		  </tr>
     		  <tr>
     		    <td align=right><input name="l_debit" class=checkbox type=checkbox value=Y checked></td>
     		    <td>| . $locale->text('Debit') . qq|</td>
     		    <td>|.$locale->text('Debit').qq|</td>
     		    <td align=right><input name="l_credit" class=checkbox type=checkbox value=Y checked></td>
     		    <td>| . $locale->text('Credit') . qq|</td>
     		    <td>|.$locale->text('Credit').qq|</td>
     		    <td align=right><input name="l_source" class=checkbox type=checkbox value=Y checked></td>
     		    <td>| . $locale->text('Source') . qq|</td>
     		    <td>|.$locale->text('Source').qq|</td>
     		    <td align=right><input name="l_accno" class=checkbox type=checkbox value=Y checked></td>
     		    <td>| . $locale->text('Account') . qq|</td>
     		    <td>|.$locale->text('Account').qq|</td>
     		    <td align=right><input name="l_gifi_accno" class=checkbox type=checkbox value=Y></td>
     		    <td>| . $locale->text('GIFI') . qq|</td>
     		    <td>|.$locale->text('GIFI').qq|</td>
     		  </tr>
     		  <tr>
     		    <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
     		    <td>| . $locale->text('Subtotal') . qq|</td>
     		    <td>|.$locale->text('Subtotal').qq|</td>
     		  </tr>
     		</table>
     	      </tr>
-...
     <input type=hidden name=password value=$form->{password}>
     <br>
     <input class=submit type=submit name=action value="|
         . $locale->text('Continue') . qq|">
     <input class=submit type=submit name=action value="|.$locale->text('Continue').qq|">
     </form>
     </body>
     </html>
     |;
       $lxdebug->leave_sub();
+    }
     sub generate_report {
       $lxdebug->enter_sub();
       $form->{sort} = "transdate" unless $form->{sort};
       GL->all_transactions(\%myconfig, \%$form);
       $callback =
         "$form->{script}?action=generate_report&path=$form->{path}&login=$form->{login}&password=$form->{password}";
       $callback = "$form->{script}?action=generate_report&path=$form->{path}&login=$form->{login}&password=$form->{password}";
       $href = $callback;
       %acctype = ('A' => $locale->text('Asset'),
                   'C' => $locale->text('Contra'),
                   'L' => $locale->text('Liability'),
                   'Q' => $locale->text('Equity'),
                   'I' => $locale->text('Revenue'),
                   'E' => $locale->text('Expense'),);
       %acctype = ( 'A' => $locale->text('Asset'),
                    'C' => $locale->text('Contra'),
                    'L' => $locale->text('Liability'),
     	       'Q' => $locale->text('Equity'),
     	       'I' => $locale->text('Revenue'),
     	       'E' => $locale->text('Expense'),
     	     );
       $form->{title} = $locale->text('General Ledger');
       $ml = ($form->{ml} =~ /(A|E)/) ? -1 : 1;
       unless ($form->{category} eq 'X') {
         $form->{title} .= " : " . $locale->text($acctype{ $form->{category} });
         $form->{title} .= " : ".$locale->text($acctype{$form->{category}});
+      }
       if ($form->{accno}) {
         $href .= "&accno=" . $form->escape($form->{accno});
         $callback .= "&accno=" . $form->escape($form->{accno}, 1);
         $option =
           $locale->text('Account')
           . " : $form->{accno} $form->{account_description}";
         $href .= "&accno=".$form->escape($form->{accno});
         $callback .= "&accno=".$form->escape($form->{accno},1);
         $option = $locale->text('Account')." : $form->{accno} $form->{account_description}";
+      }
       if ($form->{gifi_accno}) {
         $href     .= "&gifi_accno=" . $form->escape($form->{gifi_accno});
         $callback .= "&gifi_accno=" . $form->escape($form->{gifi_accno}, 1);
         $option   .= "\n<br>" if $option;
         $option   .=
           $locale->text('GIFI')
           . " : $form->{gifi_accno} $form->{gifi_account_description}";
         $href .= "&gifi_accno=".$form->escape($form->{gifi_accno});
         $callback .= "&gifi_accno=".$form->escape($form->{gifi_accno},1);
         $option .= "\n<br>" if $option;
         $option .= $locale->text('GIFI')." : $form->{gifi_accno} $form->{gifi_account_description}";
+      }
       if ($form->{source}) {
         $href     .= "&source=" . $form->escape($form->{source});
         $callback .= "&source=" . $form->escape($form->{source}, 1);
         $option   .= "\n<br>" if $option;
         $option   .= $locale->text('Source') . " : $form->{source}";
         $href .= "&source=".$form->escape($form->{source});
         $callback .= "&source=".$form->escape($form->{source},1);
         $option .= "\n<br>" if $option;
         $option .= $locale->text('Source')." : $form->{source}";
+      }
       if ($form->{reference}) {
         $href     .= "&reference=" . $form->escape($form->{reference});
         $callback .= "&reference=" . $form->escape($form->{reference}, 1);
         $option   .= "\n<br>" if $option;
         $option   .= $locale->text('Reference') . " : $form->{reference}";
         $href .= "&reference=".$form->escape($form->{reference});
         $callback .= "&reference=".$form->escape($form->{reference},1);
         $option .= "\n<br>" if $option;
         $option .= $locale->text('Reference')." : $form->{reference}";
+      }
       if ($form->{department}) {
         $href .= "&department=" . $form->escape($form->{department});
         $callback .= "&department=" . $form->escape($form->{department}, 1);
         $href .= "&department=".$form->escape($form->{department});
         $callback .= "&department=".$form->escape($form->{department},1);
         ($department) = split /--/, $form->{department};
         $option .= "\n<br>" if $option;
         $option .= $locale->text('Department') . " : $department";
         $option .= $locale->text('Department')." : $department";
+      }
       if ($form->{description}) {
         $href     .= "&description=" . $form->escape($form->{description});
         $callback .= "&description=" . $form->escape($form->{description}, 1);
         $option   .= "\n<br>" if $option;
         $option   .= $locale->text('Description') . " : $form->{description}";
         $href .= "&description=".$form->escape($form->{description});
         $callback .= "&description=".$form->escape($form->{description},1);
         $option .= "\n<br>" if $option;
         $option .= $locale->text('Description')." : $form->{description}";
+      }
       if ($form->{notes}) {
         $href     .= "&notes=" . $form->escape($form->{notes});
         $callback .= "&notes=" . $form->escape($form->{notes}, 1);
         $option   .= "\n<br>" if $option;
         $option   .= $locale->text('Notes') . " : $form->{notes}";
         $href .= "&notes=".$form->escape($form->{notes});
         $callback .= "&notes=".$form->escape($form->{notes},1);
         $option .= "\n<br>" if $option;
         $option .= $locale->text('Notes')." : $form->{notes}";
+      }
       if ($form->{datefrom}) {
         $href     .= "&datefrom=$form->{datefrom}";
         $href .= "&datefrom=$form->{datefrom}";
         $callback .= "&datefrom=$form->{datefrom}";
         $option   .= "\n<br>" if $option;
         $option   .=
             $locale->text('From') . " "
           . $locale->date(\%myconfig, $form->{datefrom}, 1);
         $option .= "\n<br>" if $option;
         $option .= $locale->text('From')." ".$locale->date(\%myconfig, $form->{datefrom}, 1);
+      }
       if ($form->{dateto}) {
         $href     .= "&dateto=$form->{dateto}";
         $href .= "&dateto=$form->{dateto}";
         $callback .= "&dateto=$form->{dateto}";
         if ($form->{datefrom}) {
           $option .= " ";
         } else {
           $option .= "\n<br>" if $option;
+        }
         $option .=
             $locale->text('Bis') . " "
           . $locale->date(\%myconfig, $form->{dateto}, 1);
         $option .= $locale->text('Bis')." ".$locale->date(\%myconfig, $form->{dateto}, 1);
+      }
       @columns =
         $form->sort_columns(
         qw(transdate id reference description notes source debit debit_accno credit credit_accno debit_tax debit_tax_accno credit_tax credit_tax_accno accno gifi_accno)
         );
       @columns = $form->sort_columns(qw(transdate id reference description notes source debit debit_accno credit credit_accno debit_tax debit_tax_accno credit_tax credit_tax_accno accno gifi_accno));
       if ($form->{accno} || $form->{gifi_accno}) {
         @columns = grep !/(accno|gifi_accno)/, @columns;
         push @columns, "balance";
         $form->{l_balance} = "Y";
+      }
       $form->{l_credit_accno}     = "Y";
       $form->{l_debit_accno}      = "Y";
       $form->{l_credit_tax}       = "Y";
       $form->{l_debit_tax}        = "Y";
+     }
       $form->{l_credit_accno} = "Y";
       $form->{l_debit_accno} = "Y";
       $form->{l_credit_tax} = "Y";
       $form->{l_debit_tax} = "Y";
       $form->{l_credit_tax_accno} = "Y";
       $form->{l_debit_tax_accno}  = "Y";
       $form->{l_accno}            = "N";
       $form->{l_debit_tax_accno} = "Y";
       $form->{l_accno} = "N";
       foreach $item (@columns) {
         if ($form->{"l_$item"} eq "Y") {
           push @column_index, $item;
           # add column to href and callback
           $callback .= "&l_$item=Y";
           $href     .= "&l_$item=Y";
           $href .= "&l_$item=Y";
+        }
+      }
       if ($form->{l_subtotal} eq 'Y') {
         $callback .= "&l_subtotal=Y";
         $href     .= "&l_subtotal=Y";
         $href .= "&l_subtotal=Y";
+      }
       $callback .= "&category=$form->{category}";
       $href     .= "&category=$form->{category}";
       $column_header{id} =
           "<th><a class=listheading href=$href&sort=id>"
         . $locale->text('ID')
         . "</a></th>";
       $column_header{transdate} =
           "<th><a class=listheading href=$href&sort=transdate>"
         . $locale->text('Date')
         . "</a></th>";
       $column_header{reference} =
           "<th><a class=listheading href=$href&sort=reference>"
         . $locale->text('Reference')
         . "</a></th>";
       $column_header{source} =
           "<th><a class=listheading href=$href&sort=source>"
         . $locale->text('Source')
         . "</a></th>";
       $column_header{description} =
           "<th><a class=listheading href=$href&sort=description>"
         . $locale->text('Description')
         . "</a></th>";
       $column_header{notes} =
         "<th class=listheading>" . $locale->text('Notes') . "</th>";
       $column_header{debit} =
         "<th class=listheading>" . $locale->text('Debit') . "</th>";
       $column_header{debit_accno} =
           "<th><a class=listheading href=$href&sort=accno>"
         . $locale->text('Debit Account')
         . "</a></th>";
       $column_header{credit} =
         "<th class=listheading>" . $locale->text('Credit') . "</th>";
       $column_header{credit_accno} =
           "<th><a class=listheading href=$href&sort=accno>"
         . $locale->text('Credit Account')
         . "</a></th>";
       $column_header{debit_tax} =
           "<th><a class=listheading href=$href&sort=accno>"
         . $locale->text('Debit Tax')
         . "</a></th>";
       $column_header{debit_tax_accno} =
           "<th><a class=listheading href=$href&sort=accno>"
         . $locale->text('Debit Tax Account')
         . "</a></th>";
       $column_header{credit_tax} =
           "<th><a class=listheading href=$href&sort=accno>"
         . $locale->text('Credit Tax')
         . "</a></th>";
       $column_header{credit_tax_accno} =
           "<th><a class=listheading href=$href&sort=accno>"
         . $locale->text('Credit Tax Account')
         . "</a></th>";
       $column_header{gifi_accno} =
           "<th><a class=listheading href=$href&sort=gifi_accno>"
         . $locale->text('GIFI')
         . "</a></th>";
       $column_header{balance} = "<th>" . $locale->text('Balance') . "</th>";
       $href .= "&category=$form->{category}";
       $column_header{id} = "<th><a class=listheading href=$href&sort=id>".$locale->text('ID')."</a></th>";
       $column_header{transdate} = "<th><a class=listheading href=$href&sort=transdate>".$locale->text('Date')."</a></th>";
       $column_header{reference} = "<th><a class=listheading href=$href&sort=reference>".$locale->text('Reference')."</a></th>";
       $column_header{source} = "<th><a class=listheading href=$href&sort=source>".$locale->text('Source')."</a></th>";
       $column_header{description} = "<th><a class=listheading href=$href&sort=description>".$locale->text('Description')."</a></th>";
       $column_header{notes} = "<th class=listheading>".$locale->text('Notes')."</th>";
       $column_header{debit} = "<th class=listheading>".$locale->text('Debit')."</th>";
       $column_header{debit_accno} = "<th><a class=listheading href=$href&sort=accno>".$locale->text('Debit Account')."</a></th>";
       $column_header{credit} = "<th class=listheading>".$locale->text('Credit')."</th>";
       $column_header{credit_accno} = "<th><a class=listheading href=$href&sort=accno>".$locale->text('Credit Account')."</a></th>";
       $column_header{debit_tax} = "<th><a class=listheading href=$href&sort=accno>".$locale->text('Debit Tax')."</a></th>";
       $column_header{debit_tax_accno} = "<th><a class=listheading href=$href&sort=accno>".$locale->text('Debit Tax Account')."</a></th>";
       $column_header{credit_tax} = "<th><a class=listheading href=$href&sort=accno>".$locale->text('Credit Tax')."</a></th>";
       $column_header{credit_tax_accno} = "<th><a class=listheading href=$href&sort=accno>".$locale->text('Credit Tax Account')."</a></th>";
       $column_header{gifi_accno} = "<th><a class=listheading href=$href&sort=gifi_accno>".$locale->text('GIFI')."</a></th>";
       $column_header{balance} = "<th>".$locale->text('Balance')."</th>";
       $form->{landscape} = 1;
       $form->header;
       print qq|
-...
     	<tr class=listheading>
     |;
       map { print "$column_header{$_}\n" } @column_index;
     map { print "$column_header{$_}\n" } @column_index;
       print "
     print "
             </tr>
             </thead>
             </tfoot>
             <tbody>
     ";
       # add sort to callback
       $form->{callback} = "$callback&sort=$form->{sort}";
       $callback = $form->escape($form->{callback});
       # initial item for subtotals
       if (@{ $form->{GL} }) {
         $sameitem = $form->{GL}->[0]->{ $form->{sort} };
         $sameitem = $form->{GL}->[0]->{$form->{sort}};
+      }
       if (($form->{accno} || $form->{gifi_accno}) && $form->{balance}) {
         map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
         $column_data{balance} =
             "<td align=right>"
           . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)
           . "</td>";
         $i++;
         $i %= 2;
         $column_data{balance} = "<td align=right>".$form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)."</td>";
         $i++; $i %= 2;
         print qq|
             <tr class=listrow$i>
     |;
         map { print "$column_data{$_}\n" } @column_index;
         print qq|
             </tr>
     |;
+      }
       foreach $ref (@{ $form->{GL} }) {
         # if item ne sort print subtotal
         if ($form->{l_subtotal} eq 'Y') {
           if ($sameitem ne $ref->{ $form->{sort} }) {
             &gl_subtotal;
           if ($sameitem ne $ref->{$form->{sort}}) {
     	&gl_subtotal;
+          }
+        }
         foreach $key (sort keys(%{ $ref->{amount} })) {
         foreach $key (sort keys (%{$ref->{amount}})) {
           $form->{balance} += $ref->{amount}{$key};
+        }
         $debit = "";
         foreach $key (sort keys(%{ $ref->{debit} })) {
         foreach $key (sort keys (%{$ref->{debit}})) {
           $subtotaldebit += $ref->{debit}{$key};
           $totaldebit    += $ref->{debit}{$key};
           $totaldebit += $ref->{debit}{$key};
           if ($key == 0) {
             $debit = $form->format_amount(\%myconfig, $ref->{debit}{$key}, 2, 0);
             $debit = $form->format_amount(\%myconfig, $ref->{debit}{$key} , 2, 0);
           } else {
             $debit .=
               "<br>" . $form->format_amount(\%myconfig, $ref->{debit}{$key}, 2, 0);
             $debit .= "<br>".$form->format_amount(\%myconfig, $ref->{debit}{$key} , 2, 0);
+          }
+        }
         $credit = "";
         foreach $key (sort keys(%{ $ref->{credit} })) {
         foreach $key (sort keys (%{$ref->{credit}})) {
           $subtotalcredit += $ref->{credit}{$key};
           $totalcredit    += $ref->{credit}{$key};
           $totalcredit += $ref->{credit}{$key};
           if ($key == 0) {
             $credit = $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
             $credit = $form->format_amount(\%myconfig, $ref->{credit}{$key} , 2, 0);
           } else {
             $credit .= "<br>"
               . $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
+          }
             $credit .= "<br>".$form->format_amount(\%myconfig, $ref->{credit}{$key} , 2, 0);
+          }
+        }

... Dieser Diff wurde abgeschnitten, weil er die maximale Anzahl anzuzeigender Zeilen überschreitet.

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision c7f9bb36

Von Philip Reetz vor fast 19 Jahren hinzugefügt