X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=f5f846037b1a6054844d1ec739fc886f9c74cf70;hb=9d60642b51924a3fc44a0108777f0611ae19fb30;hp=464fb0162669c049312cd6315fd0c19ee0511ddc;hpb=87c7db6a14d2276b72c85a8423e3995f20255b6a;p=kivitendo-erp.git

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 464fb0162..f5f846037 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -31,15 +31,20 @@
 #
 #======================================================================
 
+use POSIX qw(strftime);
+use List::Util qw(sum);
+
+use SL::FU;
 use SL::GL;
+use SL::IS;
 use SL::PE;
+use SL::ReportGenerator;
 
-require "$form->{path}/arap.pl";
 require "bin/mozilla/common.pl";
+require "bin/mozilla/drafts.pl";
+require "bin/mozilla/reportgenerator.pl";
 
-1;
-
-# end of main
+use strict;
 
 # this is for our long dates
 # $locale->text('January')
@@ -69,16 +74,26 @@ require "bin/mozilla/common.pl";
 # $locale->text('Nov')
 # $locale->text('Dec')
 
+my $tax;
+my $debitlock  = 0;
+my $creditlock = 0;
+
 sub add {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  return $main::lxdebug->leave_sub() if (load_draft_maybe());
 
   $form->{title} = "Add";
 
-  $form->{callback} =
-    "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
+  $form->{callback} = "gl.pl?action=add" unless $form->{callback};
 
   # we use this only to set a default date
+  # yep. aber er holt hier auch schon ALL_CHARTS. Aufwand / Nutzen? jb
   GL->transaction(\%myconfig, \%$form);
 
   map {
@@ -95,22 +110,29 @@ sub add {
 
   # departments
   $form->all_departments(\%myconfig);
-  if (@{ $form->{all_departments} }) {
+  if (@{ $form->{all_departments} || [] }) {
     $form->{selectdepartment} = "<option>\n";
 
     map {
       $form->{selectdepartment} .=
         "<option>$_->{description}--$_->{id}\n"
-    } (@{ $form->{all_departments} });
+    } (@{ $form->{all_departments} || [] });
   }
 
+  $form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
+
   &display_form(1);
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
-sub edit {
-  $lxdebug->enter_sub();
+sub prepare_transaction {
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   GL->transaction(\%myconfig, \%$form);
 
@@ -124,20 +146,20 @@ sub edit {
 
   # departments
   $form->all_departments(\%myconfig);
-  if (@{ $form->{all_departments} }) {
+  if (@{ $form->{all_departments} || [] }) {
     $form->{selectdepartment} = "<option>\n";
 
     map {
       $form->{selectdepartment} .=
         "<option>$_->{description}--$_->{id}\n"
-    } (@{ $form->{all_departments} });
+    } (@{ $form->{all_departments} || [] });
   }
 
   my $i        = 1;
   my $tax      = 0;
   my $taxaccno = "";
-  foreach $ref (@{ $form->{GL} }) {
-    $j = $i - 1;
+  foreach my $ref (@{ $form->{GL} }) {
+    my $j = $i - 1;
     if ($tax && ($ref->{accno} eq $taxaccno)) {
       $form->{"tax_$j"}      = abs($ref->{amount});
       $form->{"taxchart_$j"} = $ref->{id} . "--" . $ref->{taxrate};
@@ -178,37 +200,60 @@ sub edit {
     ($form->datetonum($form->{transdate}, \%myconfig) <=
      $form->datetonum($form->{closedto}, \%myconfig));
 
+  $main::lxdebug->leave_sub();
+}
+
+sub edit {
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  prepare_transaction();
+
   $form->{title} = "Edit";
 
-  &form_header;
-  &display_rows;
-  &form_footer;
-  $lxdebug->leave_sub();
+  $form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
+
+  form_header();
+  display_rows();
+  form_footer();
 
+  $main::lxdebug->leave_sub();
 }
 
+
 sub search {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+  my $cgi      = $main::cgi;
 
-  $form->{title} = $locale->text('Buchungsjournal');
+  $form->{title} = $locale->text('Journal');
 
   $form->all_departments(\%myconfig);
 
   # departments
-  if (@{ $form->{all_departments} }) {
+  if (@{ $form->{all_departments} || [] }) {
     $form->{selectdepartment} = "<option>\n";
 
     map {
       $form->{selectdepartment} .=
         "<option>$_->{description}--$_->{id}\n"
-    } (@{ $form->{all_departments} });
+    } (@{ $form->{all_departments} || [] });
   }
 
-  $department = qq|
-  	<tr>
-	  <th align=right nowrap>| . $locale->text('Department') . qq|</th>
-	  <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
-	</tr>
+  my $department = qq|
+        <tr>
+          <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+          <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
+        </tr>
 | if $form->{selectdepartment};
 
   $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
@@ -227,18 +272,19 @@ sub search {
                          '-labels' => \%project_labels));
 
   # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
-  $jsscript = "";
+  $form->{jsscript} = 1;
+  my $jsscript = "";
+  my ($button1, $button2, $onload);
   if ($form->{jsscript}) {
 
     # with JavaScript Calendar
     $button1 = qq|
-       <td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}">
+       <td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
        <input type=button name=datefrom id="trigger1" value=|
-      . $locale->text('button') . qq|></td>  
+      . $locale->text('button') . qq|></td>
        |;
     $button2 = qq|
-       <td><input name=dateto id=dateto size=11 title="$myconfig{dateformat}">
+       <td><input name=dateto id=dateto size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
        <input type=button name=dateto id="trigger2" value=|
       . $locale->text('button') . qq|></td>
      |;
@@ -251,17 +297,19 @@ sub search {
 
     # without JavaScript Calendar
     $button1 =
-      qq|<td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}"></td>|;
+      qq|<td><input name=datefrom id=datefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\"></td>|;
     $button2 =
-      qq|<td><input name=dateto id=dateto size=11 title="$myconfig{dateformat}"></td>|;
+      qq|<td><input name=dateto id=dateto size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\"></td>|;
   }
-
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
   $form->header;
-
+  $onload = qq|focus()|;
+  $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
+  $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
   print qq|
-<body>
+<body onLoad="$onload">
 
-<form method=post action=$form->{script}>
+<form method=post action=gl.pl>
 
 <input type=hidden name=sort value=transdate>
 
@@ -273,83 +321,83 @@ sub search {
   <tr>
     <td>
       <table>
-	<tr>
-	  <th align=right>| . $locale->text('Reference') . qq|</th>
-	  <td><input name=reference size=20></td>
-	  <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>
-	  <td colspan=3><input name=description size=40></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Notes') . qq|</th>
-	  <td colspan=3><input name=notes size=40></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Project Number') . qq|</th>
-	  <td colspan=3>$projectnumber</td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('From') . qq|</th>
+        <tr>
+          <th align=right>| . $locale->text('Reference') . qq|</th>
+          <td><input name=reference size=20></td>
+          <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>
+          <td colspan=3><input name=description size=40></td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Notes') . qq|</th>
+          <td colspan=3><input name=notes size=40></td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Project Number') . qq|</th>
+          <td colspan=3>$projectnumber</td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('From') . qq|</th>
           $button1
-	  <th align=right>| . $locale->text('To (time)') . qq|</th>
+          <th align=right>| . $locale->text('To (time)') . qq|</th>
           $button2
-	</tr>
-	<tr>
-	  <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;|
+        </tr>
+        <tr>
+          <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;|
+                  <input name="category" class=radio type=radio value=A>&nbsp;|
     . $locale->text('Asset') . qq|
-		  <input name="category" class=radio type=radio value=L>&nbsp;|
+                  <input name="category" class=radio type=radio value=L>&nbsp;|
     . $locale->text('Liability') . qq|
-		  <input name="category" class=radio type=radio value=I>&nbsp;|
+                  <input name="category" class=radio type=radio value=I>&nbsp;|
     . $locale->text('Revenue') . qq|
-		  <input name="category" class=radio type=radio value=E>&nbsp;|
+                  <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 align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></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 align=right><input name="l_description" class=checkbox type=checkbox value=Y checked></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>
-		  </tr>
-		  <tr>
-		    <td align=right><input name="l_debit" class=checkbox type=checkbox value=Y checked></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 align=right><input name="l_source" class=checkbox type=checkbox value=Y checked></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>
-		  </tr>
-		  <tr>
-		    <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-		    <td>| . $locale->text('Subtotal') . qq|</td>
-		    <td align=right><input name="l_projectnumbers" class=checkbox type=checkbox value=Y></td>
-		    <td>| . $locale->text('Project Number') . qq|</td>
-		  </tr>
-		</table>
-	      </tr>
-	    </table>
-	</tr>
+                </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 align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></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 align=right><input name="l_description" class=checkbox type=checkbox value=Y checked></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>
+                  </tr>
+                  <tr>
+                    <td align=right><input name="l_debit" class=checkbox type=checkbox value=Y checked></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 align=right><input name="l_source" class=checkbox type=checkbox value=Y checked></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>
+                  </tr>
+                  <tr>
+                    <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
+                    <td>| . $locale->text('Subtotal') . qq|</td>
+                    <td align=right><input name="l_projectnumbers" class=checkbox type=checkbox value=Y></td>
+                    <td>| . $locale->text('Project Number') . qq|</td>
+                  </tr>
+                </table>
+              </tr>
+            </table>
+        </tr>
       </table>
     </td>
   </tr>
@@ -362,10 +410,6 @@ $jsscript
 
 <input type=hidden name=nextsub value=generate_report>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <br>
 <input class=submit type=submit name=action value="|
     . $locale->text('Continue') . qq|">
@@ -374,552 +418,269 @@ $jsscript
 </body>
 </html>
 |;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub generate_report {
-  $lxdebug->enter_sub();
-
-  $form->{sort} = "transdate" unless $form->{sort};
+sub create_subtotal_row {
+  $main::lxdebug->enter_sub();
 
-  GL->all_transactions(\%myconfig, \%$form);
+  my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
 
-  $callback =
-    "$form->{script}?action=generate_report&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $href = $callback;
+  my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
 
-  %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'),);
+  map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
 
-  $form->{title} = $locale->text('General Ledger');
+  map { $totals->{$_} = 0 } @{ $subtotal_columns };
 
-  $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;
+  $main::lxdebug->leave_sub();
 
-  unless ($form->{category} eq 'X') {
-    $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}";
-  }
-  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}";
-  }
-  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}";
-  }
-  if ($form->{department}) {
-    $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";
-  }
+  return $row;
+}
 
-  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}";
-  }
-  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}";
-  }
- if ($form->{project_id}) {
-    $href     .= "&project_id=" . $form->escape($form->{project_id});
-    $callback .= "&project_id=" . $form->escape($form->{project_id});
-  }
+sub generate_report {
+  $main::lxdebug->enter_sub();
 
-  if ($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);
-  }
-  if ($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);
-  }
+  $main::auth->assert('general_ledger');
 
-  @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
-       projectnumbers  
-       )
-  );
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  if ($form->{accno}) {
-    @columns = grep !/accno/, @columns;
-    push @columns, "balance";
-    $form->{l_balance} = "Y";
+  report_generator_set_default_sort('transdate', 1);
 
-  }
+  GL->all_transactions(\%myconfig, \%$form);
 
-  $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";
-  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";
-    }
-  }
+  my %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'),);
 
-  if ($form->{l_subtotal} eq 'Y') {
-    $callback .= "&l_subtotal=Y";
-    $href     .= "&l_subtotal=Y";
+  $form->{title} = $locale->text('Journal');
+  if ($form->{category} ne 'X') {
+    $form->{title} .= " : " . $locale->text($acctype{ $form->{category} });
   }
 
-  $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{balance} = "<th>" . $locale->text('Balance') . "</th>";
-  $column_header{projectnumbers} =
-      "<th class=listheading>"  . $locale->text('Project Numbers') . "</th>";
-
   $form->{landscape} = 1;
 
-  $form->header;
+  my $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;
 
-  print qq|
-<body>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>$option</td>
-  </tr>
-  <tr>
-    <td>
-      <table width=100%>
-       <thead>
-	<tr class=listheading>
-|;
+  my @columns = qw(
+    transdate      id               reference      description
+    notes          source           debit          debit_accno
+    credit         credit_accno     debit_tax      debit_tax_accno
+    credit_tax     credit_tax_accno projectnumbers balance
+  );
 
-  map { print "$column_header{$_}\n" } @column_index;
+  my @hidden_variables = qw(accno source reference department description notes project_id datefrom dateto category l_subtotal);
+  push @hidden_variables, map { "l_${_}" } @columns;
 
-  print "
-        </tr>
-        </thead>
-        </tfoot>
-        <tbody>
-";
+  my (@options, @date_options);
+  push @options,      $locale->text('Account')     . " : $form->{accno} $form->{account_description}" if ($form->{accno});
+  push @options,      $locale->text('Source')      . " : $form->{source}"                             if ($form->{source});
+  push @options,      $locale->text('Reference')   . " : $form->{reference}"                          if ($form->{reference});
+  push @options,      $locale->text('Description') . " : $form->{description}"                        if ($form->{description});
+  push @options,      $locale->text('Notes')       . " : $form->{notes}"                              if ($form->{notes});
 
-  # add sort to callback
-  $form->{callback} = "$callback&sort=$form->{sort}";
-  $callback = $form->escape($form->{callback});
+  push @date_options, $locale->text('From'), $locale->date(\%myconfig, $form->{datefrom}, 1)          if ($form->{datefrom});
+  push @date_options, $locale->text('Bis'),  $locale->date(\%myconfig, $form->{dateto},   1)          if ($form->{dateto});
+  push @options,      join(' ', @date_options)                                                        if (scalar @date_options);
 
-  # initial item for subtotals
-  if (@{ $form->{GL} }) {
-    $sameitem = $form->{GL}->[0]->{ $form->{sort} };
+  if ($form->{department}) {
+    my ($department) = split /--/, $form->{department};
+    push @options, $locale->text('Department') . " : $department";
   }
 
-  if ($form->{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;
-    print qq|
-        <tr class=listrow$i>
-|;
-    map { print "$column_data{$_}\n" } @column_index;
+  my $callback = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
+
+  $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_balance}          = $form->{accno} ? 'Y' : '';
+
+  my %column_defs = (
+    'id'               => { 'text' => $locale->text('ID'), },
+    'transdate'        => { 'text' => $locale->text('Date'), },
+    'reference'        => { 'text' => $locale->text('Reference'), },
+    'source'           => { 'text' => $locale->text('Source'), },
+    'description'      => { 'text' => $locale->text('Description'), },
+    'notes'            => { 'text' => $locale->text('Notes'), },
+    'debit'            => { 'text' => $locale->text('Debit'), },
+    'debit_accno'      => { 'text' => $locale->text('Debit Account'), },
+    'credit'           => { 'text' => $locale->text('Credit'), },
+    'credit_accno'     => { 'text' => $locale->text('Credit Account'), },
+    'debit_tax'        => { 'text' => $locale->text('Debit Tax'), },
+    'debit_tax_accno'  => { 'text' => $locale->text('Debit Tax Account'), },
+    'credit_tax'       => { 'text' => $locale->text('Credit Tax'), },
+    'credit_tax_accno' => { 'text' => $locale->text('Credit Tax Account'), },
+    'balance'          => { 'text' => $locale->text('Balance'), },
+    'projectnumbers'   => { 'text' => $locale->text('Project Numbers'), },
+  );
 
-    print qq|
-        </tr>
-|;
+  foreach my $name (qw(id transdate reference description debit_accno credit_accno debit_tax_accno credit_tax_accno)) {
+    my $sortname                = $name =~ m/accno/ ? 'accno' : $name;
+    my $sortdir                 = $sortname eq $form->{sort} ? 1 - $form->{sortdir} : $form->{sortdir};
+    $column_defs{$name}->{link} = $callback . "&sort=$sortname&sortdir=$sortdir";
   }
-  $form->{balance} *= $ml;
-  foreach $ref (@{ $form->{GL} }) {
-    $form->{balance} *= $ml;
-
-    # if item ne sort print subtotal
-    if ($form->{l_subtotal} eq 'Y') {
-      if ($sameitem ne $ref->{ $form->{sort} }) {
-        &gl_subtotal;
-      }
-    }
 
-    #foreach $key (sort keys(%{ $ref->{amount} })) {
-    #  $form->{balance} += $ref->{amount}{$key};
-    #}
+  map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
+  map { $column_defs{$_}->{visible} = 0 } qw(debit_accno credit_accno debit_tax_accno credit_tax_accno) if $form->{accno};
 
-    $debit = "";
-    foreach $key (sort keys(%{ $ref->{debit} })) {
-      $subtotaldebit += $ref->{debit}{$key};
-      $totaldebit    += $ref->{debit}{$key};
-      if ($key == 0) {
-        $debit = $form->format_amount(\%myconfig, $ref->{debit}{$key}, 2, 0);
-      } else {
-        $debit .=
-          "<br>" . $form->format_amount(\%myconfig, $ref->{debit}{$key}, 2, 0);
-      }
-      $form->{balance} = abs($form->{balance}) - abs($ref->{debit}{$key});
-    }
+  my %column_alignment;
+  map { $column_alignment{$_}     = 'right'  } qw(balance id debit credit debit_tax credit_tax balance);
+  map { $column_alignment{$_}     = 'center' } qw(reference debit_accno credit_accno debit_tax_accno credit_tax_accno);
+  map { $column_alignment{$_}     = 'left' } qw(description source notes);
+  map { $column_defs{$_}->{align} = $column_alignment{$_} } keys %column_alignment;
 
-    $credit = "";
-    foreach $key (sort keys(%{ $ref->{credit} })) {
-      $subtotalcredit += $ref->{credit}{$key};
-      $totalcredit    += $ref->{credit}{$key};
-      if ($key == 0) {
-        $credit = $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
-      } else {
-        $credit .= "<br>"
-          . $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
-      }
-      $form->{balance} = abs($form->{balance}) - abs($ref->{credit}{$key});
-    }
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-    $debittax = "";
-    foreach $key (sort keys(%{ $ref->{debit_tax} })) {
-      $subtotaldebittax += $ref->{debit_tax}{$key};
-      $totaldebittax    += $ref->{debit_tax}{$key};
-      if ($key == 0) {
-        $debittax =
-          $form->format_amount(\%myconfig, $ref->{debit_tax}{$key}, 2, 0);
-      } else {
-        $debittax .= "<br>"
-          . $form->format_amount(\%myconfig, $ref->{debit_tax}{$key}, 2, 0);
-      }
-      $form->{balance} = abs($form->{balance}) - abs($ref->{debit_tax}{$key});
-    }
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
 
-    $credittax = "";
-    foreach $key (sort keys(%{ $ref->{credit_tax} })) {
-      $subtotalcredittax += $ref->{credit_tax}{$key};
-      $totalcredittax    += $ref->{credit_tax}{$key};
-      if ($key == 0) {
-        $credittax =
-          $form->format_amount(\%myconfig, $ref->{credit_tax}{$key}, 2, 0);
-      } else {
-        $credittax .= "<br>"
-          . $form->format_amount(\%myconfig, $ref->{credit_tax}{$key}, 2, 0);
-      }
-      $form->{balance} = abs($form->{balance}) - abs($ref->{credit_tax}{$key});
-    }
+  $report->set_export_options('generate_report', @hidden_variables, qw(sort sortdir));
 
-    $debitaccno  = "";
-    $debittaxkey = "";
-    $taxaccno    = "";
-    foreach $key (sort keys(%{ $ref->{debit_accno} })) {
-      if ($key == 0) {
-        $debitaccno =
-          "<a href=$href&accno=$ref->{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}</a>";
-      } else {
-        $debitaccno .=
-          "<br><a href=$href&accno=$ref->{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}</a>";
-      }
+  $report->set_sort_indicator($form->{sort} eq 'accno' ? 'debit_accno' : $form->{sort}, $form->{sortdir});
 
-      #       if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
-      #         $ref->{debit_tax_accno}{$key} = $taxaccno;
-      #       }
-      $taxaccno    = $ref->{debit_tax_accno}{$key};
-      $debittaxkey = $ref->{debit_taxkey}{$key};
-    }
+  $report->set_options('top_info_text'        => join("\n", @options),
+                       'output_format'        => 'HTML',
+                       'title'                => $form->{title},
+                       'attachment_basename'  => $locale->text('general_ledger_list') . strftime('_%Y%m%d', localtime time),
+    );
+  $report->set_options_from_form();
 
-    $creditaccno  = "";
-    $credittaxkey = "";
-    $taxaccno     = "";
-    foreach $key (sort keys(%{ $ref->{credit_accno} })) {
-      if ($key == 0) {
-        $creditaccno =
-          "<a href=$href&accno=$ref->{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}</a>";
-      } else {
-        $creditaccno .=
-          "<br><a href=$href&accno=$ref->{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}</a>";
-      }
+  # add sort to callback
+  $form->{callback} = "$callback&sort=" . E($form->{sort}) . "&sortdir=" . E($form->{sortdir});
 
-      #       if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
-      #         $ref->{credit_tax_accno}{$key} = $taxaccno;
-      #       }
-      $taxaccno     = $ref->{credit_tax_accno}{$key};
-      $credittaxkey = $ref->{credit_taxkey}{$key};
-    }
 
-    $debittaxaccno = "";
-    foreach $key (sort keys(%{ $ref->{debit_tax_accno} })) {
-      if ($key == 0) {
-        $debittaxaccno =
-          "<a href=$href&accno=$ref->{debit_tax_accno}{$key}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
-      } else {
-        $debittaxaccno .=
-          "<br><a href=$href&accno=$ref->{debit_tax_accno}{$key}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
-      }
-    }
+  my @totals_columns = qw(debit credit debit_tax credit_tax);
+  my %subtotals      = map { $_ => 0 } @totals_columns;
+  my %totals         = map { $_ => 0 } @totals_columns;
+  my $idx            = 0;
 
-    $credittaxaccno = "";
-    foreach $key (sort keys(%{ $ref->{credit_tax_accno} })) {
-      if ($key == 0) {
-        $credittaxaccno =
-          "<a href=$href&accno=$ref->{credit_tax_accno}{$key}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
-      } else {
-        $credittaxaccno .=
-          "<br><a href=$href&accno=$ref->{credit_tax_accno}{$key}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
+  foreach my $ref (@{ $form->{GL} }) {
+
+    my %rows;
+
+    foreach my $key (qw(debit credit debit_tax credit_tax)) {
+      $rows{$key} = [];
+      foreach my $idx (sort keys(%{ $ref->{$key} })) {
+        my $value         = $ref->{$key}->{$idx};
+        $subtotals{$key} += $value;
+        $totals{$key}    += $value;
+        if ($key =~ /debit.*/) {
+          $ml = -1;
+        } else {
+          $ml = 1;
+        }
+        $form->{balance}  = $form->{balance} + $value * $ml;
+        push @{ $rows{$key} }, $form->format_amount(\%myconfig, $value, 2);
       }
     }
 
-    $transdate = "";
-    foreach $key (sort keys(%{ $ref->{ac_transdate} })) {
-      if ($key == 0) {
-        $transdate = "$ref->{ac_transdate}{$key}";
-      } else {
-        $transdate .= "<br>$ref->{ac_transdate}{$key}";
-      }
+    foreach my $key (qw(debit_accno credit_accno debit_tax_accno credit_tax_accno ac_transdate source)) {
+      my $col = $key eq 'ac_transdate' ? 'transdate' : $key;
+      $rows{$col} = [ map { $ref->{$key}->{$_} } sort keys(%{ $ref->{$key} }) ];
     }
 
-    #    $ref->{debit} = $form->format_amount(\%myconfig, $ref->{debit}, 2, "&nbsp;");
-    #    $ref->{credit} = $form->format_amount(\%myconfig, $ref->{credit}, 2, "&nbsp;");
-
-    $column_data{id}        = "<td align=right>&nbsp;$ref->{id}&nbsp;</td>";
-    $column_data{transdate}    = "<td align=center>$transdate</td>";
-    $column_data{reference} =
-      "<td align=center><a href=$ref->{module}.pl?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference}</td>";
-    $column_data{description}  = "<td align=center>$ref->{description}&nbsp;</td>";
-    $column_data{source}       = "<td align=center>$ref->{source}&nbsp;</td>";
-    $column_data{notes}        = "<td align=center>$ref->{notes}&nbsp;</td>";
-    $column_data{debit}        = "<td align=right>$debit</td>";
-    $column_data{debit_accno}  = "<td align=center>$debitaccno</td>";
-    $column_data{credit}       = "<td align=right>$credit</td>";
-    $column_data{credit_accno} = "<td align=center>$creditaccno</td>";
-    $column_data{debit_tax}    =
-      ($ref->{debit_tax_accno} ne "")
-      ? "<td align=right>$debittax</td>"
-      : "<td></td>";
-    $column_data{debit_tax_accno} = "<td align=center>$debittaxaccno</td>";
-    $column_data{credit_tax} =
-      ($ref->{credit_tax_accno} ne "")
-      ? "<td align=right>$credittax</td>"
-      : "<td></td>";
-    $column_data{credit_tax_accno} = "<td align=center>$credittaxaccno</td>";
-    $column_data{balance} =
-      "<td align=right>"
-      . $form->format_amount(\%myconfig, $form->{balance}, 2, 0) . "</td>";
-    $column_data{projectnumbers} =
-      "<td>" . join(", ", sort({ lc($a) cmp lc($b) } keys(%{ $ref->{projectnumbers} }))) . "</td>";
-
-    $i++;
-    $i %= 2;
-    print "
-        <tr class=listrow$i>";
-    map { print "$column_data{$_}\n" } @column_index;
-    print "</tr>";
+    my $row = { };
+    map { $row->{$_} = { 'data' => '', 'align' => $column_alignment{$_} } } @columns;
 
-  }
+    my $sh = "";
+    if ($form->{balance} < 0) {
+      $sh = " S";
+      $ml = -1;
+    } elsif ($form->{balance} > 0) {
+      $sh = " H";
+      $ml = 1;
+    }
+    my $data = $form->format_amount(\%myconfig, ($form->{balance} * $ml), 2);
+    $data .= $sh;
 
-  &gl_subtotal if ($form->{l_subtotal} eq 'Y');
-
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
-
-  my $balanced_ledger = $totaldebit 
-                      + $totaldebittax 
-                      - $totalcredit 
-                      - $totalcredittax;
-                    # = 0 for balanced ledger
-                    
-  $column_data{debit} =
-    "<th align=right class=listtotal>"
-    . $form->format_amount(\%myconfig, $totaldebit, 2, "&nbsp;") . "</th>";
-  $column_data{credit} =
-    "<th align=right class=listtotal>"
-    . $form->format_amount(\%myconfig, $totalcredit, 2, "&nbsp;") . "</th>";
-  $column_data{debit_tax} =
-    "<th align=right class=listtotal>"
-    . $form->format_amount(\%myconfig, $totaldebittax, 2, "&nbsp;") . "</th>";
-  $column_data{credit_tax} =
-    "<th align=right class=listtotal>"
-    . $form->format_amount(\%myconfig, $totalcredittax, 2, "&nbsp;") . "</th>";
-  $column_data{balance} =
-    "<th align=right class=listtotal>"
-    . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0) . "</th>";
+    $row->{balance}->{data}        = $data;
+    $row->{projectnumbers}->{data} = join ", ", sort { lc($a) cmp lc($b) } keys %{ $ref->{projectnumbers} };
 
-  print qq|
-	<tr class=listtotal>
-|;
+    map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes);
 
-  map { print "$column_data{$_}\n" } @column_index;
+    map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno source);
 
-  print qq|
-        </tr>
-        <tr>|;
+    foreach my $col (qw(debit_accno credit_accno debit_tax_accno credit_tax_accno)) {
+      $row->{$col}->{link} = [ map { "${callback}&accno=" . E($_) } @{ $rows{$col} } ];
+    }
 
+    map { $row->{$_}->{data} = \@{ $rows{$_} } if ($ref->{"${_}_accno"} ne "") } qw(debit_tax credit_tax);
 
-  if ( abs($balanced_ledger) >  0.001 ) {
+    $row->{reference}->{link} = build_std_url("script=$ref->{module}.pl", 'action=edit', 'id=' . E($ref->{id}), 'callback');
 
-    print qq|<td colspan="4" style="background-color:#FFA0A0" >|
-        . $locale->text('Unbalanced Ledger') 
-        . ": " 
-        . $form->format_amount(\%myconfig, $balanced_ledger, 3, "&nbsp;")
+    my $row_set = [ $row ];
 
-  } elsif ( abs($balanced_ledger) <= 0.001 ) {
+    if (($form->{l_subtotal} eq 'Y')
+        && (($idx == (scalar @{ $form->{GL} } - 1))
+            || ($ref->{ $form->{sort} } ne $form->{GL}->[$idx + 1]->{ $form->{sort} }))) {
+      push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, [ qw(debit credit) ], 'listsubtotal');
+    }
 
-    print qq|<td colspan="3">|
-          . $locale->text('Balanced Ledger') 
+    $report->add_data($row_set);
 
+    $idx++;
   }
 
-  
-  print qq|
-         </td>
-        </tr>
-        </tbody>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-
-<form method=post action=$form->{script}>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  $report->add_separator();
 
-<input class=submit type=submit name=action value="|
-    . $locale->text('GL Transaction') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('AR Transaction') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('AP Transaction') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('Sales Invoice') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('Vendor Invoice') . qq|">
+  # = 0 for balanced ledger
+  my $balanced_ledger = $totals{debit} + $totals{debit_tax} - $totals{credit} - $totals{credit_tax};
 
-</form>
+  my $row = create_subtotal_row(\%totals, \@columns, \%column_alignment, [ qw(debit credit debit_tax credit_tax) ], 'listtotal');
 
-</body>
-</html>
-|;
-  $lxdebug->leave_sub();
+  my $sh = "";
+  if ($form->{balance} < 0) {
+    $sh = " S";
+    $ml = -1;
+  } elsif ($form->{balance} > 0) {
+    $sh = " H";
+    $ml = 1;
+  }
+  my $data = $form->format_amount(\%myconfig, ($form->{balance} * $ml), 2);
+  $data .= $sh;
 
-}
+  $row->{balance}->{data}        = $data;
 
-sub gl_subtotal {
-  $lxdebug->enter_sub();
+  $report->add_data($row);
 
-  $subtotaldebit =
-    $form->format_amount(\%myconfig, $subtotaldebit, 2, "&nbsp;");
-  $subtotalcredit =
-    $form->format_amount(\%myconfig, $subtotalcredit, 2, "&nbsp;");
+  my $raw_bottom_info_text;
 
-  map { $column_data{$_} = "<td>&nbsp;</td>" }
-    qw(transdate id reference source description accno);
-  $column_data{debit}  = "<th align=right>$subtotaldebit</td>";
-  $column_data{credit} = "<th align=right>$subtotalcredit</td>";
+  if (!$form->{accno} && (abs($balanced_ledger) >  0.001)) {
+    $raw_bottom_info_text .=
+        '<p><span class="unbalanced_ledger">'
+      . $locale->text('Unbalanced Ledger')
+      . ': '
+      . $form->format_amount(\%myconfig, $balanced_ledger, 3)
+      . '</span></p> ';
+  }
 
-  print "<tr class=listsubtotal>";
-  map { print "$column_data{$_}\n" } @column_index;
-  print "</tr>";
+  $raw_bottom_info_text .= $form->parse_html_template('gl/generate_report_bottom');
 
-  $subtotaldebit  = 0;
-  $subtotalcredit = 0;
+  $report->set_options('raw_bottom_info_text' => $raw_bottom_info_text);
 
-  $sameitem = $ref->{ $form->{sort} };
-  $lxdebug->leave_sub();
+  $report->generate_with_headers();
 
+  $main::lxdebug->leave_sub();
 }
 
 sub update {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   $form->{oldtransdate} = $form->{transdate};
 
@@ -929,8 +690,7 @@ sub update {
   my $credittax   = 0;
   my $debitcount  = 0;
   my $creditcount = 0;
-  $debitlock  = 0;
-  $creditlock = 0;
+  my ($debitcredit, $amount);
 
   my @flds =
     qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
@@ -979,27 +739,25 @@ sub update {
         ($form->{"debit_$i"} == 0)
         ? $form->{"credit_$i"}
         : $form->{"debit_$i"};
-      $j = $#a;
+      my $j = $#a;
       if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
         $form->{"taxchart_$i"} = "0--0.00";
         $form->{"tax_$i"}      = 0;
       }
-      if (!$form->{"korrektur_$i"}) {
-        ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
-        if ($taxkey > 1) {
-          if ($debitcredit) {
-            $debittax = 1;
-          } else {
-            $credittax = 1;
-          }
-          if ($form->{taxincluded}) {
-            $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
-          } else {
-            $form->{"tax_$i"} = $amount * $rate;
-          }
+      my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+      if ($taxkey > 1) {
+        if ($debitcredit) {
+          $debittax = 1;
         } else {
-          $form->{"tax_$i"} = 0;
+          $credittax = 1;
         }
+        if ($form->{taxincluded}) {
+          $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
+        } else {
+          $form->{"tax_$i"} = $amount * $rate;
+        }
+      } else {
+        $form->{"tax_$i"} = 0;
       }
 
       for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
@@ -1007,25 +765,30 @@ sub update {
     }
   }
 
-  for $i (1 .. $count) {
-    $j = $i - 1;
+  for my $i (1 .. $count) {
+    my $j = $i - 1;
     for (@flds) { $form->{"${_}_$i"} = $a[$j]->{$_} }
   }
 
-  for $i ($count + 1 .. $form->{rowcount}) {
+  for my $i ($count + 1 .. $form->{rowcount}) {
     for (@flds) { delete $form->{"${_}_$i"} }
   }
 
   $form->{rowcount} = $count + 1;
 
   &display_form;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
 sub display_form {
   my ($init) = @_;
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   &form_header($init);
 
@@ -1037,27 +800,23 @@ sub display_form {
   #   }
   &display_rows($init);
   &form_footer;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
 sub display_rows {
   my ($init) = @_;
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $form->{totaldebit}  = 0;
-  $form->{totalcredit} = 0;
+  $main::auth->assert('general_ledger');
 
-  my @old_project_ids = ();
-  map({ push(@old_project_ids, $form->{"project_id_$_"})
-          if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $cgi      = $main::cgi;
 
-  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
-                                   "all" => 0,
-                                   "old_id" => \@old_project_ids },
-                   "charts" => { "key" => "ALL_CHARTS",
-                                 "transdate" => $form->{transdate} },
-                   "taxcharts" => "ALL_TAXCHARTS");
+  $form->{debit_1}     = 0 if !$form->{"debit_1"};
+  $form->{totaldebit}  = 0;
+  $form->{totalcredit} = 0;
 
   my %project_labels = ();
   my @project_values = ("");
@@ -1071,10 +830,13 @@ sub display_rows {
   my %charts = ();
   my $taxchart_init;
   foreach my $item (@{ $form->{ALL_CHARTS} }) {
-    my $key = Q($item->{accno}) . "--" . Q($item->{tax_id});
-    $taxchart_init = $item->{taxkey_id} unless (@chart_values);
+    if ($item->{charttype} eq 'H'){ #falls überschrift
+      next;                         #überspringen (Bug 1150)
+    }
+    my $key = $item->{accno} . "--" . $item->{tax_id};
+    $taxchart_init = $item->{tax_id} unless (@chart_values);
     push(@chart_values, $key);
-    $chart_labels{$key} = H($item->{accno}) . "--" . H($item->{description});
+    $chart_labels{$key} = $item->{accno} . "--" . $item->{description};
     $charts{$item->{accno}} = $item;
   }
 
@@ -1082,20 +844,26 @@ sub display_rows {
   my @taxchart_values = ();
   my %taxcharts = ();
   foreach my $item (@{ $form->{ALL_TAXCHARTS} }) {
-    my $key = Q($item->{id}) . "--" . Q($item->{rate});
-    $taxchart_init = $key if ($taxchart_init eq $item->{taxkey});
+    my $key = $item->{id} . "--" . $item->{rate};
+    $taxchart_init = $key if ($taxchart_init == $item->{id});
     push(@taxchart_values, $key);
-    $taxchart_labels{$key} = H($item->{taxdescription}) . " " .
-      H($item->{rate} * 100) . ' %';
+    $taxchart_labels{$key} = $item->{taxdescription} . " " . $item->{rate} * 100 . ' %';
     $taxcharts{$item->{id}} = $item;
   }
 
-  for $i (1 .. $form->{rowcount}) {
-
-    $source = qq|
-    <td><input name="source_$i" value="$form->{"source_$i"}" size="16"></td>|;
-    $memo = qq|
-    <td><input name="memo_$i" value="$form->{"memo_$i"}" size="16"></td>|;
+  my ($source, $memo, $source_hidden, $memo_hidden);
+  for my $i (1 .. $form->{rowcount}) {
+    if ($form->{show_details}) {
+      $source = qq|
+      <td><input name="source_$i" value="$form->{"source_$i"}" size="16"></td>|;
+      $memo = qq|
+      <td><input name="memo_$i" value="$form->{"memo_$i"}" size="16"></td>|;
+    } else {
+      $source_hidden = qq|
+      <input type="hidden" name="source_$i" value="$form->{"source_$i"}" size="16">|;
+      $memo_hidden = qq|
+      <input type="hidden" name="memo_$i" value="$form->{"memo_$i"}" size="16">|;
+    }
 
     my $selected_accno_full;
     my ($accno_row) = split(/--/, $form->{"accno_$i"});
@@ -1113,13 +881,13 @@ sub display_rows {
       $selected_taxchart = "$item->{id}--$item->{rate}";
     }
 
-    $selected_accno = '' if ($init);
-    $selected_taxchart = $taxchart_init unless ($selected_taxchart ne "");
+    $selected_accno      = '' if ($init);
+    $selected_taxchart ||= $taxchart_init;
 
-    $accno = qq|<td>| .
+    my $accno = qq|<td>| .
       NTI($cgi->popup_menu('-name' => "accno_$i",
                            '-id' => "accno_$i",
-                           '-onChange' => "setTaxkey(this, $i)",
+                           '-onChange' => "setTaxkey($i)",
                            '-style' => 'width:200px',
                            '-values' => \@chart_values,
                            '-labels' => \%chart_labels,
@@ -1136,9 +904,8 @@ sub display_rows {
                            '-default' => $selected_taxchart))
       . qq|</td>|;
 
+    my ($fx_transaction, $checked);
     if ($init) {
-      $korrektur =
-        qq|<td><input type="checkbox" name="korrektur_$i" value="1"</td>|;
       if ($form->{transfer}) {
         $fx_transaction = qq|
         <td><input name="fx_transaction_$i" class=checkbox type=checkbox value=1></td>
@@ -1168,19 +935,14 @@ sub display_rows {
       if ($i < $form->{rowcount}) {
         if ($form->{transfer}) {
           $checked = ($form->{"fx_transaction_$i"}) ? "1" : "";
-          $x = ($checked) ? "x" : "";
+          my $x = ($checked) ? "x" : "";
           $fx_transaction = qq|
       <td><input type=hidden name="fx_transaction_$i" value="$checked">$x</td>
     |;
         }
-        $checked = ($form->{"korrektur_$i"}) ? "checked" : "";
-        $korrektur =
-          qq|<td><input type="checkbox" name="korrektur_$i" value="1" $checked></td>|;
         $form->hide_form("accno_$i");
 
       } else {
-        $korrektur =
-          qq|<td><input type="checkbox" name="korrektur_$i" value="1"></td>|;
         if ($form->{transfer}) {
           $fx_transaction = qq|
       <td><input name="fx_transaction_$i" class=checkbox type=checkbox value=1></td>
@@ -1204,43 +966,79 @@ sub display_rows {
                            '-labels' => \%project_labels,
                            '-default' => $form->{"project_id_$i"} ));
 
+    my $copy2credit = 'onkeyup="copy_debit_to_credit()"' if $i == 1;
+
     print qq|<tr valign=top>
     $accno
+    <td id="chart_balance_$i" align="right">&nbsp;</td>
     $fx_transaction
-    <td><input name="debit_$i" size=8 value="$form->{"debit_$i"}" accesskey=$i $debitreadonly></td>
+    <td><input name="debit_$i" size="8" value="$form->{"debit_$i"}" accesskey=$i $copy2credit $debitreadonly></td>
     <td><input name="credit_$i" size=8 value="$form->{"credit_$i"}" $creditreadonly></td>
-    <td><input name="tax_$i" size=6 value="$form->{"tax_$i"}"></td>
-    $korrektur
-    $tax
+    <td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>
+    $tax|;
+
+    if ($form->{show_details}) {
+      print qq|
     $source
     $memo
     <td>$projectnumber</td>
+|;
+    }
+    print qq|
+    $source_hidden
+    $memo_hidden
   </tr>
-
-  |;
+|;
   }
 
   $form->hide_form(qw(rowcount selectaccno));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
 sub form_header {
   my ($init) = @_;
-  $lxdebug->enter_sub();
-  $title         = $form->{title};
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  my @old_project_ids = ();
+  map({ push(@old_project_ids, $form->{"project_id_$_"})
+          if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
+
+  $form->get_lists("projects"  => { "key"       => "ALL_PROJECTS",
+                                    "all"       => 0,
+                                    "old_id"    => \@old_project_ids },
+                   "charts"    => { "key"       => "ALL_CHARTS",
+                                    "transdate" => $form->{transdate} },
+                   "taxcharts" => "ALL_TAXCHARTS");
+
+  GL->get_chart_balances('charts' => $form->{ALL_CHARTS});
+
+  my $title      = $form->{title};
   $form->{title} = $locale->text("$title General Ledger Transaction");
-  $readonly      = ($form->{id}) ? "readonly" : "";
+  my $readonly   = ($form->{id}) ? "readonly" : "";
+
+  my $show_details_checked = "checked" if $form->{show_details};
+
+  my $ob_transaction_checked = "checked" if $form->{ob_transaction};
+  my $cb_transaction_checked = "checked" if $form->{cb_transaction};
 
   # $locale->text('Add General Ledger Transaction')
   # $locale->text('Edit General Ledger Transaction')
 
   map { $form->{$_} =~ s/\"/&quot;/g }
     qw(reference description chart taxchart);
+
   $form->{javascript} = qq|<script type="text/javascript">
   <!--
-  function setTaxkey(accno, row) {
+  function setTaxkey(row) {
+    var accno  = document.getElementById('accno_' + row);
     var taxkey = accno.options[accno.selectedIndex].value;
     var reg = /--([0-9]*)/;
     var found = reg.exec(taxkey);
@@ -1255,14 +1053,23 @@ sub form_header {
       }
     }
   };
+
+  function copy_debit_to_credit() {
+    var txt = document.getElementsByName('debit_1')[0].value;
+    document.getElementsByName('credit_2')[0].value = txt;
+  };
   //-->
-  </script>|;
+  </script>
+  <script type="text/javascript" src="js/show_form_details.js"></script>
+  <script type="text/javascript" src="js/jquery.js"></script>
+|;
 
   $form->{selectdepartment} =~ s/ selected//;
   $form->{selectdepartment} =~
     s/option>\Q$form->{department}\E/option selected>$form->{department}/;
 
-  if (($rows = $form->numtextrows($form->{description}, 50)) > 1) {
+  my $description;
+  if ((my $rows = $form->numtextrows($form->{description}, 50)) > 1) {
     $description =
       qq|<textarea name=description rows=$rows cols=50 wrap=soft $readonly >$form->{description}</textarea>|;
   } else {
@@ -1270,18 +1077,19 @@ sub form_header {
       qq|<input name=description size=50 value="$form->{description}" $readonly>|;
   }
 
-  $taxincluded = ($form->{taxincluded}) ? "checked" : "";
+  my $taxincluded = ($form->{taxincluded}) ? "checked" : "";
 
   if ($init) {
     $taxincluded = "checked";
   }
 
+  my $department;
   $department = qq|
-  	<tr>
-	  <th align=right nowrap>| . $locale->text('Department') . qq|</th>
-	  <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
-	  <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
-	</tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+          <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
+          <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
+        </tr>
 | if $form->{selectdepartment};
   if ($init) {
     $form->{fokus} = "gl.reference";
@@ -1290,15 +1098,16 @@ sub form_header {
   }
 
   # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
-  $jsscript = "";
+  $form->{jsscript} = 1;
+  my $jsscript = "";
+  my ($button1, $button2);
   if ($form->{jsscript}) {
 
     # with JavaScript Calendar
     $button1 = qq|
-       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" $readonly>
+       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" $readonly onBlur=\"check_right_date_format(this)\">
        <input type=button name=transdate id="trigger1" value=|
-      . $locale->text('button') . qq|></td>  
+      . $locale->text('button') . qq|></td>
        |;
 
     #write Trigger
@@ -1308,22 +1117,33 @@ sub form_header {
 
     # without JavaScript Calendar
     $button1 =
-      qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" $readonly></td>|;
+      qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" $readonly onBlur=\"check_right_date_format(this)\"></td>|;
   }
 
+  $form->{previous_id}     ||= "--";
+  $form->{previous_gldate} ||= "--";
+
+  $jsscript .= $form->parse_html_template('gl/form_header_chart_balances_js');
+
   $form->header;
 
   print qq|
-<body onLoad="fokus()">
+<body onLoad="focus()">
+
+<script type="text/javascript" src="js/follow_up.js"></script>
 
-<form method=post name="gl" action=$form->{script}>
+<form method=post name="gl" action=gl.pl>
+|;
 
-<input name=id type=hidden value=$form->{id}>
+  $form->hide_form(qw(id closedto locked storno storno_id previous_id previous_gldate));
 
-<input type=hidden name=closedto value=$form->{closedto}>
-<input type=hidden name=locked value=$form->{locked}>
+  print qq|
 <input type=hidden name=title value="$title">
 
+<input type="hidden" name="follow_up_trans_id_1" value="| . H($form->{id}) . qq|">
+<input type="hidden" name="follow_up_trans_type_1" value="gl_transaction">
+<input type="hidden" name="follow_up_trans_info_1" value="| . H($form->{id}) . qq|">
+<input type="hidden" name="follow_up_rowcount" value="1">
 
 <table width=100%>
   <tr>
@@ -1333,119 +1153,163 @@ sub form_header {
   <tr>
     <td>
       <table width=100%>
-	<tr>
-	  <th align=right>| . $locale->text('Reference') . qq|</th>
-	  <td><input name=reference size=20 value="$form->{reference}" $readonly></td>
-	  <td align=left>
-	    <table>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Date') . qq|</th>
+        <tr>
+          <td colspan="6" align="left">|
+    . $locale->text("Previous transnumber text")
+    . " $form->{previous_id} "
+    . $locale->text("Previous transdate text")
+    . " $form->{previous_gldate}"
+    . qq|</td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Reference') . qq|</th>
+          <td><input name=reference size=20 value="$form->{reference}" $readonly></td>
+          <td align=left>
+            <table>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Date') . qq|</th>
                 $button1
-	      </tr>
-	    </table>
-	  </td>
-	</tr>|;
+              </tr>
+            </table>
+          </td>
+        </tr>|;
   if ($form->{id}) {
     print qq|
-	<tr>
-	  <th align=right>| . $locale->text('Belegnummer') . qq|</th>
-	  <td><input name=id size=20 value="$form->{id}" $readonly></td>
-	  <td align=left>
-	  <table>
-	      <tr>
-		<th align=right width=50%>| . $locale->text('Buchungsdatum') . qq|</th>
-		<td align=left><input name=gldate size=11 title="$myconfig{dateformat}" value=$form->{gldate} $readonly></td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>|;
+        <tr>
+          <th align=right>| . $locale->text('Belegnummer') . qq|</th>
+          <td><input name=id size=20 value="$form->{id}" $readonly></td>
+          <td align=left>
+          <table>
+              <tr>
+                <th align=right width=50%>| . $locale->text('Buchungsdatum') . qq|</th>
+                <td align=left><input name=gldate size=11 title="$myconfig{dateformat}" value=$form->{gldate} $readonly onBlur=\"check_right_date_format(this)\"></td>
+              </tr>
+            </table>
+          </td>
+        </tr>|;
   }
-  print qq|	
-	$department|;
+  print qq|
+        $department|;
   if ($form->{id}) {
     print qq|
-	<tr>
-	  <th align=right width=1%>| . $locale->text('Description') . qq|</th>
-	  <td width=1%>$description</td>
+        <tr>
+          <th align=right width=1%>| . $locale->text('Description') . qq|</th>
+          <td width=1%>$description</td>
           <td>
-	    <table>
-	      <tr>
-		<th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
-		<td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
-	      </tr>
-	    </table>
-	 </td>
-	  <td align=left>
-	    <table width=100%>
-	      <tr>
-		<th align=right width=50%>| . $locale->text('Mitarbeiter') . qq|</th>
-		<td align=left><input name=employee size=20  value="| . H($form->{employee}) . qq|" readonly></td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>|;
+            <table>
+              <tr>
+                <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
+                <td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
+              </tr>
+            </table>
+         </td>
+          <td align=left>
+            <table width=100%>
+              <tr>
+                <th align=right width=50%>| . $locale->text('Mitarbeiter') . qq|</th>
+                <td align=left><input name=employee size=20  value="| . H($form->{employee}) . qq|" readonly></td>
+              </tr>
+            </table>
+          </td>
+        </tr>|;
   } else {
     print qq|
-	<tr>
-	  <th align=left width=1%>| . $locale->text('Description') . qq|</th>
-	  <td width=1%>$description</td>
-	  <td>
-	    <table>
-	      <tr>
-		<th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
-		<td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
-	      </tr>
-	    </table>
-	 </td>
-	</tr>|;
+        <tr>
+          <th align=left width=1%>| . $locale->text('Description') . qq|</th>
+          <td width=1%>$description</td>
+          <td>
+            <table>
+              <tr>
+                <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
+                <td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
+              </tr>
+            </table>
+         </td>
+        </tr>|;
   }
+
+  print qq|
+      <tr>
+      <tr><td colspan=4><table><tr>
+       <td>
+        | . $locale->text('OB Transaction') . qq|<input type="checkbox" name="ob_transaction" value="1" $ob_transaction_checked>
+       </td>
+       <td>
+        | . $locale->text('CB Transaction') . qq|<input type="checkbox" name="cb_transaction" value="1" $cb_transaction_checked>
+       </td>
+      </tr></table></td></tr>
+      <tr>
+       <td width="1%" align="right" nowrap>| . $locale->text('Show details') . qq|</td>
+       <td width="1%"><input type="checkbox" onclick="show_form_details();" name="show_details" value="1" $show_details_checked></td>
+      </tr>|;
+
   print qq|
       <tr>
       <td colspan=4>
           <table width=100%>
-	   <tr class=listheading>
-	  <th class=listheading style="width:15%">|
+           <tr class=listheading>
+          <th class=listheading style="width:15%">|
     . $locale->text('Account') . qq|</th>
-	  <th class=listheading style="width:10%">|
+          <th class=listheading style="width:10%">| . $locale->text('Chart balance') . qq|</th>
+          <th class=listheading style="width:10%">|
     . $locale->text('Debit') . qq|</th>
-	  <th class=listheading style="width:10%">|
+          <th class=listheading style="width:10%">|
     . $locale->text('Credit') . qq|</th>
           <th class=listheading style="width:10%">|
     . $locale->text('Tax') . qq|</th>
           <th class=listheading style="width:5%">|
-    . $locale->text('Korrektur') . qq|</th>
-          <th class=listheading style="width:10%">|
-    . $locale->text('Taxkey') . qq|</th>
-	  <th class=listheading style="width:20%">|
-    . $locale->text('Source') . qq|</th>
-	  <th class=listheading style="width:20%">| . $locale->text('Memo') . qq|</th>
-	  <th class=listheading style="width:20%">|
-    . $locale->text('Project Number') . qq|</th>
-	</tr>
+    . $locale->text('Taxkey') . qq|</th>|;
+
+  if ($form->{show_details}) {
+    print qq|
+          <th class=listheading style="width:20%">| . $locale->text('Source') . qq|</th>
+          <th class=listheading style="width:20%">| . $locale->text('Memo') . qq|</th>
+          <th class=listheading style="width:20%">| . $locale->text('Project Number') . qq|</th>
+|;
+  }
+
+  print qq|
+        </tr>
 
 $jsscript
 |;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
 sub form_footer {
-  $lxdebug->enter_sub();
-  ($dec) = ($form->{totaldebit} =~ /\.(\d+)/);
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+  my $cgi      = $main::cgi;
+
+  my $follow_ups_block;
+  if ($form->{id}) {
+    my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
+
+    if (@{ $follow_ups} ) {
+      my $num_due       = sum map { $_->{due} * 1 } @{ $follow_ups };
+      $follow_ups_block = qq|<p>| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|</p>|;
+    }
+  }
+
+  my ($dec) = ($form->{totaldebit} =~ /\.(\d+)/);
   $dec = length $dec;
-  $decimalplaces = ($dec > 2) ? $dec : 2;
-  $radieren = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
+  my $decimalplaces = ($dec > 2) ? $dec : 2;
+  my $radieren = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
 
   map {
-    $form->{$_} =
-      $form->format_amount(\%myconfig, $form->{$_}, 2, "&nbsp;")
+    $form->{$_} = $form->format_amount(\%myconfig, $form->{$_}, 2, "&nbsp;")
   } qw(totaldebit totalcredit);
 
   print qq|
     <tr class=listtotal>
-    <td></td>
-    <th align=right class=listtotal> $form->{totaldebit}</th>
-    <th align=right class=listtotal> $form->{totalcredit}</th> 
+    <th colspan="3" align=right class=listtotal> $form->{totaldebit}</th>
+    <th align=right class=listtotal> $form->{totalcredit}</th>
     <td colspan=6></td>
     </tr>
   </table>
@@ -1453,44 +1317,50 @@ sub form_footer {
   </tr>
 </table>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <input name=callback type=hidden value="$form->{callback}">
 
+$follow_ups_block
+
 <br>
 |;
 
-  $transdate = $form->datetonum($form->{transdate}, \%myconfig);
-  $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
+  my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+  my $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
 
   if ($form->{id}) {
 
-    print qq|<input class=submit type=submit name=action value="|
-      . $locale->text('Storno') . qq|">|;
+    if (!$form->{storno}) {
+      print qq|<input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|">|;
+    }
 
     # Löschen und Ändern von Buchungen nicht mehr möglich (GoB) nur am selben Tag möglich
-
     if (!$form->{locked} && $radieren) {
       print qq|
-		<input class=submit type=submit name=action value="|
-        . $locale->text('Post') . qq|" accesskey="b">
-		<input class=submit type=submit name=action value="|
-        . $locale->text('Delete') . qq|">|;
+        <input class=submit type=submit name=action value="| . $locale->text('Post') . qq|" accesskey="b">
+        <input class=submit type=submit name=action value="| . $locale->text('Delete') . qq|">|;
     }
 
-    # 	if ($transdate > $closedto) {
-    # 		print qq|
-    # 		<input class=submit type=submit name=action value="|.$locale->text('Post as new').qq|">|;
-    # 	}
+    print qq|
+        <input class=submit type=submit name=action id=update_button value="| . $locale->text('Update') . qq|">
+        <input type="button" class="submit" onclick="follow_up_window()" value="|
+      . $locale->text('Follow-Up')
+      . qq|"> |;
+
   } else {
-    if ($transdate > $closedto) {
-      print qq|<input class=submit type=submit name=action value="|
-        . $locale->text('Update') . qq|">
-     		 <input class=submit type=submit name=action value="|
-        . $locale->text('Post') . qq|">|;
+    if ($form->{draft_id}) {
+      my $remove_draft_checked = 'checked' if ($form->{remove_draft});
+      print qq|<p>\n|
+        . qq|  <input name="remove_draft" id="remove_draft" type="checkbox" class="checkbox" ${remove_draft_checked}>|
+        . qq|  <label for="remove_draft">| . $locale->text('Remove Draft') . qq|</label>\n|
+        . qq|</p>\n|;
     }
+
+    print qq|
+        <input class=submit type=submit name=action id=update_button value="| . $locale->text('Update') . qq|">
+        <input class=submit type=submit name=action value="| . $locale->text('Post') . qq|"> |
+        . NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit'))
+        . $cgi->hidden('-name' => 'draft_id',          '-default' => [$form->{draft_id}])
+        . $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]);
   }
 
   print "
@@ -1499,26 +1369,30 @@ sub form_footer {
 </body>
 </html>
 ";
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
 sub delete {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
   $form->header;
 
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
+<form method=post action=gl.pl>
 |;
 
   map { $form->{$_} =~ s/\"/&quot;/g } qw(reference description);
 
   delete $form->{header};
 
-  foreach $key (keys %$form) {
+  foreach my $key (keys %$form) {
+    next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
     print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
   }
 
@@ -1533,36 +1407,46 @@ sub delete {
     . $locale->text('Yes') . qq|">
 </form>
 |;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
 sub yes {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
   if (GL->delete_transaction(\%myconfig, \%$form)){
     # saving the history
       if(!exists $form->{addition} && $form->{id} ne "") {
-  	    $form->{addition} = "DELETED";
-  	    $form->save_history($form->dbconnect(\%myconfig));
+        $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+        $form->{addition} = "DELETED";
+        $form->save_history($form->dbconnect(\%myconfig));
       }
-    # /saving the history 
+    # /saving the history
     $form->redirect($locale->text('Transaction deleted!'))
   }
   $form->error($locale->text('Cannot delete transaction!'));
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
-sub post {
-  $lxdebug->enter_sub();
+sub post_transaction {
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   # check if there is something in reference and date
   $form->isblank("reference",   $locale->text('Reference missing!'));
   $form->isblank("transdate",   $locale->text('Transaction Date missing!'));
   $form->isblank("description", $locale->text('Description missing!'));
 
-  $transdate = $form->datetonum($form->{transdate}, \%myconfig);
-  $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
+  my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+  my $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
 
   my @a           = ();
   my $count       = 0;
@@ -1570,162 +1454,121 @@ sub post {
   my $credittax   = 0;
   my $debitcount  = 0;
   my $creditcount = 0;
-  $creditlock = 0;
-  $debitlock  = 0;
+  my $debitcredit;
 
-  my @flds =
-    qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
-  if ($form->{storno}) {
-    for my $i (1 .. $form->{rowcount}) {
-      unless (($form->{"debit_$i"} eq "") && ($form->{"credit_$i"} eq "")) {
-        if ($form->{"debit_$i"} ne "") {
-          $form->{"credit_$i"} = $form->{"debit_$i"};
-          $form->{"debit_$i"}  = "";
-        } elsif ($form->{"credit_$i"} ne "") {
-          $form->{"debit_$i"}  = $form->{"credit_$i"};
-          $form->{"credit_$i"} = "";
-        }
-      }
-    }
-  }
+  my @flds = qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
 
   for my $i (1 .. $form->{rowcount}) {
+    next if $form->{"debit_$i"} eq "" && $form->{"credit_$i"} eq "";
 
-    unless (($form->{"debit_$i"} eq "") && ($form->{"credit_$i"} eq "")) {
-      for (qw(debit credit tax)) {
-        $form->{"${_}_$i"} =
-          $form->parse_amount(\%myconfig, $form->{"${_}_$i"});
-      }
+    for (qw(debit credit tax)) {
+      $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"});
+    }
 
-      push @a, {};
-      $debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";
+    push @a, {};
+    $debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";
 
+    if ($debitcredit) {
+      $debitcount++;
+    } else {
+      $creditcount++;
+    }
+
+    if (($debitcount >= 2) && ($creditcount == 2)) {
+      $form->{"credit_$i"} = 0;
+      $form->{"tax_$i"}    = 0;
+      $creditcount--;
+      $creditlock = 1;
+    }
+    if (($creditcount >= 2) && ($debitcount == 2)) {
+      $form->{"debit_$i"} = 0;
+      $form->{"tax_$i"}   = 0;
+      $debitcount--;
+      $debitlock = 1;
+    }
+    if (($creditcount == 1) && ($debitcount == 2)) {
+      $creditlock = 1;
+    }
+    if (($creditcount == 2) && ($debitcount == 1)) {
+      $debitlock = 1;
+    }
+    if ($debitcredit && $credittax) {
+      $form->{"taxchart_$i"} = "0--0.00";
+    }
+    if (!$debitcredit && $debittax) {
+      $form->{"taxchart_$i"} = "0--0.00";
+    }
+    my $amount = ($form->{"debit_$i"} == 0)
+            ? $form->{"credit_$i"}
+            : $form->{"debit_$i"};
+    my $j = $#a;
+    if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
+      $form->{"taxchart_$i"} = "0--0.00";
+      $form->{"tax_$i"}      = 0;
+    }
+    my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+    if ($taxkey > 1) {
       if ($debitcredit) {
-        $debitcount++;
+        $debittax = 1;
       } else {
-        $creditcount++;
-      }
-
-      if (($debitcount >= 2) && ($creditcount == 2)) {
-        $form->{"credit_$i"} = 0;
-        $form->{"tax_$i"}    = 0;
-        $creditcount--;
-        $creditlock = 1;
-      }
-      if (($creditcount >= 2) && ($debitcount == 2)) {
-        $form->{"debit_$i"} = 0;
-        $form->{"tax_$i"}   = 0;
-        $debitcount--;
-        $debitlock = 1;
-      }
-      if (($creditcount == 1) && ($debitcount == 2)) {
-        $creditlock = 1;
-      }
-      if (($creditcount == 2) && ($debitcount == 1)) {
-        $debitlock = 1;
-      }
-      if ($debitcredit && $credittax) {
-        $form->{"taxchart_$i"} = "0--0.00";
-      }
-      if (!$debitcredit && $debittax) {
-        $form->{"taxchart_$i"} = "0--0.00";
-      }
-      $amount =
-        ($form->{"debit_$i"} == 0)
-        ? $form->{"credit_$i"}
-        : $form->{"debit_$i"};
-      $j = $#a;
-      if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
-        $form->{"taxchart_$i"} = "0--0.00";
-        $form->{"tax_$i"}      = 0;
+        $credittax = 1;
       }
-      if (!$form->{"korrektur_$i"}) {
-        ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
-        if ($taxkey > 1) {
-          if ($debitcredit) {
-            $debittax = 1;
-          } else {
-            $credittax = 1;
-          }
-          if ($form->{taxincluded}) {
-            $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
-            if ($debitcredit) {
-              $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
-            } else {
-              $form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
-            }
-          } else {
-            $form->{"tax_$i"} = $amount * $rate;
-          }
-        } else {
-          $form->{"tax_$i"} = 0;
-        }
-      } elsif ($form->{taxincluded}) {
+      if ($form->{taxincluded}) {
+        $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
         if ($debitcredit) {
           $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
         } else {
           $form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
         }
+      } else {
+        $form->{"tax_$i"} = $amount * $rate;
       }
-
-      for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
-      $count++;
+    } else {
+      $form->{"tax_$i"} = 0;
     }
+
+    for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
+    $count++;
   }
 
-  for $i (1 .. $count) {
-    $j = $i - 1;
+  for my $i (1 .. $count) {
+    my $j = $i - 1;
     for (@flds) { $form->{"${_}_$i"} = $a[$j]->{$_} }
   }
 
-  for $i ($count + 1 .. $form->{rowcount}) {
+  for my $i ($count + 1 .. $form->{rowcount}) {
     for (@flds) { delete $form->{"${_}_$i"} }
   }
 
-  for $i (1 .. $form->{rowcount}) {
-    $dr  = $form->{"debit_$i"};
-    $cr  = $form->{"credit_$i"};
+  my ($debit, $credit, $taxtotal);
+  for my $i (1 .. $form->{rowcount}) {
+    my $dr  = $form->{"debit_$i"};
+    my $cr  = $form->{"credit_$i"};
     $tax = $form->{"tax_$i"};
     if ($dr && $cr) {
-      $form->error(
-        $locale->text(
-          'Cannot post transaction with a debit and credit entry for the same account!'
-        ));
+      $form->error($locale->text('Cannot post transaction with a debit and credit entry for the same account!'));
     }
-    if ($form->{taxincluded}) {
-      if ($dr) {
-        $debit += $dr + $tax;
-      }
-      if ($cr) {
-        $credit += $cr + $tax;
-      }
-      $taxtotal += $tax;
-    } else {
-      if ($dr) {
-        $debit += $dr + $tax;
-      }
-      if ($cr) {
-        $credit += $cr + $tax;
-      }
-    }
-  }
-  if (!$taxtotal) {
-    $form->{taxincluded} = 0;
+    $debit    += $dr + $tax if $dr;
+    $credit   += $cr + $tax if $cr;
+    $taxtotal += $tax if $form->{taxincluded}
   }
 
+  $form->{taxincluded} = 0 if !$taxtotal;
+
   # this is just for the wise guys
   $form->error($locale->text('Cannot post transaction for a closed period!'))
-    if ($transdate <= $closedto);
+    if ($form->date_closed($form->{"transdate"}, \%myconfig));
   if ($form->round_amount($debit, 2) != $form->round_amount($credit, 2)) {
     $form->error($locale->text('Out of balance transaction!'));
   }
-  
+
   if ($form->round_amount($debit, 2) + $form->round_amount($credit, 2) == 0) {
     $form->error($locale->text('Empty transaction!'));
   }
-  
-  if (($errno = GL->post_transaction(\%myconfig, \%$form)) <= -1) {
+
+  if ((my $errno = GL->post_transaction(\%myconfig, \%$form)) <= -1) {
     $errno *= -1;
+    my @err;
     $err[1] = $locale->text('Cannot have a value in both Debit and Credit!');
     $err[2] = $locale->text('Debit and credit out of balance!');
     $err[3] = $locale->text('Cannot post a transaction without a value!');
@@ -1735,38 +1578,82 @@ sub post {
   undef($form->{callback});
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
-  	$form->{addition} = "SAVED";
-  	$form->{what_done} = $locale->text("Buchungsnummer") . " = " . $form->{id}; 
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+    $form->{addition} = "SAVED";
+    $form->{what_done} = $locale->text("Buchungsnummer") . " = " . $form->{id};
+    $form->save_history($form->dbconnect(\%myconfig));
   }
-  # /saving the history 
-  $form->redirect("Buchung gespeichert. Buchungsnummer = " . $form->{id});
-  $lxdebug->leave_sub();
+  # /saving the history
+
+  $main::lxdebug->leave_sub();
+}
+
+sub post {
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  $form->{title}  = $locale->text("$form->{title} General Ledger Transaction");
+  $form->{storno} = 0;
+
+  post_transaction();
+
+  remove_draft() if $form->{remove_draft};
+
+  $form->{callback} = build_std_url("action=add", "show_details");
+  $form->redirect($form->{callback});
 
+  $main::lxdebug->leave_sub();
 }
 
 sub post_as_new {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
 
   $form->{id} = 0;
   &add;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
 sub storno {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  # don't cancel cancelled transactions
+  if (IS->has_storno(\%myconfig, $form, 'gl')) {
+    $form->{title} = $locale->text("Cancel Accounts Receivables Transaction");
+    $form->error($locale->text("Transaction has already been cancelled!"));
+  }
+
+  GL->storno($form, \%myconfig, $form->{id});
 
-  $form->{id}     = 0;
-  $form->{storno} = 1;
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
-  	$form->{addition} = "STORNO";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{snumbers} = "ordnumber_$form->{ordnumber}";
+    $form->{addition} = "STORNO";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
-  # /saving the history 
-  &post;
-  $lxdebug->leave_sub();
+  # /saving the history
+
+  $form->redirect(sprintf $locale->text("Transaction %d cancelled."), $form->{storno_id});
 
+  $main::lxdebug->leave_sub();
 }
 
+sub continue {
+  call_sub($main::form->{nextsub});
+}
+
+1;