X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Far.pl;h=9fdf2bc8ca433a128cef1812eb8d95fa6b64d54c;hb=b2945bf61775161f9ce9be9bdbd106ad44247a14;hp=ba98a8e385ea7a2a4ef490b50be5956d8122b3b8;hpb=2e07a0cdb14d031d325b20f05e916105f385ac19;p=kivitendo-erp.git

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index ba98a8e38..9fdf2bc8c 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -31,18 +31,22 @@
 #
 #======================================================================
 
+use POSIX qw(strftime);
+use List::Util qw(sum first);
+
 use SL::AR;
+use SL::FU;
 use SL::IS;
 use SL::PE;
-use Data::Dumper;
+use SL::ReportGenerator;
 
 require "bin/mozilla/arap.pl";
 require "bin/mozilla/common.pl";
 require "bin/mozilla/drafts.pl";
+require "bin/mozilla/reportgenerator.pl";
 
-1;
-
-# end of main
+use strict;
+#use warnings;
 
 # this is for our long dates
 # $locale->text('January')
@@ -72,34 +76,44 @@ require "bin/mozilla/drafts.pl";
 # $locale->text('Nov')
 # $locale->text('Dec')
 
+my $totalpaid;
+
 sub add {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
 
-  return $lxdebug->leave_sub() if (load_draft_maybe());
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  return $main::lxdebug->leave_sub() if (load_draft_maybe());
 
   # saving the history
   if(!exists $form->{addition} && ($form->{id} ne "")) {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-  	$form->{addition} = "ADDED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "ADDED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
-  # /saving the history 
-  
+  # /saving the history
+
   $form->{title}    = "Add";
-  $form->{callback} =
-    "$form->{script}?action=add&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
+  $form->{callback} = "ar.pl?action=add" unless $form->{callback};
 
   AR->get_transdate(\%myconfig, $form);
   $form->{initial_transdate} = $form->{transdate};
   &create_links;
   $form->{transdate} = $form->{initial_transdate};
   &display_form;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub edit {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+
   # show history button
   $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
   #/show hhistory button
@@ -109,20 +123,31 @@ sub edit {
   &create_links;
   &display_form;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub display_form {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
 
   &form_header;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub create_links {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  my ($duedate, $taxincluded);
 
   $form->create_links("AR", \%myconfig, "customer");
   $duedate = $form->{duedate};
@@ -141,37 +166,35 @@ sub create_links {
   $form->{notes} = $form->{intnotes} unless $form->{notes};
 
   # currencies
-  @curr = split(/:/, $form->{currencies});
-  chomp $curr[0];
-  $form->{defaultcurrency} = $curr[0];
+  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 
-  map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
+  map { $form->{selectcurrency} .= "<option>$_\n" } $form->get_all_currencies(\%myconfig);
 
   # customers
-  if (@{ $form->{all_customer} }) {
+  if (@{ $form->{all_customer} || [] }) {
     $form->{customer} = "$form->{customer}--$form->{customer_id}";
     map { $form->{selectcustomer} .= "<option>$_->{name}--$_->{id}\n" }
       (@{ $form->{all_customer} });
   }
 
   # departments
-  if (@{ $form->{all_departments} }) {
+  if (@{ $form->{all_departments} || [] }) {
     $form->{selectdepartment} = "<option>\n";
     $form->{department}       = "$form->{department}--$form->{department_id}";
 
     map {
       $form->{selectdepartment} .=
         "<option>$_->{description}--$_->{id}\n"
-    } (@{ $form->{all_departments} });
+    } (@{ $form->{all_departments} || [] });
   }
 
   $form->{employee} = "$form->{employee}--$form->{employee_id}";
 
   # sales staff
-  if (@{ $form->{all_employees} }) {
+  if (@{ $form->{all_employees} || [] }) {
     $form->{selectemployee} = "";
     map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}\n" }
-      (@{ $form->{all_employees} });
+      (@{ $form->{all_employees} || [] });
   }
 
   # build the popup menus
@@ -183,11 +206,25 @@ sub create_links {
     ($form->datetonum($form->{transdate}, \%myconfig) <=
      $form->datetonum($form->{closedto}, \%myconfig));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub form_header {
-  $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;
+
+  my ($title, $readonly, $exchangerate, $rows);
+  my ($taxincluded, $notes, $department, $customer, $employee, $amount, $project);
+  my ($jsscript, $button1, $button2, $onload);
+  my ($selectAR_amount, $selectAR_paid, $ARselected, $tax);
+  my (@column_index, %column_data);
+
 
   $title = $form->{title};
   $form->{title} = $locale->text("$title Accounts Receivables Transaction");
@@ -226,16 +263,23 @@ sub form_header {
   $readonly = ($form->{radier}) ? "" : $readonly;
 
   # set option selected
-  foreach $item (qw(customer currency department employee)) {
+  foreach my $item (qw(customer currency department employee)) {
     $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~
       s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
   }
 
+  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'buy');
+  $form->{exchangerate} = $form->{forex} if $form->{forex};
+
   # format amounts
   $form->{exchangerate} =
     $form->format_amount(\%myconfig, $form->{exchangerate});
 
+  if ($form->{exchangerate} == 0) {
+    $form->{exchangerate} = "";
+  }
+
   $form->{creditlimit} =
     $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0");
   $form->{creditremaining} =
@@ -244,11 +288,11 @@ sub form_header {
   $exchangerate = qq|
 <input type=hidden name=forex value=$form->{forex}>
 |;
-  if ($form->{currency} ne $form->{defaultcurrency}) {
+  if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
     if ($form->{forex}) {
       $exchangerate .= qq|
-	<th align=right>| . $locale->text('Exchangerate') . qq|</th>
-	<td><input type=hidden name=exchangerate value=$form->{exchangerate}>$form->{exchangerate}</td>
+        <th align=right>| . $locale->text('Exchangerate') . qq|</th>
+        <td><input type=hidden name=exchangerate value=$form->{exchangerate}>$form->{exchangerate}</td>
 |;
     } else {
       $exchangerate .= qq|
@@ -259,10 +303,10 @@ sub form_header {
   }
 
   $taxincluded = qq|
-	      <tr>
-		<td align=right><input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}></td>
-		<th align=left nowrap>| . $locale->text('Tax Included') . qq|</th>
-	      </tr>
+              <tr>
+                <td align=right><input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}></td>
+                <th align=left nowrap>| . $locale->text('Tax Included') . qq|</th>
+              </tr>
 |;
 
   if (($rows = $form->numtextrows($form->{notes}, 50)) < 2) {
@@ -272,21 +316,18 @@ sub form_header {
     qq|<textarea name=notes rows=$rows cols=50 wrap=soft>$form->{notes}</textarea>|;
 
   $department = qq|
-	      <tr>
-		<th align="right" nowrap>| . $locale->text('Department') . qq|</th>
-		<td colspan=3><select name=department>$form->{selectdepartment}</select>
-		<input type=hidden name=selectdepartment value="$form->{selectdepartment}">
-		</td>
-	      </tr>
+              <tr>
+                <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
+                <td colspan=3><select name=department>$form->{selectdepartment}</select>
+                <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
+                </td>
+              </tr>
 | if $form->{selectdepartment};
 
-  $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
+  my $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
 
-  $customer =
-    ($form->{selectcustomer})
-    ? qq|<select name="customer"
-onchange="document.getElementById('update_button').click();">$form->{
-selectcustomer}</select>|
+  $customer = ($form->{selectcustomer})
+    ? qq|<select name="customer" onchange="document.getElementById('update_button').click();">$form->{selectcustomer}</select>|
     : qq|<input name=customer value="$form->{customer}" size=35>|;
 
   $employee = qq|
@@ -295,11 +336,11 @@ selectcustomer}</select>|
 
   if ($form->{selectemployee}) {
     $employee = qq|
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Salesperson') . qq|</th>
-		<td  colspan=2><select name=employee>$form->{selectemployee}</select></td>
-		<input type=hidden name=selectemployee value="$form->{selectemployee}">
-	      </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Salesperson') . qq|</th>
+                <td  colspan=2><select name=employee>$form->{selectemployee}</select></td>
+                <input type=hidden name=selectemployee value="$form->{selectemployee}">
+              </tr>
 |;
   }
 
@@ -307,12 +348,13 @@ selectcustomer}</select>|
   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");
+  $form->get_lists("projects"  => { "key"       => "ALL_PROJECTS",
+                                    "all"       => 0,
+                                    "old_id"    => \@old_project_ids },
+                   "charts"    => { "key"       => "ALL_CHARTS",
+                                    "transdate" => $form->{transdate} },
+                   "taxcharts" => { "key"       => "ALL_TAXCHARTS",
+                                    "module"    => "AR" },);
 
   map({ $_->{link_split} = [ split(/:/, $_->{link}) ]; }
       @{ $form->{ALL_CHARTS} });
@@ -395,9 +437,14 @@ selectcustomer}</select>|
       qq|<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\"></td>|;
   }
 
+  my $follow_up_vc         =  $form->{customer};
+  $follow_up_vc            =~ s/--.*?//;
+  my $follow_up_trans_info =  "$form->{invnumber} ($follow_up_vc)";
+
   $form->{javascript} .=
     qq|<script type="text/javascript" src="js/common.js"></script>| .
-    qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
+    qq|<script type="text/javascript" src="js/show_vc_details.js"></script>| .
+    qq|<script type="text/javascript" src="js/follow_up.js"></script>|;
 
   $form->header;
   $onload = qq|focus()|;
@@ -413,6 +460,10 @@ selectcustomer}</select>|
 <input type=hidden name=closedto value=$form->{closedto}>
 <input type=hidden name=locked value=$form->{locked}>
 <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="ar_transaction">
+<input type="hidden" name="follow_up_trans_info_1" value="| . H($follow_up_trans_info) . qq|">
+<input type="hidden" name="follow_up_rowcount" value="1">
 
 | . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
 
@@ -425,66 +476,66 @@ selectcustomer}</select>|
     <td>
       <table width=100%>
         <tr valign=top>
-	  <td>
-	    <table>
-	      <tr>
-		<th align="right" nowrap>| . $locale->text('Customer') . qq|</th>
-		<td colspan=3>$customer <input type="button" value="?" onclick="show_vc_details('customer')"></td>
-		<input type=hidden name=selectcustomer value="$form->{selectcustomer}">
-		<input type=hidden name=oldcustomer value="$form->{oldcustomer}">
-		<input type=hidden name=customer_id value="$form->{customer_id}">
-		<input type=hidden name=terms value=$form->{terms}>
-	      </tr>
-	      <tr>
-		<td></td>
-		<td colspan=3>
-		  <table width=100%>
-		    <tr>
-		      <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
-		      <td>$form->{creditlimit}</td>
-		      <th align=left nowrap>| . $locale->text('Remaining') . qq|</th>
-		      <td class="plus$n">$form->{creditremaining}</td>
-		      <input type=hidden name=creditlimit value=$form->{creditlimit}>
-		      <input type=hidden name=creditremaining value=$form->{creditremaining}>
-		    </tr>
-		  </table>
-		</td>
-	      </tr>
-	      <tr>
-		<th align=right>| . $locale->text('Currency') . qq|</th>
-		<td><select name=currency>$form->{selectcurrency}</select></td>
-		<input type=hidden name=selectcurrency value="$form->{selectcurrency}">
-		<input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
-		<input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
-		<input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
-		$exchangerate
-	      </tr>
-	      $department
-	      $taxincluded
-	    </table>
-	  </td>
-	  <td align=right>
-	    <table>
-	      $employee
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
-		<td><input name=invnumber size=11 value="$form->{invnumber}"></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
-		<td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
+          <td>
+            <table>
+              <tr>
+                <th align="right" nowrap>| . $locale->text('Customer') . qq|</th>
+                <td colspan=3>$customer <input type="button" value="| . $locale->text('Details (one letter abbreviation)') . qq|" onclick="show_vc_details('customer')"></td>
+                <input type=hidden name=selectcustomer value="$form->{selectcustomer}">
+                <input type=hidden name=oldcustomer value="$form->{oldcustomer}">
+                <input type=hidden name=customer_id value="$form->{customer_id}">
+                <input type=hidden name=terms value=$form->{terms}>
+              </tr>
+              <tr>
+                <td></td>
+                <td colspan=3>
+                  <table width=100%>
+                    <tr>
+                      <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
+                      <td>$form->{creditlimit}</td>
+                      <th align=left nowrap>| . $locale->text('Remaining') . qq|</th>
+                      <td class="plus$n">$form->{creditremaining}</td>
+                      <input type=hidden name=creditlimit value=$form->{creditlimit}>
+                      <input type=hidden name=creditremaining value=$form->{creditremaining}>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr>
+                <th align=right>| . $locale->text('Currency') . qq|</th>
+                <td><select name=currency>$form->{selectcurrency}</select></td>
+                <input type=hidden name=selectcurrency value="$form->{selectcurrency}">
+                <input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
+                <input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
+                <input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
+                $exchangerate
+              </tr>
+              $department
+              $taxincluded
+            </table>
+          </td>
+          <td align=right>
+            <table>
+              $employee
+              <tr>
+                <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
+                <td><input name=invnumber size=11 value="$form->{invnumber}"></td>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
+                <td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
                 $button1
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
                 $button2
-	      </tr>
+              </tr>
      </table>
-	  </td>
-	</tr>
+          </td>
+        </tr>
       </table>
     </td>
   </tr>
@@ -494,26 +545,24 @@ $jsscript
   <tr>
       <td>
           <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('Amount') . 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:10%">|
     . $locale->text('Project') . qq|</th>
-	</tr>
+        </tr>
 |;
 
   $amount  = $locale->text('Amount');
   $project = $locale->text('Project');
 
-  for $i (1 .. $form->{rowcount}) {
+  for my $i (1 .. $form->{rowcount}) {
 
     # format amounts
     $form->{"amount_$i"} =
@@ -536,7 +585,13 @@ $jsscript
       $selected_taxchart = "$item->{id}--$item->{rate}";
     }
 
-    $selected_taxchart = $taxchart_init unless ($form->{"taxchart_$i"});
+    if (!$form->{"taxchart_$i"}) {
+      if ($form->{"AR_amount_$i"} =~ m/.--./) {
+        $selected_taxchart = join '--', map { ($_->{id}, $_->{rate}) } first { $_->{id} == $item->{tax_id} } @{ $form->{ALL_TAXCHARTS} };
+      } else {
+        $selected_taxchart = $taxchart_init;
+      }
+    }
 
     $selectAR_amount =
       NTI($cgi->popup_menu('-name' => "AR_amount_$i",
@@ -558,8 +613,6 @@ $jsscript
                            '-default' => $selected_taxchart))
       . qq|</td>|;
 
-    $korrektur_checked = ($form->{"korrektur_$i"} ? 'checked' : '');
-
     my $projectnumber =
       NTI($cgi->popup_menu('-name' => "project_id_$i",
                            '-values' => \@project_values,
@@ -567,14 +620,13 @@ $jsscript
                            '-default' => $form->{"project_id_$i"} ));
 
     print qq|
-	<tr>
+        <tr>
           <td>$selectAR_amount</td>
           <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
-          <td><input name="tax_$i" size=10 value=$form->{"tax_$i"}></td>
-          <td><input type="checkbox" name="korrektur_$i" value="1" $korrektur_checked></td>
+          <td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>
           $tax
           <td>$projectnumber</td>
-	</tr>
+        </tr>
 |;
     $amount  = "";
     $project = "";
@@ -596,15 +648,15 @@ $jsscript
           </td>
         </tr>
         <tr>
-	  <td>${ARselected}</td>
-	  <th align=left>$form->{invtotal}</th>
+          <td>${ARselected}</td>
+          <th align=left>$form->{invtotal}</th>
 
-	  <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
-	  <input type=hidden name=oldtotalpaid value=$form->{oldtotalpaid}>
+          <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
+          <input type=hidden name=oldtotalpaid value=$form->{oldtotalpaid}>
 
-	  <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
+          <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
 
-	  <td colspan=4></td>
+          <td colspan=4></td>
 
 
         </tr>
@@ -615,22 +667,22 @@ $jsscript
       <td>
         <table width=100%>
         <tr>
-	  <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
-	  <td align=left>$notes</td>
-	</tr>
+          <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
+          <td align=left>$notes</td>
+        </tr>
       </table>
     </td>
   </tr>
   <tr>
     <td>
       <table width=100%>
-	<tr class=listheading>
-	  <th colspan=7 class=listheading>|
+        <tr class=listheading>
+          <th colspan=7 class=listheading>|
     . $locale->text('Incoming Payments') . qq|</th>
-	</tr>
+        </tr>
 |;
 
-  if ($form->{currency} eq $form->{defaultcurrency}) {
+  if ($form->{defaultcurrency} && ($form->{currency} eq $form->{defaultcurrency})) {
     @column_index = qw(datepaid source memo paid AR_paid paid_project_id);
   } else {
     @column_index = qw(datepaid source memo paid exchangerate AR_paid paid_project_id);
@@ -641,8 +693,8 @@ $jsscript
   $column_data{exchangerate} = "<th>" . $locale->text('Exch') . "</th>";
   $column_data{AR_paid}      = "<th>" . $locale->text('Account') . "</th>";
   $column_data{source}       = "<th>" . $locale->text('Source') . "</th>";
-  $column_data{memo}         = "<th>" . $locale->text('Memo') . "</th>"; 
-  $column_data{paid_project_id} = "<th>" . $locale->text('Project Number') . "</th>"; 
+  $column_data{memo}         = "<th>" . $locale->text('Memo') . "</th>";
+  $column_data{paid_project_id} = "<th>" . $locale->text('Project Number') . "</th>";
 
   print "
         <tr>
@@ -656,7 +708,7 @@ $jsscript
   my $totalpaid = 0;
 
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
-  for $i (1 .. $form->{paidaccounts}) {
+  for my $i (1 .. $form->{paidaccounts}) {
     print "
         <tr>
 ";
@@ -678,8 +730,12 @@ $jsscript
     $form->{"exchangerate_$i"} =
       $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
 
+    if ($form->{"exchangerate_$i"} == 0) {
+      $form->{"exchangerate_$i"} = "";
+    }
+
     $exchangerate = qq|&nbsp;|;
-    if ($form->{currency} ne $form->{defaultcurrency}) {
+    if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
       if ($form->{"forex_$i"}) {
         $exchangerate =
           qq|<input type=hidden name="exchangerate_$i" value=$form->{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
@@ -750,20 +806,38 @@ $jsscript
 </table>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub form_footer {
-  $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;
+
+  my ($transdate, $closedto);
+
+  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>|;
+    }
+  }
 
   print qq|
 
+$follow_ups_block
+
 <input name=gldate type=hidden value="| . Q($form->{gldate}) . qq|">
 
 <input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
 |
 . $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
 . $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
@@ -787,8 +861,8 @@ sub form_footer {
   print qq|<input class="submit" type="submit" name="action" id="update_button" value="| . $locale->text('Update') . qq|">\n|;
 
   # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
-  print qq|<input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|">|
-    if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ar') && !IS->is_storno(\%myconfig, $form, 'ar') && !$form->{paid_1});
+  print qq| <input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|"> |
+    if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ar') && !IS->is_storno(\%myconfig, $form, 'ar') && (($totalpaid == 0) || ($totalpaid eq "")));
 
   if ($form->{id}) {
     if ($form->{radier}) {
@@ -801,11 +875,14 @@ sub form_footer {
         <input class=submit type=submit name=action value="| . $locale->text('Use As Template') . qq|"> |;
     }
     print qq|
-        <input class=submit type=submit name=action value="| . $locale->text('Post Payment') .    qq|"> |;
+        <input class=submit type=submit name=action value="| . $locale->text('Post Payment') .    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('Post') .     qq|"> | .
+      print 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'));
     }
   }
@@ -816,12 +893,12 @@ sub form_footer {
   }
   # button for saving history
   if($form->{id} ne "") {
-    print qq|<input type=button class=submit onclick=set_history_window($form->{id}); name=history id=history value=| . $locale->text('history') . qq|>|;
+    print qq| <input type=button class=submit onclick=set_history_window($form->{id}); name=history id=history value=| . $locale->text('history') . qq|> |;
   }
   # /button for saving history
-  # mark_as_paid button 
-  if($form->{id} ne "") {  
-    print qq|<input type="submit" class="submit" name="action" value="| 
+  # mark_as_paid button
+  if($form->{id} ne "") {
+    print qq|<input type="submit" class="submit" name="action" value="|
           . $locale->text('mark as paid') . qq|">|;
   }
   # /mark_as_paid button
@@ -833,47 +910,60 @@ sub form_footer {
 </html>
 ";
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub mark_as_paid {
-  $lxdebug->enter_sub();
-  &mark_as_paid_common(\%myconfig,"ar");  
-  $lxdebug->leave_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  &mark_as_paid_common(\%myconfig,"ar");
+
+  $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;
 
   my $display = shift;
 
+  my ($totaltax, $exchangerate);
+
   $form->{invtotal} = 0;
 
+  delete @{ $form }{ grep { m/^tax_\d+$/ } keys %{ $form } };
+
   map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
     qw(exchangerate creditlimit creditremaining);
 
-  @flds  = qw(amount AR_amount projectnumber oldprojectnumber project_id);
-  $count = 0;
-  @a     = ();
+  my @flds  = qw(amount AR_amount projectnumber oldprojectnumber project_id);
+  my $count = 0;
+  my @a     = ();
 
-  for $i (1 .. $form->{rowcount}) {
-    $form->{"amount_$i"} =
-      $form->parse_amount(\%myconfig, $form->{"amount_$i"});
+  for my $i (1 .. $form->{rowcount}) {
+    $form->{"amount_$i"} = $form->parse_amount(\%myconfig, $form->{"amount_$i"});
     $form->{"tax_$i"} = $form->parse_amount(\%myconfig, $form->{"tax_$i"});
     if ($form->{"amount_$i"}) {
       push @a, {};
-      $j = $#a;
-      if (!$form->{"korrektur_$i"}) {
-        ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
-        if ($taxkey > 1) {
-          if ($form->{taxincluded}) {
-            $form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;
-          } else {
-            $form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
-          }
+      my $j = $#a;
+      my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+      if ($taxkey > 1) {
+        if ($form->{taxincluded}) {
+          $form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;
         } else {
-          $form->{"tax_$i"} = 0;
+          $form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
         }
+      } else {
+        $form->{"tax_$i"} = 0;
       }
       $form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
 
@@ -887,23 +977,28 @@ sub update {
   $form->{rowcount} = $count + 1;
   map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. $form->{rowcount});
 
-  $form->{exchangerate} = $exchangerate
-    if (
-        $form->{forex} = (
-                     $exchangerate =
-                       $form->check_exchangerate(
-                       \%myconfig, $form->{currency}, $form->{transdate}, 'buy'
-                       )));
+  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'buy');
+  $form->{exchangerate} = $form->{forex} if $form->{forex};
 
   $form->{invdate} = $form->{transdate};
-  $save_AR = $form->{AR};
-  &check_name(customer);
-  $form->{AR} = $save_AR;
+
+  $form->{invdate} = $form->{transdate};
+
+  my %saved_variables = map +( $_ => $form->{$_} ), qw(AR AR_amount_1 taxchart_1);
+
+  &check_name("customer");
+
+  $form->{AR} = $saved_variables{AR};
+  if ($saved_variables{AR_amount_1} =~ m/.--./) {
+    map { $form->{$_} = $saved_variables{$_} } qw(AR_amount_1 taxchart_1);
+  } else {
+    delete $form->{taxchart_1};
+  }
 
   $form->{invtotal} =
     ($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
 
-  for $i (1 .. $form->{paidaccounts}) {
+  for my $i (1 .. $form->{paidaccounts}) {
     if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
       map {
         $form->{"${_}_$i"} =
@@ -912,13 +1007,8 @@ sub update {
 
       $totalpaid += $form->{"paid_$i"};
 
-      $form->{"exchangerate_$i"} = $exchangerate
-        if (
-            $form->{"forex_$i"} = (
-                 $exchangerate =
-                   $form->check_exchangerate(
-                   \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy'
-                   )));
+      $form->{"forex_$i"}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy');
+      $form->{"exchangerate_$i"} = $form->{"forex_$i"} if $form->{"forex_$i"};
     }
   }
 
@@ -930,69 +1020,103 @@ sub update {
 
   &display_form;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
+#
+# ToDO: fix $closedto and $invdate
+#
 sub post_payment {
-  $lxdebug->enter_sub();
-  for $i (1 .. $form->{paidaccounts}) {
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+
+  for my $i (1 .. $form->{paidaccounts}) {
+
     if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
-      $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
+      my $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
 
       $form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
 
-      $form->error($locale->text('Cannot post payment for a closed period!'))
-        if ($datepaid <= $closedto);
+      $form->error($locale->text('Cannot post payment for a closed period!')) if ($form->date_closed($form->{"datepaid_$i"}, \%myconfig));
 
-      if ($form->{currency} ne $form->{defaultcurrency}) {
-        $form->{"exchangerate_$i"} = $form->{exchangerate}
-          if ($invdate == $datepaid);
-        $form->isblank("exchangerate_$i",
-                       $locale->text('Exchangerate for payment missing!'));
+      if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
+#        $form->{"exchangerate_$i"} = $form->{exchangerate} if ($invdate == $datepaid);
+        $form->isblank("exchangerate_$i", $locale->text('Exchangerate for payment missing!'));
       }
     }
   }
 
   ($form->{AR})      = split /--/, $form->{AR};
   ($form->{AR_paid}) = split /--/, $form->{AR_paid};
-  $form->redirect($locale->text('Payment posted!'))
-      if (AR->post_payment(\%myconfig, \%$form));
-    $form->error($locale->text('Cannot post payment!'));
+  $form->redirect($locale->text('Payment posted!')) if (AR->post_payment(\%myconfig, \%$form));
+  $form->error($locale->text('Cannot post payment!'));
+
+  $main::lxdebug->leave_sub();
+}
+
+sub _post {
+
+  $main::auth->assert('general_ledger');
 
+  my $form     = $main::form;
 
-  $lxdebug->leave_sub();
+  # inline post
+  post(1);
 }
 
 sub post {
-  $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 ($inline) = @_;
+
+  my ($datepaid);
 
   # check if there is an invoice number, invoice and due date
   $form->isblank("transdate", $locale->text('Invoice Date missing!'));
   $form->isblank("duedate",   $locale->text('Due Date missing!'));
   $form->isblank("customer",  $locale->text('Customer missing!'));
 
-  $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
-  $transdate = $form->datetonum($form->{transdate}, \%myconfig);
-  $form->error($locale->text('Cannot post transaction for a closed period!')) if ($transdate <= $closedto);
+  if ($myconfig{mandatory_departments} && !$form->{department}) {
+    $form->{saved_message} = $::locale->text('You have to specify a department.');
+    update();
+    exit;
+  }
+
+  my $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
+  my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+  $form->error($locale->text('Cannot post transaction for a closed period!')) if ($form->date_closed($form->{"transdate"}, \%myconfig));
 
-  $form->error($locale->text('Zero amount posting!')) 
+  $form->error($locale->text('Zero amount posting!'))
     unless grep $_*1, map $form->parse_amount(\%myconfig, $form->{"amount_$_"}), 1..$form->{rowcount};
 
   $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
-    if ($form->{currency} ne $form->{defaultcurrency});
+    if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency}));
 
   delete($form->{AR});
 
-  for $i (1 .. $form->{paidaccounts}) {
+  for my $i (1 .. $form->{paidaccounts}) {
     if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
       $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
 
       $form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
 
       $form->error($locale->text('Cannot post payment for a closed period!'))
-        if ($datepaid <= $closedto);
+        if ($form->date_closed($form->{"datepaid_$i"}, \%myconfig));
 
-      if ($form->{currency} ne $form->{defaultcurrency}) {
+      if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
         $form->{"exchangerate_$i"} = $form->{exchangerate} if ($transdate == $datepaid);
         $form->isblank("exchangerate_$i", $locale->text('Exchangerate for payment missing!'));
       }
@@ -1000,49 +1124,60 @@ sub post {
   }
 
   # if oldcustomer ne customer redo form
-  ($customer) = split /--/, $form->{customer};
+  my ($customer) = split /--/, $form->{customer};
   if ($form->{oldcustomer} ne "$customer--$form->{customer_id}") {
-    &update;
-    exit;
+    update();
+    ::end_of_request();
   }
 
   $form->{AR}{receivables} = $form->{ARselected};
+  $form->{storno}          = 0;
 
   $form->{id} = 0 if $form->{postasnew};
-  if (AR->post_transaction(\%myconfig, \%$form)) {
-    # saving the history
-    if(!exists $form->{addition} && $form->{id} ne "") {
-      $form->{snumbers} = "invnumber_$form->{invnumber}";
-      $form->{addition} = "POSTED";
-      $form->save_history($form->dbconnect(\%myconfig));
-    }
-    # /saving the history 
-    remove_draft() if $form->{remove_draft};
-    $form->redirect($locale->text('Transaction posted!'));
+  $form->error($locale->text('Cannot post transaction!')) unless AR->post_transaction(\%myconfig, \%$form);
+
+  # saving the history
+  if(!exists $form->{addition} && $form->{id} ne "") {
+    $form->{snumbers} = "invnumber_$form->{invnumber}";
+    $form->{addition} = "POSTED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
-  $form->error($locale->text('Cannot post transaction!'));
+  # /saving the history
+  remove_draft() if $form->{remove_draft};
+
+  $form->redirect($locale->text('Transaction posted!')) unless $inline;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub post_as_new {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   $form->{postasnew} = 1;
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-  	$form->{addition} = "POSTED AS NEW";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "POSTED AS NEW";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
-  # /saving the history 
+  # /saving the history
   &post;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub use_as_template {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
   $form->{paidaccounts} = 1;
@@ -1050,11 +1185,16 @@ sub use_as_template {
   $form->{invdate} = $form->current_date(\%myconfig);
   &update;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub delete {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
   $form->{title} = $locale->text('Confirm!');
 
@@ -1068,7 +1208,8 @@ sub delete {
 <form method=post action=$form->{script}>
 |;
 
-  foreach $key (keys %$form) {
+  foreach my $key (keys %$form) {
+    next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
     $form->{$key} =~ s/\"/&quot;/g;
     print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
   }
@@ -1088,661 +1229,292 @@ sub delete {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub yes {
-  $lxdebug->enter_sub();
-  if (AR->delete_transaction(\%myconfig, \%$form, $spool)) {
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  if (AR->delete_transaction(\%myconfig, \%$form)) {
     # saving the history
     if(!exists $form->{addition}) {
       $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-  	  $form->{addition} = "DELETED";
-  	  $form->save_history($form->dbconnect(\%myconfig));
+      $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 search {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  # setup customer selection
-  $form->all_vc(\%myconfig, "customer", "AR");
-
-  if (@{ $form->{all_customer} }) {
-    map { $customer .= "<option>$_->{name}--$_->{id}\n" }
-      @{ $form->{all_customer} };
-    $customer = qq|<select name=customer><option>\n$customer</select>|;
-  } else {
-    $customer = qq|<input name=customer size=35>|;
-  }
+  $main::auth->assert('general_ledger | invoice_edit');
 
-  # departments
-  if (@{ $form->{all_departments} }) {
-    $form->{selectdepartment} = "<option>\n";
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+  my $cgi      = $main::cgi;
 
-    map {
-      $form->{selectdepartment} .=
-        "<option>$_->{description}--$_->{id}\n"
-    } (@{ $form->{all_departments} });
-  }
+  my ($customer, $department);
+  my ($jsscript, $button1, $button2, $onload);
 
-  $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};
+  # setup customer selection
+  $form->all_vc(\%myconfig, "customer", "AR");
 
-  $form->{title} = $locale->text('AR Transactions');
-  
-  $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
-  
-  # use JavaScript Calendar or not
+  $form->{title}    = $locale->text('AR Transactions');
   $form->{jsscript} = 1;
-  $jsscript = "";
-  if ($form->{jsscript}) {
-
-    # with JavaScript Calendar
-    $button1 = qq|
-       <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
-       <input type=button name=transdatefrom id="trigger1" value=|
-      . $locale->text('button') . qq|></td>
-      |;
-    $button2 = qq|
-       <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
-       <input type=button name=transdateto name=transdateto id="trigger2" value=|
-      . $locale->text('button') . qq|></td>
-     |;
-
-    #write Trigger
-    $jsscript =
-      Form->write_trigger(\%myconfig, "2", "transdatefrom", "BR", "trigger1",
-                          "transdateto", "BL", "trigger2");
-  } else {
-
-    # without JavaScript Calendar
-    $button1 = qq|
-                              <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\"></td>|;
-    $button2 = qq|
-                              <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\"></td>|;
-  }
 
-  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
-                                   "all" => 1 });
+  $form->get_lists("projects"     => { "key" => "ALL_PROJECTS", "all" => 1 },
+                   "departments"  => "ALL_DEPARTMENTS",
+                   "customers"    => "ALL_VC");
 
-  my %labels = ();
-  my @values = ("");
-  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
-    push(@values, $item->{"id"});
-    $labels{$item->{"id"}} = $item->{"projectnumber"};
-  }
-  my $projectnumber =
-    NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values,
-                         '-labels' => \%labels));
+  # constants and subs for template
+  $form->{jsscript}  = 1;
+  $form->{vc_keys}   = sub { "$_[0]->{name}--$_[0]->{id}" };
 
-  $form->{fokus} = "search.customer";
   $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 onLoad="$onload">
+  print $form->parse_html_template('ar/search', { %myconfig });
 
-<form method=post name="search" action=$form->{script}>
+  $main::lxdebug->leave_sub();
+}
 
-<table width=100%>
-  <tr><th class=listtop>$form->{title}</th></tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-	<tr>
-	  <th align=right>| . $locale->text('Customer') . qq|</th>
-	  <td colspan=3>$customer</td>
-	</tr>
-	$department
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
-	  <td colspan=3><input name=invnumber size=20></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
-	  <td colspan=3><input name=ordnumber size=20></td>
-	</tr>
-       <tr>
-         <th align=right nowrap>| . $locale->text('Transaction description') . qq|</th>
-         <td colspan=3><input name=transaction_description size=40></td>
-       </tr>
-	<tr>
-	  <th align=right nowrap>| . $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 nowrap>| . $locale->text('From') . qq|</th>
-          $button1
-	  <th align=right>| . $locale->text('Bis') . qq|</th>
-          $button2
-	</tr>
-	<input type=hidden name=sort value=transdate>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <table>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
-	  <td>
-	    <table width=100%>
-	      <tr>
-		<td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
-		<td nowrap>| . $locale->text('Open') . qq|</td>
-		<td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Closed') . qq|</td>
-	      </tr>
-	      <tr>
-		<td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('ID') . qq|</td>
-		<td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-		<td nowrap>| . $locale->text('Invoice Number') . qq|</td>
-		<td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Order Number') . qq|</td>
-		<td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-		<td nowrap>| . $locale->text('Invoice Date') . qq|</td>
-	      </tr>
-	      <tr>
-		<td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-		<td nowrap>| . $locale->text('Customer') . qq|</td>
-		<td align=right><input name="l_netamount" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Amount') . qq|</td>
-		<td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Tax') . qq|</td>
-		<td align=right><input name="l_amount" class=checkbox type=checkbox value=Y checked></td>
-		<td nowrap>| . $locale->text('Total') . qq|</td>
-	      </tr>
-	      <tr>
-		<td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Date Paid') . qq|</td>
-		<td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
-		<td nowrap>| . $locale->text('Paid') . qq|</td>
-		<td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Due Date') . qq|</td>
-		<td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Amount Due') . qq|</td>
-	      </tr>
-	      <tr>
-		<td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Notes') . qq|</td>
-		<td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Salesperson') . qq|</td>
-		<td align=right><input name="l_shippingpoint" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Shipping Point') . qq|</td>
-		<td align=right><input name="l_shipvia" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Ship via') . qq|</td>
-	      </tr>
-	      <tr>
-		<td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Subtotal') . qq|</td>
-		<td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Project Number') . qq|</td>
-		<td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
-		<td nowrap>| . $locale->text('Transaction description') . qq|</td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
+sub create_subtotal_row {
+  $main::lxdebug->enter_sub();
 
-<input type=hidden name=nextsub value=$form->{nextsub}>
+  my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
 
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Continue') . qq|">
+  my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
 
-</form>
+  map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
 
-</body>
+  $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2);
 
-$jsscript
+  map { $totals->{$_} = 0 } @{ $subtotal_columns };
 
-</html>
-|;
+  $main::lxdebug->leave_sub();
 
-  $lxdebug->leave_sub();
+  return $row;
 }
 
 sub ar_transactions {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger | invoice_edit');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  my ($callback, $href, @columns);
 
   $form->{customer} = $form->unescape($form->{customer});
   ($form->{customer}, $form->{customer_id}) = split(/--/, $form->{customer});
 
+  report_generator_set_default_sort('transdate', 1);
+
   AR->ar_transactions(\%myconfig, \%$form);
 
-  $callback =
-    "$form->{script}?action=ar_transactions&login=$form->{login}&password=$form->{password}";
-  $href = $callback;
+  $form->{title} = $locale->text('AR Transactions');
+
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
+
+  @columns =
+    qw(transdate id type invnumber ordnumber name netamount tax amount paid
+       datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
+       marge_total marge_percent globalprojectnumber customernumber country ustid taxzone payment_terms charts);
+
+  my @hidden_variables = map { "l_${_}" } @columns;
+  push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber transaction_description notes project_id transdatefrom transdateto);
+
+  $href = build_std_url('action=ar_transactions', grep { $form->{$_} } @hidden_variables);
+
+  my %column_defs = (
+    'transdate'               => { 'text' => $locale->text('Date'), },
+    'id'                      => { 'text' => $locale->text('ID'), },
+    'type'                    => { 'text' => $locale->text('Type'), },
+    'invnumber'               => { 'text' => $locale->text('Invoice'), },
+    'ordnumber'               => { 'text' => $locale->text('Order'), },
+    'name'                    => { 'text' => $locale->text('Customer'), },
+    'netamount'               => { 'text' => $locale->text('Amount'), },
+    'tax'                     => { 'text' => $locale->text('Tax'), },
+    'amount'                  => { 'text' => $locale->text('Total'), },
+    'paid'                    => { 'text' => $locale->text('Paid'), },
+    'datepaid'                => { 'text' => $locale->text('Date Paid'), },
+    'due'                     => { 'text' => $locale->text('Amount Due'), },
+    'duedate'                 => { 'text' => $locale->text('Due Date'), },
+    'transaction_description' => { 'text' => $locale->text('Transaction description'), },
+    'notes'                   => { 'text' => $locale->text('Notes'), },
+    'salesman'                => { 'text' => $locale->text('Salesperson'), },
+    'employee'                => { 'text' => $locale->text('Employee'), },
+    'shippingpoint'           => { 'text' => $locale->text('Shipping Point'), },
+    'shipvia'                 => { 'text' => $locale->text('Ship via'), },
+    'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
+    'marge_total'             => { 'text' => $locale->text('Ertrag'), },
+    'marge_percent'           => { 'text' => $locale->text('Ertrag prozentual'), },
+    'customernumber'          => { 'text' => $locale->text('Customer Number'), },
+    'country'                 => { 'text' => $locale->text('Country'), },
+    'ustid'                   => { 'text' => $locale->text('USt-IdNr.'), },
+    'taxzone'                 => { 'text' => $locale->text('Steuersatz'), },
+    'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
+    'charts'                  => { 'text' => $locale->text('Buchungskonto'), },
+  );
+
+  foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description)) {
+    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+    $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
+  }
+
+  my %column_alignment = map { $_ => 'right' } qw(netamount tax amount paid due);
+
+  $form->{"l_type"} = "Y";
+  map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
 
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
+
+  $report->set_export_options('ar_transactions', @hidden_variables, qw(sort sortdir));
+
+  $report->set_sort_indicator($form->{sort}, $form->{sortdir});
+
+  my @options;
   if ($form->{customer}) {
-    $callback .= "&customer=" . $form->escape($form->{customer}, 1);
-    $href .= "&customer=" . $form->escape($form->{customer});
-    $option = $locale->text('Customer') . " : $form->{customer}";
+    push @options, $locale->text('Customer') . " : $form->{customer}";
   }
   if ($form->{department}) {
-    $callback .= "&department=" . $form->escape($form->{department}, 1);
-    $href .= "&department=" . $form->escape($form->{department});
-    ($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->{invnumber}) {
-    $callback .= "&invnumber=" . $form->escape($form->{invnumber}, 1);
-    $href .= "&invnumber=" . $form->escape($form->{invnumber});
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Invoice Number') . " : $form->{invnumber}";
+    push @options, $locale->text('Invoice Number') . " : $form->{invnumber}";
   }
   if ($form->{ordnumber}) {
-    $callback .= "&ordnumber=" . $form->escape($form->{ordnumber}, 1);
-    $href .= "&ordnumber=" . $form->escape($form->{ordnumber});
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Order Number') . " : $form->{ordnumber}";
+    push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
   }
   if ($form->{notes}) {
-    $callback .= "&notes=" . $form->escape($form->{notes}, 1);
-    $href .= "&notes=" . $form->escape($form->{notes});
-    $option .= "\n<br>" if $option;
-    $option .= $locale->text('Notes') . " : $form->{notes}";
+    push @options, $locale->text('Notes') . " : $form->{notes}";
   }
   if ($form->{transaction_description}) {
-    $callback .= "&transaction_description=" . $form->escape($form->{transaction_description}, 1);
-    $href .= "&transaction_description=" . $form->escape($form->{transaction_description});
-    $option .= "\n<br>" if $option;
-    $option .= $locale->text('Transaction description') . " : $form->{transaction_description}";
+    push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
   }
-
   if ($form->{transdatefrom}) {
-    $callback .= "&transdatefrom=$form->{transdatefrom}";
-    $href     .= "&transdatefrom=$form->{transdatefrom}";
-    $option   .= "\n<br>" if ($option);
-    $option   .=
-        $locale->text('From') . "&nbsp;"
-      . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
+    push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
   }
   if ($form->{transdateto}) {
-    $callback .= "&transdateto=$form->{transdateto}";
-    $href     .= "&transdateto=$form->{transdateto}";
-    $option   .= "\n<br>" if ($option);
-    $option   .=
-        $locale->text('Bis') . "&nbsp;"
-      . $locale->date(\%myconfig, $form->{transdateto}, 1);
+    push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
   }
   if ($form->{open}) {
-    $callback .= "&open=$form->{open}";
-    $href     .= "&open=$form->{open}";
-    $option   .= "\n<br>" if ($option);
-    $option   .= $locale->text('Open');
+    push @options, $locale->text('Open');
   }
   if ($form->{closed}) {
-    $callback .= "&closed=$form->{closed}";
-    $href     .= "&closed=$form->{closed}";
-    $option   .= "\n<br>" if ($option);
-    $option   .= $locale->text('Closed');
-  }
-  if ($form->{globalproject_id}) {
-    $callback .= "&globalproject_id=" . E($form->{globalproject_id});
-    $href     .= "&globalproject_id=" . E($form->{globalproject_id});
+    push @options, $locale->text('Closed');
   }
 
-  @columns =
-    qw(transdate id type invnumber ordnumber name netamount tax amount paid
-       datepaid due duedate transaction_description notes employee shippingpoint shipvia
-       globalprojectnumber);
+  $report->set_options('top_info_text'        => join("\n", @options),
+                       'raw_bottom_info_text' => $form->parse_html_template('ar/ar_transactions_bottom'),
+                       'output_format'        => 'HTML',
+                       'title'                => $form->{title},
+                       'attachment_basename'  => $locale->text('invoice_list') . strftime('_%Y%m%d', localtime time),
+    );
+  $report->set_options_from_form();
 
-  $form->{"l_type"} = "Y";
+  # add sort and escape callback, this one we use for the add sub
+  $form->{callback} = $href .= "&sort=$form->{sort}";
 
-  foreach $item (@columns) {
-    if ($form->{"l_$item"} eq "Y") {
-      push @column_index, $item;
+  # escape callback for href
+  $callback = $form->escape($href);
 
-      # add column to href and callback
-      $callback .= "&l_$item=Y";
-      $href     .= "&l_$item=Y";
-    }
-  }
+  my @subtotal_columns = qw(netamount amount paid due marge_total marge_percent);
 
-  if ($form->{l_subtotal} eq 'Y') {
-    $callback .= "&l_subtotal=Y";
-    $href     .= "&l_subtotal=Y";
-  }
+  my %totals    = map { $_ => 0 } @subtotal_columns;
+  my %subtotals = map { $_ => 0 } @subtotal_columns;
 
-  $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{duedate} =
-      "<th><a class=listheading href=$href&sort=duedate>"
-    . $locale->text('Due Date')
-    . "</a></th>";
-  $column_header{type} =
-      "<th class=\"listheading\">" . $locale->text('Type') . "</th>";
-  $column_header{invnumber} =
-      "<th><a class=listheading href=$href&sort=invnumber>"
-    . $locale->text('Invoice')
-    . "</a></th>";
-  $column_header{ordnumber} =
-      "<th><a class=listheading href=$href&sort=ordnumber>"
-    . $locale->text('Order')
-    . "</a></th>";
-  $column_header{name} =
-      "<th><a class=listheading href=$href&sort=name>"
-    . $locale->text('Customer')
-    . "</a></th>";
-  $column_header{netamount} =
-    "<th class=listheading>" . $locale->text('Amount') . "</th>";
-  $column_header{tax} =
-    "<th class=listheading>" . $locale->text('Tax') . "</th>";
-  $column_header{amount} =
-    "<th class=listheading>" . $locale->text('Total') . "</th>";
-  $column_header{paid} =
-    "<th class=listheading>" . $locale->text('Paid') . "</th>";
-  $column_header{datepaid} =
-      "<th><a class=listheading href=$href&sort=datepaid>"
-    . $locale->text('Date Paid')
-    . "</a></th>";
-  $column_header{due} =
-    "<th class=listheading>" . $locale->text('Amount Due') . "</th>";
-  $column_header{notes} =
-    "<th class=listheading>" . $locale->text('Notes') . "</th>";
-  $column_header{employee} =
-    "<th><a class=listheading href=$href&sort=employee>"
-    . $locale->text('Salesperson') . "</th>";
-
-  $column_header{shippingpoint} =
-      "<th><a class=listheading href=$href&sort=shippingpoint>"
-    . $locale->text('Shipping Point')
-    . "</a></th>";
-  $column_header{shipvia} =
-      "<th><a class=listheading href=$href&sort=shipvia>"
-    . $locale->text('Ship via')
-    . "</a></th>";
-  $column_header{globalprojectnumber} =
-    qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;
-  $column_header{transaction_description} =
-    "<th class=listheading>" . $locale->text('Transaction description') . "</th>";
+  my $idx = 0;
 
-  $form->{title} = $locale->text('AR Transactions');
+  foreach my $ar (@{ $form->{AR} }) {
+    $ar->{tax} = $ar->{amount} - $ar->{netamount};
+    $ar->{due} = $ar->{amount} - $ar->{paid};
 
-  $form->header;
+    map { $subtotals{$_} += $ar->{$_};
+          $totals{$_}    += $ar->{$_} } @subtotal_columns;
 
-  print qq|
-<body>
+    $subtotals{marge_percent} = $subtotals{netamount} ? ($subtotals{marge_total} * 100 / $subtotals{netamount}) : 0;
+    $totals{marge_percent}    = $totals{netamount}    ? ($totals{marge_total}    * 100 / $totals{netamount}   ) : 0;
 
-<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%>
-	<tr class=listheading>
-|;
-
-  map { print "\n$column_header{$_}" } @column_index;
-
-  print qq|
-	</tr>
-|;
+    map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due marge_total marge_percent);
 
-  # add sort and escape callback, this one we use for the add sub
-  $form->{callback} = $callback .= "&sort=$form->{sort}";
+    my $is_storno  = $ar->{storno} &&  $ar->{storno_id};
+    my $has_storno = $ar->{storno} && !$ar->{storno_id};
 
-  # escape callback for href
-  $callback = $form->escape($callback);
-
-  if (@{ $form->{AR} }) {
-    $sameitem = $form->{AR}->[0]->{ $form->{sort} };
-  }
+    $ar->{type} =
+      $has_storno       ? $locale->text("Invoice with Storno (abbreviation)") :
+      $is_storno        ? $locale->text("Storno (one letter abbreviation)") :
+      $ar->{amount} < 0 ? $locale->text("Credit note (one letter abbreviation)") :
+      $ar->{invoice}    ? $locale->text("Invoice (one letter abbreviation)") :
+                          $locale->text("AR Transaction (abbreviation)");
 
-  # sums and tax on reports by Antonio Gallardo
-  #
-  foreach $ar (@{ $form->{AR} }) {
+    my $row = { };
 
-    if ($form->{l_subtotal} eq 'Y') {
-      if ($sameitem ne $ar->{ $form->{sort} }) {
-        &ar_subtotal;
-      }
+    foreach my $column (@columns) {
+      $row->{$column} = {
+        'data'  => $ar->{$column},
+        'align' => $column_alignment{$column},
+      };
     }
 
-    $column_data{netamount} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ar->{netamount}, 2, "&nbsp;")
-      . "</td>";
-    $column_data{tax} = "<td align=right>"
-      . $form->format_amount(\%myconfig, $ar->{amount} - $ar->{netamount},
-                             2, "&nbsp;")
-      . "</td>";
-    $column_data{amount} =
-      "<td align=right>"
-      . $form->format_amount(\%myconfig, $ar->{amount}, 2, "&nbsp;") . "</td>";
-    $column_data{paid} =
-      "<td align=right>"
-      . $form->format_amount(\%myconfig, $ar->{paid}, 2, "&nbsp;") . "</td>";
-    $column_data{due} = "<td align=right>"
-      . $form->format_amount(\%myconfig, $ar->{amount} - $ar->{paid},
-                             2, "&nbsp;")
-      . "</td>";
-
-    $subtotalnetamount += $ar->{netamount};
-    $subtotalamount    += $ar->{amount};
-    $subtotalpaid      += $ar->{paid};
-    $subtotaldue       += $ar->{amount} - $ar->{paid};
-
-    $totalnetamount += $ar->{netamount};
-    $totalamount    += $ar->{amount};
-    $totalpaid      += $ar->{paid};
-    $totaldue       += ($ar->{amount} - $ar->{paid});
-
-    $column_data{transdate} = "<td>$ar->{transdate}&nbsp;</td>";
-    $column_data{id}        = "<td>$ar->{id}</td>";
-    $column_data{datepaid}  = "<td>$ar->{datepaid}&nbsp;</td>";
-    $column_data{duedate}   = "<td>$ar->{duedate}&nbsp;</td>";
-
-    $module = ($ar->{invoice}) ? "is.pl" : $form->{script};
-
-    $column_data{invnumber} =
-      "<td><a href=$module?action=edit&id=$ar->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}</a></td>";
-
-    my $is_storno  = $ar->{storno} && IS->is_storno(\%myconfig, $form, 'ar');
-    my $has_storno = $ar->{storno} && !$is_storno;
-
-    $column_data{type} = "<td>" .
-      ($has_storno       ? $locale->text("Invoice with Storno (abbreviation)") :
-       $is_storno        ? $locale->text("Storno (one letter abbreviation)") :
-       $ar->{amount} < 0 ? $locale->text("Credit note (one letter abbreviation)") :
-       $ar->{invoice}    ? $locale->text("Invoice (one letter abbreviation)") :
-                           $locale->text("AR Transaction (abbreviation)"))
-        . "</td>";
-    $column_data{ordnumber} = "<td>$ar->{ordnumber}&nbsp;</td>";
-    $column_data{name}      = "<td>$ar->{name}</td>";
-    $ar->{notes} =~ s/\r\n/<br>/g;
-    $column_data{notes}         = "<td>$ar->{notes}&nbsp;</td>";
-    $column_data{shippingpoint} = "<td>$ar->{shippingpoint}&nbsp;</td>";
-    $column_data{shipvia}       = "<td>$ar->{shipvia}&nbsp;</td>";
-    $column_data{employee}      = "<td>$ar->{employee}&nbsp;</td>";
-    $column_data{globalprojectnumber}  =
-      "<td>" . H($ar->{globalprojectnumber}) . "</td>";
-    $column_data{transaction_description}  =
-      "<td>" . H($ar->{transaction_description}) . "</td>";
-
-    $i++;
-    $i %= 2;
-    print "
-        <tr class=listrow$i>
-";
+    $row->{invnumber}->{link} = build_std_url("script=" . ($ar->{invoice} ? 'is.pl' : 'ar.pl'), 'action=edit')
+      . "&id=" . E($ar->{id}) . "&callback=${callback}";
 
-    map { print "\n$column_data{$_}" } @column_index;
+    my $row_set = [ $row ];
 
-    print qq|
-        </tr>
-|;
+    if (($form->{l_subtotal} eq 'Y')
+        && (($idx == (scalar @{ $form->{AR} } - 1))
+            || ($ar->{ $form->{sort} } ne $form->{AR}->[$idx + 1]->{ $form->{sort} }))) {
+      push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, \@subtotal_columns, 'listsubtotal');
+    }
 
-  }
+    $report->add_data($row_set);
 
-  if ($form->{l_subtotal} eq 'Y') {
-    &ar_subtotal;
+    $idx++;
   }
 
-  # print totals
-  print qq|
-        <tr class=listtotal>
-|;
-
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
-
-  $column_data{netamount} =
-    "<th class=listtotal align=right>"
-    . $form->format_amount(\%myconfig, $totalnetamount, 2, "&nbsp;") . "</th>";
-  $column_data{tax} = "<th class=listtotal align=right>"
-    . $form->format_amount(\%myconfig, $totalamount - $totalnetamount,
-                           2, "&nbsp;")
-    . "</th>";
-  $column_data{amount} =
-    "<th class=listtotal align=right>"
-    . $form->format_amount(\%myconfig, $totalamount, 2, "&nbsp;") . "</th>";
-  $column_data{paid} =
-    "<th class=listtotal align=right>"
-    . $form->format_amount(\%myconfig, $totalpaid, 2, "&nbsp;") . "</th>";
-  $column_data{due} =
-    "<th class=listtotal align=right>"
-    . $form->format_amount(\%myconfig, $totaldue, 2, "&nbsp;") . "</th>";
-
-  map { print "\n$column_data{$_}" } @column_index;
-
-  print qq|
-	</tr>
-      </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=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  $report->add_separator();
+  $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
 
-<input class=submit type=submit name=action value="|
-    . $locale->text('AR Transaction') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('Sales Invoice') . qq|">
-
-</form>
-
-</body>
-</html>
-|;
+  $report->generate_with_headers();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub ar_subtotal {
-  $lxdebug->enter_sub();
-
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
-
-  $column_data{tax} = "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotalamount - $subtotalnetamount,
-                           2, "&nbsp;")
-    . "</th>";
-  $column_data{amount} =
-    "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotalamount, 2, "&nbsp;") . "</th>";
-  $column_data{paid} =
-    "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotalpaid, 2, "&nbsp;") . "</th>";
-  $column_data{due} =
-    "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotaldue, 2, "&nbsp;") . "</th>";
-
-  $subtotalnetamount = 0;
-  $subtotalamount    = 0;
-  $subtotalpaid      = 0;
-  $subtotaldue       = 0;
-
-  $sameitem = $ar->{ $form->{sort} };
-
-  print "<tr class=listsubtotal>";
-
-  map { print "\n$column_data{$_}" } @column_index;
-
-  print "
-</tr>
-";
+sub storno {
+  $main::lxdebug->enter_sub();
 
-  $lxdebug->leave_sub();
-}
+  $main::auth->assert('general_ledger');
 
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-sub storno {
-  $lxdebug->enter_sub();
-
+  # don't cancel cancelled transactions
   if (IS->has_storno(\%myconfig, $form, 'ar')) {
     $form->{title} = $locale->text("Cancel Accounts Receivables Transaction");
     $form->error($locale->text("Transaction has already been cancelled!"));
   }
 
-  # negate amount/taxes
-  for my $i (1 .. $form->{rowcount}) {
-    $form->{"amount_$i"} *= -1;
-    $form->{"tax_$i"}    *= -1; 
-  }
-
-  # format things
-  for my $i (1 .. $form->{rowcount}) {
-    for (qw(amount tax)) {
-      $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) if $form->{"${_}_$i"};
-    }
-  }
-
-  $form->{storno}      = 1;
-  $form->{storno_id}   = $form->{id};
-  $form->{id}          = 0;
-
-  $form->{invnumber}   = "Storno-" . $form->{invnumber};
-
-  post();
+  AR->storno($form, \%myconfig, $form->{id});
 
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
@@ -1750,7 +1522,11 @@ sub storno {
     $form->{addition} = "STORNO";
     $form->save_history($form->dbconnect(\%myconfig));
   }
-  # /saving the history 
+  # /saving the history
+
+  $form->redirect(sprintf $locale->text("Transaction %d cancelled."), $form->{storno_id});
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
+
+1;