X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=15b49d2e1968df40ac66fbeb1ea4eaae8a032dfa;hb=bb5ee43d0ddff8f8b57ce0f15a5664b26c110d1f;hp=4417615e1b25a1d8e33e2fd718ed02e572918725;hpb=c7f9bb36eb122b2d79f5aa8c4d080279705ddc7e;p=kivitendo-erp.git

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 4417615e1..15b49d2e1 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -31,15 +31,21 @@
 #
 #======================================================================
 
+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/reportgenerator.pl";
 
 1;
-# end of main
 
+# end of main
 
 # this is for our long dates
 # $locale->text('January')
@@ -69,151 +75,220 @@ require "$form->{path}/arap.pl";
 # $locale->text('Nov')
 # $locale->text('Dec')
 
-
 sub add {
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
 
   $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
   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} };
-  
-  $form->{chart} = $chart;
-  $form->{chartinit} = $chart;
-  $form->{rowcount} = 2;
-
-  $form->{debitchart} = $chart;
-  $form->{creditchart} = $chart;
-  $form->{taxchart} = $tax;
-  
-  $form->{debit} = 0;
+  map {
+    $tax .=
+      qq|<option value="$_->{id}--$_->{rate}">$_->{taxdescription}  |
+      . ($_->{rate} * 100) . qq| %|
+  } @{ $form->{TAX} };
+
+  $form->{rowcount}  = 2;
+
+  $form->{debit}  = 0;
   $form->{credit} = 0;
-  $form->{tax} = 0;
-  
+  $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} });
   }
- 
+
+  $form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
+
   &display_form(1);
-  
+  $lxdebug->leave_sub();
+
 }
 
+sub prepare_transaction {
+  $lxdebug->enter_sub();
 
-sub edit {
+  $auth->assert('general_ledger');
 
   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} };
-  
-  $form->{chart} = $chart;
+  map {
+    $tax .=
+      qq|<option value="$_->{id}--$_->{rate}">$_->{taxdescription}  |
+      . ($_->{rate} * 100) . qq| %|
+  } @{ $form->{TAX} };
+
+  $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
 
-  $form->{taxchart} = $tax;
-  
-  if ($form->{tax} < 0) {
-    $form->{tax} = $form->{tax} * (-1);
-  }
-  
-  $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} });
   }
 
-   $i = 1;
+  my $i        = 1;
+  my $tax      = 0;
+  my $taxaccno = "";
   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;
+    $j = $i - 1;
+    if ($tax && ($ref->{accno} eq $taxaccno)) {
+      $form->{"tax_$j"}      = abs($ref->{amount});
+      $form->{"taxchart_$j"} = $ref->{id} . "--" . $ref->{taxrate};
+      if ($form->{taxincluded}) {
+        if ($ref->{amount} < 0) {
+          $form->{"debit_$j"} += $form->{"tax_$j"};
+        } else {
+          $form->{"credit_$j"} += $form->{"tax_$j"};
+        }
+      }
+      $form->{"project_id_$j"} = $ref->{project_id};
+
     } else {
-      $form->{totalcredit} += $ref->{amount};
-      $form->{"credit_$i"} = $ref->{amount};
+      $form->{"accno_$i"} = "$ref->{accno}--$ref->{tax_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->{"taxchart_$i"} = "0--0.00";
+      $form->{"project_id_$i"} = $ref->{project_id};
+      $i++;
+    }
+    if ($ref->{taxaccno} && !$tax) {
+      $taxaccno = $ref->{taxaccno};
+      $tax      = 1;
+    } else {
+      $taxaccno = "";
+      $tax      = 0;
     }
-
-    $i++;
   }
 
   $form->{rowcount} = $i;
-  $form->{locked} = ($form->datetonum($form->{transdate}, \%myconfig) <= $form->datetonum($form->{closedto}, \%myconfig));
+  $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 edit {
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
+
+  prepare_transaction();
+
+  $form->{title} = "Edit";
+
+  $form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
+
+  form_header();
+  display_rows();
+  form_footer();
+
+  $lxdebug->leave_sub();
+}
 
 
 sub search {
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
+
+  $form->{title} = $locale->text('Journal');
 
-  $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};
-  
+
+  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+                                   "all" => 1 });
+
+  my %project_labels = ();
+  my @project_values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@project_values, $item->{"id"});
+    $project_labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+
+  my $projectnumber =
+    NTI($cgi->popup_menu('-name' => "project_id",
+                         '-values' => \@project_values,
+                         '-labels' => \%project_labels));
+
   # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
+  $form->{jsscript} = 1;
   $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>  
+       <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>
        |;
-     $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>
+    $button2 = qq|
+       <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>
      |;
-     #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;
+    #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}" onBlur=\"check_right_date_format(this)\"></td>|;
+    $button2 =
+      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>
 
@@ -226,69 +301,77 @@ sub search {
     <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('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>
           $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=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|
+		  <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|
 		</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 align=right><input name="l_gifi_accno" class=checkbox type=checkbox value=Y></td>
-		    <td>|.$locale->text('GIFI').qq|</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>| . $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>
@@ -306,489 +389,351 @@ $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|">
+<input class=submit type=submit name=action value="|
+    . $locale->text('Continue') . qq|">
 </form>
 
 </body>
 </html>
 |;
+  $lxdebug->leave_sub();
 }
 
+sub create_subtotal_row {
+  $lxdebug->enter_sub();
+
+  my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
+
+  my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
+
+  map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
+
+  map { $totals->{$_} = 0 } @{ $subtotal_columns };
+
+  $lxdebug->leave_sub();
+
+  return $row;
+}
 
 sub generate_report {
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
 
-  $form->{sort} = "transdate" unless $form->{sort};
+  report_generator_set_default_sort('transdate', 1);
 
   GL->all_transactions(\%myconfig, \%$form);
-  
-  $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'),
-	     );
-  
-  $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}});
-  }
-  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->{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}";
-  }
-  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}";
+
+  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'),);
+
+  $form->{title} = $locale->text('Journal');
+  if ($form->{category} ne 'X') {
+    $form->{title} .= " : " . $locale->text($acctype{ $form->{category} });
   }
+
+  $form->{landscape} = 1;
+
+  my $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;
+
+  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
+  );
+
+  my @hidden_variables = qw(accno source reference department description notes project_id datefrom dateto category l_subtotal);
+  push @hidden_variables, map { "l_${_}" } @columns;
+
+  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});
+
+  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);
+
   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";
+    my ($department) = split /--/, $form->{department};
+    push @options, $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}";
-  }
-  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->{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);
+
+  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'), },
+  );
+
+  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";
   }
 
+  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};
 
-  @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_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 %column_alignment;
+  map { $column_alignment{$_}     = 'right'  } qw(balance id debit credit debit_tax credit_tax);
+  map { $column_alignment{$_}     = 'center' } qw(transdate reference description source notes debit_accno credit_accno debit_tax_accno credit_tax_accno);
+  map { $column_defs{$_}->{align} = $column_alignment{$_} } keys %column_alignment;
 
-  if ($form->{l_subtotal} eq 'Y') {
-    $callback .= "&l_subtotal=Y";
-    $href .= "&l_subtotal=Y";
-  }
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-  $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>";
-  
-  $form->{landscape} = 1;
-  
-  $form->header;
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
 
-  print qq|
-<body>
+  $report->set_export_options('generate_report', @hidden_variables, qw(sort sortdir));
 
-<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>
-|;
+  $report->set_sort_indicator($form->{sort} eq 'accno' ? 'debit_accno' : $form->{sort}, $form->{sortdir});
 
-map { print "$column_header{$_}\n" } @column_index;
+  $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();
 
-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}};
-  }
-  
-  if (($form->{accno} || $form->{gifi_accno}) && $form->{balance}) {
+  $form->{callback} = "$callback&sort=" . E($form->{sort}) . "&sortdir=" . E($form->{sortdir});
+
+
+  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;
 
-    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;
-    
-    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;
-      }
-    }
-    foreach $key (sort keys (%{$ref->{amount}})) {
-      $form->{balance} += $ref->{amount}{$key};
-    }
-    
-    $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);
-      }
-    }
-    
-    $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);
-      }      
-    }
-    
-    $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);
-      }
-    }
-    
-    $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);
+    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);
       }
     }
-    
-    $debitaccno = "";
-    $debittaxkey = "";
-    $taxaccno = "";
-    foreach $key (sort keys (%{$ref->{debit_accno}})) {
-      if ($key == 0) {
-        $debitaccno = "<a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{debit_accno}{$key}</a>";
-      } else {
-        $debitaccno .= "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{debit_accno}{$key}</a>";
-      }
-      if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
-        $ref->{debit_tax_accno}{$key} = $taxaccno;
-      }      
-      $taxaccno = $ref->{debit_tax_accno}{$key};
-      $debittaxkey = $ref->{debit_taxkey}{$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} }) ];
     }
-    
-    $creditaccno = "";
-    $credittaxkey = "";
-    $taxaccno = "";
-    foreach $key (sort keys (%{$ref->{credit_accno}})) {
-      if ($key == 0) {
-        $creditaccno = "<a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_accno}{$key}</a>";
-      } else {
-        $creditaccno .= "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_accno}{$key}</a>";
-      }
-      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->{accno}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
-      } else {
-        $debittaxaccno .= "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
-      }
+
+    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;
     }
-    
-    $credittaxaccno = "";
-    foreach $key (sort keys (%{$ref->{credit_tax_accno}})) {
-      if ($key == 0) {
-        $credittaxaccno = "<a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
-      } else {
-        $credittaxaccno .= "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
-      }
-    }    
-#    $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>&nbsp;$ref->{transdate}&nbsp;</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{gifi_accno} = "<td><a href=$href&gifi_accno=$ref->{gifi_accno}&callback=$callback>$ref->{gifi_accno}</a>&nbsp;</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{gifi_accno} = "<td><a href=$href&gifi_accno=$ref->{gifi_accno}&callback=$callback>$ref->{gifi_accno}</a>&nbsp;</td>";
-    $column_data{balance} = "<td align=right>".$form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)."</td>";
-
-    $i++; $i %= 2;
-    print "
-        <tr class=listrow$i>";
-    map { print "$column_data{$_}\n" } @column_index;
-    print "</tr>";
-    
-  }
+    my $data = $form->format_amount(\%myconfig, ($form->{balance} * $ml), 2);
+    $data .= $sh;
 
+    $row->{balance}->{data}        = $data;
+    $row->{projectnumbers}->{data} = join ", ", sort { lc($a) cmp lc($b) } keys %{ $ref->{projectnumbers} };
 
-  &gl_subtotal if ($form->{l_subtotal} eq 'Y');
+    map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes);
 
+    map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno source);
 
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
-  
-  $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>";
-  
-  print qq|
-	<tr class=listtotal>
-|;
+    foreach my $col (qw(debit_accno credit_accno debit_tax_accno credit_tax_accno)) {
+      $row->{$col}->{link} = [ map { "${callback}&accno=" . E($_) } @{ $rows{$col} } ];
+    }
 
-  map { print "$column_data{$_}\n" } @column_index;
+    map { $row->{$_}->{data} = \@{ $rows{$_} } if ($ref->{"${_}_accno"} ne "") } qw(debit_tax credit_tax);
 
-  print qq|
-        </tr>
-        </tbody>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
+    $row->{reference}->{link} = build_std_url("script=$ref->{module}.pl", 'action=edit', 'id=' . E($ref->{id}), 'callback');
 
-<br>
+    my $row_set = [ $row ];
 
-<form method=post action=$form->{script}>
+    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');
+    }
 
-<input name=callback type=hidden value="$form->{callback}">
+    $report->add_data($row_set);
+
+    $idx++;
+  }
 
-<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};
 
+  my $row = create_subtotal_row(\%totals, \@columns, \%column_alignment, [ qw(debit credit debit_tax credit_tax) ], 'listtotal');
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
+  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;
 
-  print qq|
+  $row->{balance}->{data}        = $data;
 
-</form>
+  $report->add_data($row);
 
-</body>
-</html>
-|;
+  my $raw_bottom_info_text;
 
-}
+  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> ';
+  }
 
+  $raw_bottom_info_text .= $form->parse_html_template('gl/generate_report_bottom');
 
-sub gl_subtotal {
-      
-  $subtotaldebit = $form->format_amount(\%myconfig, $subtotaldebit, 2, "&nbsp;");
-  $subtotalcredit = $form->format_amount(\%myconfig, $subtotalcredit, 2, "&nbsp;");
-  
-  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>";
+  $report->set_options('raw_bottom_info_text' => $raw_bottom_info_text);
 
-  
-  print "<tr class=listsubtotal>";
-  map { print "$column_data{$_}\n" } @column_index;
-  print "</tr>";
+  $report->generate_with_headers();
 
-  $subtotaldebit = 0;
-  $subtotalcredit = 0;
+  $lxdebug->leave_sub();
+}
 
-  $sameitem = $ref->{$form->{sort}};
+sub update {
+  $lxdebug->enter_sub();
 
-}
+  $auth->assert('general_ledger');
 
+  $form->{oldtransdate} = $form->{transdate};
 
-sub update {
+  my @a           = ();
+  my $count       = 0;
+  my $debittax    = 0;
+  my $credittax   = 0;
+  my $debitcount  = 0;
+  my $creditcount = 0;
+  $debitlock  = 0;
+  $creditlock = 0;
 
-  if ($form->{transdate} ne $form->{oldtransdate}) {
-    if ($form->{selectprojectnumber}) {
-      $form->all_projects(\%myconfig, undef, $form->{transdate});
-      if (@{ $form->{all_project} }) {
-	$form->{selectprojectnumber} = "<option>\n";
-	for (@{ $form->{all_project} }) { $form->{selectprojectnumber} .= qq|<option value="$_->{projectnumber}--$_->{id}">$_->{projectnumber}\n| }
-	$form->{selectprojectnumber} = $form->escape($form->{selectprojectnumber},1);
-      }
-    }
-    $form->{oldtransdate} = $form->{transdate};
-  }
-  
-  my @a = ();
-  my $count = 0;
-  my $debittax = 0;
-  my $credittax = 0;
-  my @flds = qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
+  my @flds =
+    qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
 
   for my $i (1 .. $form->{rowcount}) {
 
     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";
-      $amount = ($form->{"debit_$i"} == 0) ? $form->{"credit_$i"} : $form->{"debit_$i"};
+      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";
+      }
+      $amount =
+        ($form->{"debit_$i"} == 0)
+        ? $form->{"credit_$i"}
+        : $form->{"debit_$i"};
       $j = $#a;
       if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
-        $form->{"taxchart_$i"} = "0--";
-        $form->{"tax_$i"} = 0;
+        $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;
-          }
+      ($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"} = 0;
+          $form->{"tax_$i"} = $amount * $rate;
         }
+      } else {
+        $form->{"tax_$i"} = 0;
       }
-      
+
       for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
       $count++;
     }
   }
 
-
   for $i (1 .. $count) {
     $j = $i - 1;
     for (@flds) { $form->{"${_}_$i"} = $a[$j]->{$_} }
@@ -801,152 +746,251 @@ sub update {
   $form->{rowcount} = $count + 1;
 
   &display_form;
-  
-}
+  $lxdebug->leave_sub();
 
+}
 
 sub display_form {
   my ($init) = @_;
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
 
   &form_header($init);
-#   for $i (1 .. $form->{rowcount}) {
-#     $form->{totaldebit} += $form->parse_amount(\%myconfig, $form->{"debit_$i"});
-#     $form->{totalcredit} += $form->parse_amount(\%myconfig, $form->{"credit_$i"});
-#  
-#     &form_row($i);
-#   }
+
+  #   for $i (1 .. $form->{rowcount}) {
+  #     $form->{totaldebit} += $form->parse_amount(\%myconfig, $form->{"debit_$i"});
+  #     $form->{totalcredit} += $form->parse_amount(\%myconfig, $form->{"credit_$i"});
+  #
+  #     &form_row($i);
+  #   }
   &display_rows($init);
   &form_footer;
+  $lxdebug->leave_sub();
 
 }
 
-
 sub display_rows {
   my ($init) = @_;
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
 
-  $form->{selectprojectnumber} = $form->unescape($form->{selectprojectnumber}) if $form->{selectprojectnumber};
-  
-  $form->{totaldebit} = 0;
+  $form->{debit_1}     = 0 if !$form->{"debit_1"};
+  $form->{totaldebit}  = 0;
   $form->{totalcredit} = 0;
-  my $chart= $form->{chart};
-  $chart = $form->unquote($chart);
-  $form->{taxchart} = $form->unquote($form->{taxchart});
-  $taxchart = $form->{taxchart};
+
+  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");
+
+  my %project_labels = ();
+  my @project_values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@project_values, $item->{"id"});
+    $project_labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+
+  my %chart_labels = ();
+  my @chart_values = ();
+  my %charts = ();
+  my $taxchart_init;
+  foreach my $item (@{ $form->{ALL_CHARTS} }) {
+    my $key = $item->{accno} . "--" . $item->{tax_id};
+    $taxchart_init = $item->{taxkey_id} unless (@chart_values);
+    push(@chart_values, $key);
+    $chart_labels{$key} = $item->{accno} . "--" . $item->{description};
+    $charts{$item->{accno}} = $item;
+  }
+
+  my %taxchart_labels = ();
+  my @taxchart_values = ();
+  my %taxcharts = ();
+  foreach my $item (@{ $form->{ALL_TAXCHARTS} }) {
+    my $key = $item->{id} . "--" . $item->{rate};
+    $taxchart_init = $key if ($taxchart_init eq $item->{taxkey});
+    push(@taxchart_values, $key);
+    $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"}" tabindex=|.($i+11+(($i-1)*8)).qq|></td>|;
-    $memo = qq|
-    <td><input name="memo_$i" value="$form->{"memo_$i"}" tabindex=|.($i+12+(($i-1)*8)).qq|></td>|;
+    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"});
+    my $item = $charts{$accno_row};
+    $selected_accno_full = "$item->{accno}--$item->{tax_id}";
+
+    my $selected_taxchart = $form->{"taxchart_$i"};
+    my ($selected_accno, $selected_tax_id) = split(/--/, $selected_accno_full);
+    my ($previous_accno, $previous_tax_id) = split(/--/, $form->{"previous_accno_$i"});
+
+    if ($previous_accno &&
+        ($previous_accno eq $selected_accno) &&
+        ($previous_tax_id ne $selected_tax_id)) {
+      my $item = $taxcharts{$selected_tax_id};
+      $selected_taxchart = "$item->{id}--$item->{rate}";
+    }
+
+    $selected_accno = '' if ($init);
+    $selected_taxchart = $taxchart_init unless ($selected_taxchart ne "");
+
+    $accno = qq|<td>| .
+      NTI($cgi->popup_menu('-name' => "accno_$i",
+                           '-id' => "accno_$i",
+                           '-onChange' => "setTaxkey(this, $i)",
+                           '-style' => 'width:200px',
+                           '-values' => \@chart_values,
+                           '-labels' => \%chart_labels,
+                           '-default' => $selected_accno_full))
+      . $cgi->hidden('-name' => "previous_accno_$i",
+                     '-default' => $selected_accno_full)
+      . qq|</td>|;
+    $tax = qq|<td>| .
+      NTI($cgi->popup_menu('-name' => "taxchart_$i",
+                           '-id' => "taxchart_$i",
+                           '-style' => 'width:200px',
+                           '-values' => \@taxchart_values,
+                           '-labels' => \%taxchart_labels,
+                           '-default' => $selected_taxchart))
+      . qq|</td>|;
 
     if ($init) {
-      $accno = qq|
-      <td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:300px" tabindex=|.($i+5+(($i-1)*8)).qq|>$form->{chartinit}</select></td>|;
-      $tax = qq|<td><select id="taxchart_$i" name="taxchart_$i" tabindex=|.($i+10+(($i-1)*8)).qq|>$form->{taxchart}</select></td>|;
-      if ($form->{selectprojectnumber}) {
-	$project = qq|
-    <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
-      }
-      $korrektur = qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|.($i+9+(($i-1)*8)).qq|></td>|;
       if ($form->{transfer}) {
-	$fx_transaction = qq|
+        $fx_transaction = qq|
         <td><input name="fx_transaction_$i" class=checkbox type=checkbox value=1></td>
     |;
-	}
+      }
 
     } else {
-   
-      $form->{totaldebit} += $form->{"debit_$i"};
-      $form->{totalcredit} += $form->{"credit_$i"};
+      if ($form->{"debit_$i"} != 0) {
+        $form->{totaldebit} += $form->{"debit_$i"};
+        if (!$form->{taxincluded}) {
+          $form->{totaldebit} += $form->{"tax_$i"};
+        }
+      } else {
+        $form->{totalcredit} += $form->{"credit_$i"};
+        if (!$form->{taxincluded}) {
+          $form->{totalcredit} += $form->{"tax_$i"};
+        }
+      }
 
-      for (qw(debit credit tax)) { $form->{"${_}_$i"} = ($form->{"${_}_$i"}) ? $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) : "" }
+      for (qw(debit credit tax)) {
+        $form->{"${_}_$i"} =
+          ($form->{"${_}_$i"})
+          ? $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2)
+          : "";
+      }
 
       if ($i < $form->{rowcount}) {
-	
-        $accno = $chart;
-        $chart_selected = $form->{"accno_$i"};
-        $accno  =~ s/value=\"$chart_selected\"/value=\"$chart_selected\" selected/;
-        $accno = qq|<td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:300px" tabindex=|.($i+5+(($i-1)*8)).qq|>$accno</select></td>|;
-        $tax = $taxchart;
-        $tax_selected = $form->{"taxchart_$i"};
-        $tax  =~ s/value=\"$tax_selected\"/value=\"$tax_selected\" selected/;
-        $tax = qq|<td><select id="taxchart_$i" name="taxchart_$i" tabindex=|.($i+10+(($i-1)*8)).qq|>$tax</select></td>|;
-	if ($form->{selectprojectnumber}) {
-	  $form->{"projectnumber_$i"} = "" if $form->{selectprojectnumber} !~ /$form->{"projectnumber_$i"}/;
-	  
-	  $project = $form->{"projectnumber_$i"};
-	  $project =~ s/--.*//;
-	  $project = qq|<td>$project</td>|;
-	}
-      
-	if ($form->{transfer}) {
-	  $checked = ($form->{"fx_transaction_$i"}) ? "1" : "";
-	  $x = ($checked) ? "x" : "";
-	  $fx_transaction = qq|
+        if ($form->{transfer}) {
+          $checked = ($form->{"fx_transaction_$i"}) ? "1" : "";
+          $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 tabindex=|.($i+9+(($i-1)*8)).qq|></td>|;
-	$form->hide_form("accno_$i", "projectnumber_$i");
-	
+        }
+        $form->hide_form("accno_$i");
+
       } else {
-	
-	$accno = qq|
-      <td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:300px" tabindex=|.($i+5+(($i-1)*8)).qq|>$chart</select></td>|;
-	$tax = qq|
-      <td><select id="taxchart_$i" name="taxchart_$i" tabindex=|.($i+10+(($i-1)*8)).qq|>$taxchart</select></td>|;
-	if ($form->{selectprojectnumber}) {
-	  $project = qq|
-      <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
-	}
-        $korrektur = qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|.($i+9+(($i-1)*8)).qq|></td>|;
-	if ($form->{transfer}) {
-	  $fx_transaction = qq|
+        if ($form->{transfer}) {
+          $fx_transaction = qq|
       <td><input name="fx_transaction_$i" class=checkbox type=checkbox value=1></td>
     |;
-	}
+        }
+      }
+    }
+    my $debitreadonly  = "";
+    my $creditreadonly = "";
+    if ($i == $form->{rowcount}) {
+      if ($debitlock) {
+        $debitreadonly = "readonly";
+      } elsif ($creditlock) {
+        $creditreadonly = "readonly";
       }
     }
-    
+
+    my $projectnumber =
+      NTI($cgi->popup_menu('-name' => "project_id_$i",
+                           '-values' => \@project_values,
+                           '-labels' => \%project_labels,
+                           '-default' => $form->{"project_id_$i"} ));
+
+    my $copy2credit = 'onkeyup="copy_debit_to_credit()"' if $i == 1;
+
     print qq|<tr valign=top>
     $accno
     $fx_transaction
-    <td><input name="debit_$i" size=10 value="$form->{"debit_$i"}" accesskey=$i tabindex=|.($i+6+(($i-1)*8)).qq|></td>
-    <td><input name="credit_$i" size=10 value="$form->{"credit_$i"}" tabindex=|.($i+7+(($i-1)*8)).qq|></td>
-    <td><input name="tax_$i" size=8 value="$form->{"tax_$i"}" tabindex=|.($i+8+(($i-1)*8)).qq|></td>
-    $korrektur
-    $tax
+    <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 type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>
+    $tax|;
+
+    if ($form->{show_details}) {
+      print qq|
     $source
     $memo
-    $project
+    <td>$projectnumber</td>
+|;
+    }
+    print qq|
+    $source_hidden
+    $memo_hidden
   </tr>
-
-  |;
+|;
   }
 
   $form->hide_form(qw(rowcount selectaccno));
-  print qq|
-<input type=hidden name=selectprojectnumber value="|.$form->escape($form->{selectprojectnumber},1).qq|">|;
+
+  $lxdebug->leave_sub();
 
 }
 
 sub form_header {
   my ($init) = @_;
-  $title = $form->{title};
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
+
+  $title         = $form->{title};
   $form->{title} = $locale->text("$title General Ledger Transaction");
-  $readonly = ($form->{id}) ? "readonly" : "";
-  
- 
-# $locale->text('Add General Ledger Transaction')
-# $locale->text('Edit General Ledger Transaction')
+  $readonly      = ($form->{id}) ? "readonly" : "";
+
+  $show_details_checked = "checked" if $form->{show_details};
+
+  $ob_transaction_checked = "checked" if $form->{ob_transaction};
+  $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);
 
-  map { $form->{$_} =~ s/\"/&quot;/g } qw(reference description chart taxchart);
   $form->{javascript} = qq|<script type="text/javascript">
   <!--
   function setTaxkey(accno, row) {
     var taxkey = accno.options[accno.selectedIndex].value;
-    var reg = /--([0-9])*/;
+    var reg = /--([0-9]*)/;
     var found = reg.exec(taxkey);
     var index = found[1];
     index = parseInt(index);
@@ -959,30 +1003,37 @@ sub form_header {
       }
     }
   };
+
+  function copy_debit_to_credit() {
+    var txt = document.getElementsByName('debit_1')[0].value;
+    document.getElementsByName('credit_2')[0].value = txt;
+  };
+
   //-->
   </script>|;
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
 
   $form->{selectdepartment} =~ s/ selected//;
-  $form->{selectdepartment} =~ s/option>\Q$form->{department}\E/option selected>$form->{department}/;
+  $form->{selectdepartment} =~
+    s/option>\Q$form->{department}\E/option selected>$form->{department}/;
 
   if (($rows = $form->numtextrows($form->{description}, 50)) > 1) {
-    $description = qq|<textarea name=description rows=$rows cols=50 wrap=soft $readonly >$form->{description}</textarea>|;
+    $description =
+      qq|<textarea name=description rows=$rows cols=50 wrap=soft $readonly >$form->{description}</textarea>|;
   } else {
-    $description = qq|<input name=description size=50 value="$form->{description}" tabindex="3" $readonly>|;
+    $description =
+      qq|<input name=description size=50 value="$form->{description}" $readonly>|;
   }
-  
+
   $taxincluded = ($form->{taxincluded}) ? "checked" : "";
-  
+
   if ($init) {
-  	$taxincluded = "checked";
+    $taxincluded = "checked";
   }
-  
-  $amount = qq|<input name=amount size=20 value="$form->{amount}" tabindex="4" $readonly>|;
-  
-  
+
   $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>
 	  <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
 	</tr>
@@ -992,42 +1043,51 @@ sub form_header {
   } else {
     $form->{fokus} = qq|gl.accno_$form->{rowcount}|;
   }
-  
+
   # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
+  $form->{jsscript} = 1;
   $jsscript = "";
-  if ($form->{jsscript}) 
-  {
+  if ($form->{jsscript}) {
+
     # with JavaScript Calendar
     $button1 = qq|
-       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate} tabindex="2" $readonly>
-       <input type=button name=transdate id="trigger1" value=|.$locale->text('button').qq|></td>  
+       <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>
        |;
-   #write Trigger
-   $jsscript = Form->write_trigger(\%myconfig,"1","transdate","BL","trigger1","","","");
-   }
-   else
-   {
-      # without JavaScript Calendar
-      $button1 = qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate} tabindex="2" $readonly></td>|;
-    }
-    
+
+    #write Trigger
+    $jsscript =
+      Form->write_trigger(\%myconfig, "1", "transdate", "BL", "trigger1");
+  } else {
+
+    # without JavaScript Calendar
+    $button1 =
+      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} ||= "--";
+
   $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=taxchart value="$form->{taxchart}">
-<input type=hidden name=chart value="$form->{chart}">
 
+<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>
@@ -1037,247 +1097,356 @@ sub form_header {
   <tr>
     <td>
       <table width=100%>
+        <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}" tabindex="1" $readonly></td>
+	  <th align=right>| . $locale->text('Reference') . qq|</th>
+	  <td><input name=reference size=20 value="$form->{reference}" $readonly></td>
 	  <td align=left>
-	    <table width=100%>
+	    <table>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Date').qq|</th>
+		<th align=right nowrap>| . $locale->text('Date') . qq|</th>
                 $button1
 	      </tr>
 	    </table>
 	  </td>
 	</tr>|;
-if ($form->{id}) {
-	print qq|
+  if ($form->{id}) {
+    print qq|
 	<tr>
-	  <th align=right>|.$locale->text('Belegnummer').qq|</th>
+	  <th align=right>| . $locale->text('Belegnummer') . qq|</th>
 	  <td><input name=id size=20 value="$form->{id}" $readonly></td>
 	  <td align=left>
-	  <table width=100%>
+	  <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>
+		<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|	
+  }
+  print qq|
 	$department|;
-if ($form->{id}) {
-	print qq|
+  if ($form->{id}) {
+    print qq|
 	<tr>
-	  <th align=right>|.$locale->text('Description').qq|</th>
-	  <td>$description</td>
+	  <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=11  value=$form->{employee} $readonly></td>
+		<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=right>|.$locale->text('Description').qq|</th>
-	  <td colspan=2>$description</td>
 	</tr>|;
-	}
-	print qq|
+  } else {
+    print qq|
 	<tr>
-	  <th align=right>|.$locale->text('Betrag').qq|</th>
-	  <td>$amount</td>
-	  <td align=left>
+	  <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 tabindex="5" $taxincluded></td>
+		<th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
+		<td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
 	      </tr>
 	    </table>
 	 </td>
-      </tr>
+	</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%">|.$locale->text('Account').qq|</th>
-	  <th class=listheading style="width:10%">|.$locale->text('Debit').qq|</th>
-	  <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>
-	  $project
+	  <th class=listheading style="width:15%">|
+    . $locale->text('Account') . qq|</th>
+	  <th class=listheading style="width:10%">|
+    . $locale->text('Debit') . qq|</th>
+	  <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('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();
 
 }
 
-
 sub form_footer {
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
+
+  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>|;
+    }
+  }
+
   ($dec) = ($form->{totaldebit} =~ /\.(\d+)/);
   $dec = length $dec;
   $decimalplaces = ($dec > 2) ? $dec : 2;
-  $radieren = ($form->current_date(\%myconfig) eq $form->{gldate})? 1 : 0;
+  $radieren = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
+
+  map {
+    $form->{$_} = $form->format_amount(\%myconfig, $form->{$_}, 2, "&nbsp;")
+  } qw(totaldebit totalcredit);
 
-  map { $form->{$_} = $form->format_amount(\%myconfig, $form->{$_}, $decimalplaces, "&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>
+    <td colspan=6></td>
+    </tr>
   </table>
+  </td>
+  </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);
+  $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
 
   if ($form->{id}) {
-  
-  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|">|;
-	}
-
-	
-# 	if ($transdate > $closedto) {
-# 		print qq|
-# 		<input class=submit type=submit name=action value="|.$locale->text('Post as new').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->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
+
+    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|">|;
+    }
+
+    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 {
+      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|">|;
   }
-  
+
   print "
   </form>
 
 </body>
 </html>
 ";
-  
-}
+  $lxdebug->leave_sub();
 
+}
 
 sub delete {
+  $lxdebug->enter_sub();
 
   $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 chart);
+  map { $form->{$_} =~ s/\"/&quot;/g } qw(reference description);
 
   delete $form->{header};
 
   foreach $key (keys %$form) {
-    print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
+    next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
+    print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
   }
 
   print qq|
-<h2 class=confirm>|.$locale->text('Confirm!').qq|</h2>
+<h2 class=confirm>| . $locale->text('Confirm!') . qq|</h2>
 
-<h4>|.$locale->text('Are you sure you want to delete Transaction').qq| $form->{reference}</h4>
+<h4>|
+    . $locale->text('Are you sure you want to delete Transaction')
+    . qq| $form->{reference}</h4>
 
-<input name=action class=submit type=submit value="|.$locale->text('Yes').qq|">
+<input name=action class=submit type=submit value="|
+    . $locale->text('Yes') . qq|">
 </form>
 |;
+  $lxdebug->leave_sub();
 
 }
 
-
 sub yes {
-
-  $form->redirect($locale->text('Transaction deleted!')) if (GL->delete_transaction(\%myconfig, \%$form));
+  $lxdebug->enter_sub();
+  if (GL->delete_transaction(\%myconfig, \%$form)){
+    # saving the history
+      if(!exists $form->{addition} && $form->{id} ne "") {
+        $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+  	    $form->{addition} = "DELETED";
+  	    $form->save_history($form->dbconnect(\%myconfig));
+      }
+    # /saving the history
+    $form->redirect($locale->text('Transaction deleted!'))
+  }
   $form->error($locale->text('Cannot delete transaction!'));
-  
+  $lxdebug->leave_sub();
+
 }
 
+sub post_transaction {
+  $lxdebug->enter_sub();
 
-sub post {
   # 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("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);
 
+  $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+  $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
 
-  # check project
-  &check_project;
+  my @a           = ();
+  my $count       = 0;
+  my $debittax    = 0;
+  my $credittax   = 0;
+  my $debitcount  = 0;
+  my $creditcount = 0;
+  $creditlock = 0;
+  $debitlock  = 0;
 
-  my @a = ();
-  my $count = 0;
-  my $debittax = 0;
-  my $credittax = 0;
   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"}) }
-      
-      push @a, {};
-      $debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";
-      $amount = ($form->{"debit_$i"} == 0) ? $form->{"credit_$i"} : $form->{"debit_$i"};
-      $j = $#a;
-      if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
-        $form->{"taxchart_$i"} = "0--";
-        $form->{"tax_$i"} = 0;
+    for (qw(debit credit tax)) {
+      $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"});
+    }
+
+    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";
+    }
+    $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;
+    }
+    ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+    if ($taxkey > 1) {
+      if ($debitcredit) {
+        $debittax = 1;
+      } else {
+        $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;
-          } else {
-            $form->{"tax_$i"} = $amount * $rate;
-          }
+      if ($form->{taxincluded}) {
+        $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
+        if ($debitcredit) {
+          $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
         } else {
-          $form->{"tax_$i"} = 0;
+          $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;
@@ -1289,61 +1458,104 @@ sub post {
   }
 
   for $i (1 .. $form->{rowcount}) {
-    $dr = $form->{"debit_$i"};
-    $cr = $form->{"credit_$i"};
+    $dr  = $form->{"debit_$i"};
+    $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!'));
     }
-    if ($form->{taxincluded}) {
-      $debit += $dr;
-      $credit += $cr;
-      $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);
+  $form->error($locale->text('Cannot post transaction for a closed period!'))
+    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) {
     $errno *= -1;
     $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!');
-    
+
     $form->error($err[$errno]);
   }
   undef($form->{callback});
-  $form->redirect("Buchung gespeichert. Buchungsnummer = ".$form->{id});
-  
+  # saving the history
+  if(!exists $form->{addition} && $form->{id} ne "") {
+    $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
+
+  $lxdebug->leave_sub();
 }
 
+sub post {
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
+
+  $form->{title}  = $locale->text("$form->{title} General Ledger Transaction");
+  $form->{storno} = 0;
+
+  post_transaction();
+
+  $form->{callback} = build_std_url("action=add", "show_details");
+  $form->redirect($form->{callback});
+
+  $lxdebug->leave_sub();
+}
 
 sub post_as_new {
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
 
   $form->{id} = 0;
   &add;
+  $lxdebug->leave_sub();
 
 }
 
 sub storno {
+  $lxdebug->enter_sub();
 
-  $form->{id} = 0;
-  $form->{storno} =1;
-  &post;
+  $auth->assert('general_ledger');
 
-}
+  # 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});
 
+  # saving the history
+  if(!exists $form->{addition} && $form->{id} ne "") {
+    $form->{snumbers} = "ordnumber_$form->{ordnumber}";
+    $form->{addition} = "STORNO";
+    $form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
+
+  $form->redirect(sprintf $locale->text("Transaction %d cancelled."), $form->{storno_id});
+
+  $lxdebug->leave_sub();
+}
+
+sub continue {
+  call_sub($form->{nextsub});
+}