X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Far.pl;h=d6f55ff812d13d28f872311c50984fd1746410a2;hb=89dd4ca84494de24ac1ecc7bd3b84fdd35e28020;hp=a6ecec82fcf626c15d1dd0c8cf44b9e650921426;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index a6ecec82f..d6f55ff81 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -31,14 +31,20 @@
 #
 #======================================================================
 
+use POSIX qw(strftime);
 
 use SL::AR;
 use SL::IS;
 use SL::PE;
+use SL::ReportGenerator;
 
-require "$form->{path}/arap.pl";
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
+require "bin/mozilla/drafts.pl";
+require "bin/mozilla/report_generator.pl";
 
 1;
+
 # end of main
 
 # this is for our long dates
@@ -69,25 +75,38 @@ require "$form->{path}/arap.pl";
 # $locale->text('Nov')
 # $locale->text('Dec')
 
-
 sub add {
   $lxdebug->enter_sub();
 
+  return $lxdebug->leave_sub() if (load_draft_maybe());
 
-  $form->{title} = "Add";
-  $form->{callback} = "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}" unless $form->{callback};
+  # 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));
+  }
+  # /saving the history 
+  
+  $form->{title}    = "Add";
+  $form->{callback} =
+    "$form->{script}?action=add&login=$form->{login}&password=$form->{password}"
+    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();
 }
 
-
 sub edit {
   $lxdebug->enter_sub();
-
-
+  # show history button
+  $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+  #/show hhistory button
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
   $form->{title} = "Edit";
 
   &create_links;
@@ -96,34 +115,36 @@ sub edit {
   $lxdebug->leave_sub();
 }
 
-
 sub display_form {
   $lxdebug->enter_sub();
 
-
   &form_header;
   &form_footer;
 
   $lxdebug->leave_sub();
 }
 
-
 sub create_links {
   $lxdebug->enter_sub();
 
-
   $form->create_links("AR", \%myconfig, "customer");
   $duedate = $form->{duedate};
-  
+
   $taxincluded = $form->{taxincluded};
-  
+  my $id = $form->{id};
   IS->get_customer(\%myconfig, \%$form);
+  $form->{taxincluded} = $taxincluded;
+  $form->{id} = $id;
 
-  $form->{duedate} = $duedate if $duedate;
+  $form->{duedate}     = $duedate if $duedate;
   $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
+  $form->{rowcount}    = 1;
+
+  # notes
+  $form->{notes} = $form->{intnotes} unless $form->{notes};
 
   # currencies
-  @curr = split /:/, $form->{currencies};
+  @curr = split(/:/, $form->{currencies});
   chomp $curr[0];
   $form->{defaultcurrency} = $curr[0];
 
@@ -132,169 +153,108 @@ sub create_links {
   # customers
   if (@{ $form->{all_customer} }) {
     $form->{customer} = "$form->{customer}--$form->{customer_id}";
-    map { $form->{selectcustomer} .= "<option>$_->{name}--$_->{id}\n" } (@{ $form->{all_customer} });
+    map { $form->{selectcustomer} .= "<option>$_->{name}--$_->{id}\n" }
+      (@{ $form->{all_customer} });
   }
-  
+
   # 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->{department}       = "$form->{department}--$form->{department_id}";
+
+    map {
+      $form->{selectdepartment} .=
+        "<option>$_->{description}--$_->{id}\n"
+    } (@{ $form->{all_departments} });
   }
-  
+
   $form->{employee} = "$form->{employee}--$form->{employee_id}";
+
   # sales staff
   if (@{ $form->{all_employees} }) {
     $form->{selectemployee} = "";
-    map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}\n" } (@{ $form->{all_employees} });
+    map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}\n" }
+      (@{ $form->{all_employees} });
   }
+
   # build the popup menus
   $form->{taxincluded} = ($form->{id}) ? $form->{taxincluded} : "checked";
-  
-  map { $tax .= qq|<option value=\"$_->{taxkey}--$_->{rate}\">$_->{taxdescription}  |.($_->{rate} * 100).qq| %|} @{ $form->{TAX} };
-  $form->{taxchart} = $tax;
-  $form->{selecttaxchart} = $tax;
-  
-  # forex
-  $form->{forex} = $form->{exchangerate};
-  $exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
-  foreach $key (keys %{ $form->{AR_links} }) {
-       
-    foreach $ref (@{ $form->{AR_links}{$key} }) {
-      if ($key eq "AR_paid") {
-        $form->{"select$key"} .= "<option value=\"$ref->{accno}\">$ref->{accno}--$ref->{description}</option>\n";
-      } else {
-      $form->{"select$key"} .= "<option value=\"$ref->{accno}--$ref->{taxkey}\">$ref->{accno}--$ref->{description}</option>\n";
-      }
-    }
-
-    $form->{$key} = $form->{"select$key"};
-    # if there is a value we have an old entry
-    $j = 0;
-    for $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {
-      if ($key eq "AR_paid") {
-        $j++;
-	$form->{"AR_paid_$j"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
-	# reverse paid
-	$form->{"paid_$j"} = $form->{acc_trans}{$key}->[$i-1]->{amount} * -1;
-	$form->{"datepaid_$j"} = $form->{acc_trans}{$key}->[$i-1]->{transdate};
-	$form->{"source_$j"} = $form->{acc_trans}{$key}->[$i-1]->{source};
-	$form->{"memo_$j"} = $form->{acc_trans}{$key}->[$i-1]->{memo};
-
-	$form->{"forex_$j"} = $form->{"exchangerate_$i"} = $form->{acc_trans}{$key}->[$i-1]->{exchangerate};
-	$form->{"AR_paid_$j"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}";
-	$form->{paidaccounts}++;
-      } else {
-     
-	$akey = $key;
-	$akey =~ s/AR_//;
-	
-        if ($key eq "AR_tax") {
-	  $form->{"${key}_$form->{acc_trans}{$key}->[$i-1]->{accno}"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
-	  $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"} = $form->round_amount($form->{acc_trans}{$key}->[$i-1]->{amount} / $exchangerate, 2);
-	  
-	  if ($form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"} > 0) {
-	    $totaltax += $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"};
-	    $taxrate += $form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"};
-	  } else {
-	    $totalwithholding += $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"};
-	    $withholdingrate += $form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"};
-	  }
-
-	} else {
-	  $form->{"${akey}_$i"} = $form->round_amount($form->{acc_trans}{$key}->[$i-1]->{amount} / $exchangerate, 2);
-	  if ($akey eq 'amount') {
-	    $form->{rowcount}++;
-	    $totalamount += $form->{"${akey}_$i"};
-	    
-	    $form->{"oldprojectnumber_$i"} = $form->{"projectnumber_$i"} = "$form->{acc_trans}{$key}->[$i-1]->{projectnumber}";
-	    $form->{taxrate} = $form->{acc_trans}{$key}->[$i-1]->{rate};
-	    $form->{"project_id_$i"} = "$form->{acc_trans}{$key}->[$i-1]->{project_id}";
-	  }
-	  $form->{"${key}_$i"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
-	  $form->{"${key}_$i"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
-	   $form->{"select${key}"} =~ /(<option value=\"$form->{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*\">$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}<\/option>\n)/;
-	   $test = $1;
-	   $form->{"select${key}"} = $1;
-	   if ($akey eq 'amount') {
-	     $form->{selecttaxchart} =~ /(<option value=\"$form->{acc_trans}{$key}->[$i-1]->{taxkey}--[^<]*)/;
-	     $form->{selecttaxchart} = $1;
-	   }
-	}
-      }
-    }
-  }
-
-  $form->{taxincluded} = $taxincluded if ($form->{id});
-  $form->{paidaccounts} = 1 if not defined $form->{paidaccounts};
-  
-  if ($form->{taxincluded} && $form->{taxrate} && $totalamount) {
-  # add tax to amounts and invtotal
-    for $i (1 .. 1) {
-      $taxamount = ($totaltax + $totalwithholding) * $form->{"amount_$i"} / $totalamount;
-      $tax = $form->round_amount($taxamount, 2);
-      $diff += ($taxamount - $tax);
-      $form->{"amount_$i"} += $tax;
-    }
-    $form->{amount_1} += $form->round_amount($diff, 2);
-  }
 
-  # check if calculated is equal to stored
-  if ($form->{taxincluded} && $form->{taxrate} && $withholdingrate) {
-      if ($form->{"taxrate"} > 0) {
-	$taxamount = $form->round_amount(($form->{amount_1} - ($form->{amount_1} / ($form->{taxrate} + 1))), 2);
-      } else {
-	$taxamount = $form->round_amount(($totalamount + $totaltax + $totalwithholding) * $withholdingrate / (1 - $withholdingrate), 2) * $form->{"taxrate"} / $withholdingrate;
-      }
-  } else {
-    $taxamount = $totalamount * $form->{"taxrate"};
-    }
-  $taxamount = $form->round_amount($taxamount, 2);
-  $form->{tax} = $taxamount;
-
-  $form->{invtotal} = $totalamount + $totaltax + $totalwithholding;
-  
-  
-  $form->{locked} = ($form->datetonum($form->{transdate}, \%myconfig) <= $form->datetonum($form->{closedto}, \%myconfig));
+  AR->setup_form($form);
 
+  $form->{locked} =
+    ($form->datetonum($form->{transdate}, \%myconfig) <=
+     $form->datetonum($form->{closedto}, \%myconfig));
 
   $lxdebug->leave_sub();
 }
 
-
 sub form_header {
   $lxdebug->enter_sub();
 
-
   $title = $form->{title};
   $form->{title} = $locale->text("$title Accounts Receivables Transaction");
 
   $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
 
-
-# $locale->text('Add Accounts Receivables Transaction')
-# $locale->text('Edit Accounts Receivables Transaction')
-  
-  
-  $readonly = ($form->{id}) ?  "readonly" : "";
-  
-  $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
+  # $locale->text('Add Accounts Receivables Transaction')
+  # $locale->text('Edit Accounts Receivables Transaction')
+  $form->{javascript} = qq|<script type="text/javascript">
+  <!--
+  function setTaxkey(accno, row) {
+    var taxkey = accno.options[accno.selectedIndex].value;
+    var reg = /--([0-9]*)/;
+    var found = reg.exec(taxkey);
+    var index = found[1];
+    index = parseInt(index);
+    var tax = 'taxchart_' + row;
+    for (var i = 0; i < document.getElementById(tax).options.length; ++i) {
+      var reg2 = new RegExp("^"+ index, "");
+      if (reg2.exec(document.getElementById(tax).options[i].value)) {
+        document.getElementById(tax).options[i].selected = true;
+        break;
+      }
+    }
+  };
+  //-->
+  </script>|;
+  # show history button js
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+  #/show history button js
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
+  $readonly = ($form->{id}) ? "readonly" : "";
+
+  $form->{radier} =
+    ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
   $readonly = ($form->{radier}) ? "" : $readonly;
 
   # set option selected
   foreach $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->{"select$item"} =~
+      s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
   }
-  
-  map { $form->{$_} =~ s/\"/&quot;/g } qw(AR_amount AR taxchart);   
-  
+
+  $form->{exchangerate} = $exchangerate
+    if (
+        $form->{forex} = (
+                     $exchangerate =
+                       $form->check_exchangerate(
+                       \%myconfig, $form->{currency}, $form->{transdate}, 'buy'
+                       )));
+
   # format amounts
-  $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate});
-  
-  $form->{creditlimit} = $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0");
-  $form->{creditremaining} = $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0");
+  $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} =
+    $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0");
 
   $exchangerate = qq|
 <input type=hidden name=forex value=$form->{forex}>
@@ -302,46 +262,47 @@ sub form_header {
   if ($form->{currency} ne $form->{defaultcurrency}) {
     if ($form->{forex}) {
       $exchangerate .= qq|
-	<th align=right>|.$locale->text('Exchangerate').qq|</th>
+	<th align=right>| . $locale->text('Exchangerate') . qq|</th>
 	<td><input type=hidden name=exchangerate value=$form->{exchangerate}>$form->{exchangerate}</td>
 |;
     } else {
       $exchangerate .= qq|
-        <th align=right>|.$locale->text('Exchangerate').qq|</th>
+        <th align=right>| . $locale->text('Exchangerate') . qq|</th>
         <td><input name=exchangerate size=10 value=$form->{exchangerate}></td>
 |;
     }
   }
-  
-  $taxincluded = "";
 
   $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>
+		<th align=left nowrap>| . $locale->text('Tax Included') . qq|</th>
 	      </tr>
 |;
 
-
- 
   if (($rows = $form->numtextrows($form->{notes}, 50)) < 2) {
     $rows = 2;
   }
-  $notes = qq|<textarea name=notes rows=$rows cols=50 wrap=soft>$form->{notes}</textarea>|;
-  
+  $notes =
+    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>
+		<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";
 
-  $customer = ($form->{selectcustomer}) ? qq|<select name=customer>$form->{selectcustomer}</select>| : qq|<input name=customer value="$form->{customer}" size=35>|;
+  $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|
                 <input type=hidden name=employee value="$form->{employee}">
@@ -350,43 +311,115 @@ sub form_header {
   if ($form->{selectemployee}) {
     $employee = qq|
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Salesperson').qq|</th>
+		<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>
 |;
   }
 
+  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");
+
+  map({ $_->{link_split} = [ split(/:/, $_->{link}) ]; }
+      @{ $form->{ALL_CHARTS} });
+
+  my %project_labels = ();
+  my @project_values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@project_values, $item->{"id"});
+    $project_labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+
+  my (%AR_amount_labels, @AR_amount_values);
+  my (%AR_labels, @AR_values);
+  my (%AR_paid_labels, @AR_paid_values);
+  my %charts;
+  my $taxchart_init;
+
+  foreach my $item (@{ $form->{ALL_CHARTS} }) {
+    if (grep({ $_ eq "AR_amount" } @{ $item->{link_split} })) {
+      $taxchart_init = $item->{tax_id} if ($taxchart_init eq "");
+      my $key = "$item->{accno}--$item->{tax_id}";
+      push(@AR_amount_values, $key);
+      $AR_amount_labels{$key} =
+        "$item->{accno}--$item->{description}";
+
+    } elsif (grep({ $_ eq "AR" } @{ $item->{link_split} })) {
+      push(@AR_values, $item->{accno});
+      $AR_labels{$item->{accno}} = "$item->{accno}--$item->{description}";
+
+    } elsif (grep({ $_ eq "AR_paid" } @{ $item->{link_split} })) {
+      push(@AR_paid_values, $item->{accno});
+      $AR_paid_labels{$item->{accno}} =
+        "$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->{id});
+    push(@taxchart_values, $key);
+    $taxchart_labels{$key} =
+      "$item->{taxdescription} " . ($item->{rate} * 100) . ' %';
+    $taxcharts{$item->{id}} = $item;
+  }
+
   $form->{fokus} = "arledger.customer";
-  
+
   # 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}></td>
-       <td><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}" onBlur=\"check_right_date_format(this)\"></td>
+       <td><input type=button name=transdate id="trigger1" value=|
+      . $locale->text('button') . qq|></td>
        |;
-     $button2 = qq|
-       <td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>
-       <td><input type=button name=duedate id="trigger2" value=|.$locale->text('button').qq|></td></td>
+    $button2 = qq|
+       <td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\"></td>
+       <td><input type=button name=duedate id="trigger2" value=|
+      . $locale->text('button') . qq|></td></td>
      |;
+
     #write Trigger
-    $jsscript = Form->write_trigger(\%myconfig,"2","transdate","BL","trigger1","duedate","BL","trigger2");
-   }
-   else
-   {
-      # without JavaScript Calendar
-      $button1 = qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate}></td>|;
-      $button2 = qq|<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>|;
-    }
-  
+    $jsscript =
+      Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1",
+                          "duedate", "BL", "trigger2");
+  } else {
+
+    # without JavaScript Calendar
+    $button1 =
+      qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\"></td>|;
+    $button2 =
+      qq|<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\"></td>|;
+  }
+
+  $form->{javascript} .=
+    qq|<script type="text/javascript" src="js/common.js"></script>| .
+    qq|<script type="text/javascript" src="js/show_vc_details.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 onLoad="fokus()">
+<body onLoad="$onload">
 
 <form method=post name="arledger" action=$form->{script}>
 
@@ -396,6 +429,8 @@ sub form_header {
 <input type=hidden name=locked value=$form->{locked}>
 <input type=hidden name=title value="$title">
 
+| . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
+
 <table width=100%>
   <tr class=listtop>
     <th class=listtop>$form->{title}</th>
@@ -408,8 +443,8 @@ sub form_header {
 	  <td>
 	    <table>
 	      <tr>
-		<th align="right" nowrap>|.$locale->text('Customer').qq|</th>
-		<td colspan=3>$customer</td>
+		<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}">
@@ -420,9 +455,9 @@ sub form_header {
 		<td colspan=3>
 		  <table width=100%>
 		    <tr>
-		      <th align=left nowrap>|.$locale->text('Credit Limit').qq|</th>
+		      <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
 		      <td>$form->{creditlimit}</td>
-		      <th align=left nowrap>|.$locale->text('Remaining').qq|</th>
+		      <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}>
@@ -431,7 +466,7 @@ sub form_header {
 		</td>
 	      </tr>
 	      <tr>
-		<th align=right>|.$locale->text('Currency').qq|</th>
+		<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}>
@@ -447,84 +482,136 @@ sub form_header {
 	    <table>
 	      $employee
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Invoice Number').qq|</th>
+		<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>
+		<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>
+		<th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
                 $button1
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Due Date').qq|</th>
+		<th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
                 $button2
 	      </tr>
-	    </table>
+     </table>
 	  </td>
 	</tr>
       </table>
     </td>
   </tr>
-  <tr>
-    <td>
-      <table width=100%>
 
 $jsscript
-          
-  <input type=hidden name=AR_amount value="$form->{AR_amount}">
-  <input type=hidden name=taxchart value="$form->{taxchart}">
   <input type=hidden name=rowcount value=$form->{rowcount}>
+  <tr>
+      <td>
+          <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('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>
 |;
 
-  $form->{"tax"} = $form->format_amount(\%myconfig, $form->{"tax"}, 2);
-
-  $amount = $locale->text('Amount');
+  $amount  = $locale->text('Amount');
   $project = $locale->text('Project');
-  
-  for $i (1 .. 1) {
- 
-    
+
+  for $i (1 .. $form->{rowcount}) {
+
     # format amounts
-    $form->{"amount_$i"} = $form->format_amount(\%myconfig, $form->{"amount_$i"}, 2);
+    $form->{"amount_$i"} =
+      $form->format_amount(\%myconfig, $form->{"amount_$i"}, 2);
+    $form->{"tax_$i"} = $form->format_amount(\%myconfig, $form->{"tax_$i"}, 2);
+
+    my $selected_accno_full;
+    my ($accno_row) = split(/--/, $form->{"AR_amount_$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_AR_amount_$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_taxchart = $taxchart_init unless ($form->{"taxchart_$i"});
+
+    $selectAR_amount =
+      NTI($cgi->popup_menu('-name' => "AR_amount_$i",
+                           '-id' => "AR_amount_$i",
+                           '-style' => 'width:400px',
+                           '-onChange' => "setTaxkey(this, $i)",
+                           '-values' => \@AR_amount_values,
+                           '-labels' => \%AR_amount_labels,
+                           '-default' => $selected_accno_full))
+      . $cgi->hidden('-name' => "previous_AR_amount_$i",
+                     '-default' => $selected_accno_full);
+
+    $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>|;
+
+    $korrektur_checked = ($form->{"korrektur_$i"} ? 'checked' : '');
+
+    my $projectnumber =
+      NTI($cgi->popup_menu('-name' => "project_id_$i",
+                           '-values' => \@project_values,
+                           '-labels' => \%project_labels,
+                           '-default' => $form->{"project_id_$i"} ));
 
     print qq|
 	<tr>
-	  <th align=right>$amount</th>
-	  <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
-	  <th>$project</th>
-	  <td><input name="projectnumber_$i" size=20 value="$form->{"projectnumber_$i"}">
-	      <input type=hidden name="project_id_$i" value=$form->{"project_id_$i"}>
-	      <input type=hidden name="oldprojectnumber_$i" value="$form->{"oldprojectnumber_$i"}"></td>
-	  <td width=50%><select name="AR_amountselected">$form->{"selectAR_amount"}</select></td>
+          <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>
+          $tax
+          <td>$projectnumber</td>
 	</tr>
 |;
-    $amount = "";
+    $amount  = "";
     $project = "";
   }
 
-  $taxlabel = ($form->{taxincluded}) ? $locale->text('Tax Included') : $locale->text('Tax');
-
-  print qq|
-      <tr>
-	<th align=right nowrap>$taxlabel</th>
-	<td><input name="tax" size=10 value=$form->{"tax"}></td>
-	<td align=right></td>
-	<td></td>
-	<td><select name="taxchartselected">$form->{"selecttaxchart"}</select></td>
-      </tr>
-|;
-  
-
-
+  $form->{invtotal_unformatted} = $form->{invtotal};
   $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
 
+  $ARselected =
+    NTI($cgi->popup_menu('-name' => "ARselected", '-id' => "ARselected",
+                         '-style' => 'width:400px',
+                         '-values' => \@AR_values, '-labels' => \%AR_labels,
+                         '-default' => $form->{ARselected}));
+
   print qq|
         <tr>
-
-	  <th align=right>|.$locale->text('Total').qq|</th>
+          <td colspan=6>
+            <hr noshade>
+          </td>
+        </tr>
+        <tr>
+	  <td>${ARselected}</td>
 	  <th align=left>$form->{invtotal}</th>
 
 	  <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
@@ -532,14 +619,19 @@ $jsscript
 
 	  <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
 
-	  <td colspan=2></td>
-	  <td><select name=ARselected>$form->{selectAR}</select></td>
-          <input type=hidden name=AR value="$form->{AR}">
-  
+	  <td colspan=4></td>
+
+
         </tr>
+        </table>
+        </td>
+    </tr>
+    <tr>
+      <td>
+        <table width=100%>
         <tr>
-	  <th align=right>|.$locale->text('Notes').qq|</th>
-	  <td colspan=4>$notes</td>
+	  <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
+	  <td align=left>$notes</td>
 	</tr>
       </table>
     </td>
@@ -548,23 +640,25 @@ $jsscript
     <td>
       <table width=100%>
 	<tr class=listheading>
-	  <th colspan=6 class=listheading>|.$locale->text('Incoming Payments').qq|</th>
+	  <th colspan=7 class=listheading>|
+    . $locale->text('Incoming Payments') . qq|</th>
 	</tr>
 |;
 
   if ($form->{currency} eq $form->{defaultcurrency}) {
-    @column_index = qw(datepaid source memo paid AR_paid);
+    @column_index = qw(datepaid source memo paid AR_paid paid_project_id);
   } else {
-    @column_index = qw(datepaid source memo paid exchangerate AR_paid);
+    @column_index = qw(datepaid source memo paid exchangerate AR_paid paid_project_id);
   }
 
-  $column_data{datepaid} = "<th>".$locale->text('Date')."</th>";
-  $column_data{paid} = "<th>".$locale->text('Amount')."</th>";
-  $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{datepaid}     = "<th>" . $locale->text('Date') . "</th>";
+  $column_data{paid}         = "<th>" . $locale->text('Amount') . "</th>";
+  $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>"; 
+
   print "
         <tr>
 ";
@@ -573,6 +667,8 @@ $jsscript
         </tr>
 ";
 
+  my @triggers  = ();
+  my $totalpaid = 0;
 
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {
@@ -580,43 +676,89 @@ $jsscript
         <tr>
 ";
 
-    $form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
-    $form->{"selectAR_paid_$i"} =~ s/option value=\"$form->{"AR_paid_$i"}\">/option value=\"$form->{"AR_paid_$i"}\" selected>/;
+    $selectAR_paid =
+      NTI($cgi->popup_menu('-name' => "AR_paid_$i",
+                           '-id' => "AR_paid_$i",
+                           '-values' => \@AR_paid_values,
+                           '-labels' => \%AR_paid_labels,
+                           '-default' => $form->{"AR_paid_$i"}));
+
+    $totalpaid += $form->{"paid_$i"};
 
     # format amounts
-    $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
-    $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
+    if ($form->{"paid_$i"}) {
+      $form->{"paid_$i"} =
+        $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+    }
+    $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->{"forex_$i"}) {
-	$exchangerate = qq|<input type=hidden name="exchangerate_$i" value=$form->{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
+        $exchangerate =
+          qq|<input type=hidden name="exchangerate_$i" value=$form->{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
       } else {
-	$exchangerate = qq|<input name="exchangerate_$i" size=10 value=$form->{"exchangerate_$i"}>|;
+        $exchangerate =
+          qq|<input name="exchangerate_$i" size=10 value=$form->{"exchangerate_$i"}>|;
       }
     }
-    
+
     $exchangerate .= qq|
 <input type=hidden name="forex_$i" value=$form->{"forex_$i"}>
 |;
 
-    $column_data{paid} = qq|<td align=center><input name="paid_$i" size=11 value=$form->{"paid_$i"}></td>|;
-    $column_data{AR_paid} = qq|<td align=center><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
+    $column_data{paid} =
+      qq|<td align=center><input name="paid_$i" size=11 value="$form->{"paid_$i"}" onBlur=\"check_right_number_format(this)\"></td>|;
+    $column_data{AR_paid} =
+      qq|<td align=center>${selectAR_paid}</td>|;
     $column_data{exchangerate} = qq|<td align=center>$exchangerate</td>|;
-    $column_data{datepaid} = qq|<td align=center><input name="datepaid_$i" size=11 value=$form->{"datepaid_$i"}></td>|;
-    $column_data{source} = qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
-    $column_data{memo} = qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></td>|;
+    $column_data{datepaid}     =
+      qq|<td align=center><input name="datepaid_$i" id="datepaid_$i" size=11 value="$form->{"datepaid_$i"}" onBlur=\"check_right_date_format(this)\">
+         <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
+    $column_data{source} =
+      qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
+    $column_data{memo} =
+      qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></td>|;
+
+    $column_data{paid_project_id} =
+      qq|<td>|
+      . NTI($cgi->popup_menu('-name' => "paid_project_id_$i",
+                             '-values' => \@project_values,
+                             '-labels' => \%project_labels,
+                             '-default' => $form->{"paid_project_id_$i"} ))
+      . qq|</td>|;
 
     map { print qq|$column_data{$_}\n| } @column_index;
-    
+
     print "
         </tr>
 ";
+    push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
   }
-  map { $form->{$_} =~ s/\"/&quot;/g } qw(selectAR_paid);      
+
+  my $paid_missing = $form->{invtotal_unformatted} - $totalpaid;
+
   print qq|
+        <tr>
+          <td></td>
+          <td></td>
+          <td align="center">| . $locale->text('Total') . qq|</td>
+          <td align="center">| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td align="center">| . $locale->text('Missing amount') . qq|</td>
+          <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
+        </tr>
+| . $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+    qq|
 <input type=hidden name=paidaccounts value=$form->{paidaccounts}>
-<input type=hidden name=selectAR_paid value="$form->{selectAR_paid}">
 
       </table>
     </td>
@@ -630,56 +772,78 @@ $jsscript
   $lxdebug->leave_sub();
 }
 
-
 sub form_footer {
   $lxdebug->enter_sub();
 
-
   print qq|
 
+<input name=gldate type=hidden value="| . Q($form->{gldate}) . qq|">
+
 <input name=callback type=hidden value="$form->{callback}">
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
+|
+. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. qq|
 
 <br>
 |;
 
+  if (!$form->{id} && $form->{draft_id}) {
+    print(NTI($cgi->checkbox('-name' => 'remove_draft', '-id' => 'remove_draft',
+                             '-value' => 1, '-checked' => $form->{remove_draft},
+                             '-label' => '')) .
+          qq|&nbsp;<label for="remove_draft">| .
+          $locale->text("Remove draft when posting") .
+          qq|</label><br>|);
+  }
+
   $transdate = $form->datetonum($form->{transdate}, \%myconfig);
-  $closedto = $form->datetonum($form->{closedto}, \%myconfig);
-  
-  if ($form->{id} && $form->{radier}) {
-    
-      print qq|<input class=submit type=submit name=action value="|.$locale->text('Update').qq|">
-|;
+  $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
 
-    if (!$form->{revtrans}) {
-      if (!$form->{locked}) {
-	print qq|
-	<input class=submit type=submit name=action value="|.$locale->text('Post').qq|">
-	<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|">\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});
 
+  if ($form->{id}) {
+    if ($form->{radier}) {
+      print qq|
+        <input class=submit type=submit name=action value="| . $locale->text('Post') .            qq|">
+        <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|">
-|;
+        <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|"> |;
 
   } 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|">|;
+      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'));
     }
   }
 
   if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
+    require "bin/mozilla/menu.pl";
     &menubar;
   }
+  # 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|>|;
+  }
+  # /button for saving history
+  # 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
 
   print "
 </form>
@@ -691,143 +855,168 @@ sub form_footer {
   $lxdebug->leave_sub();
 }
 
+sub mark_as_paid {
+  $lxdebug->enter_sub();
+  &mark_as_paid_common(\%myconfig,"ar");  
+  $lxdebug->leave_sub();
+}
 
 sub update {
   $lxdebug->enter_sub();
 
   my $display = shift;
 
-#   if ($display) {
-#     goto TAXCALC;
-#   }
-
-
-  
   $form->{invtotal} = 0;
 
-  $form->{selectAR_amount} = $form->{AR_amount};
-  $form->{selectAR_amount}  =~ s/value=\"$form->{AR_amountselected}\"/value=\"$form->{AR_amountselected}\" selected/;
- 
-  $form->{selectAR} = $form->{AR};
-
-  $form->{selectAR}  =~ s/value=\"$form->{ARselected}\"/value=\"$form->{ARselected}\" selected/;
+  map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
+    qw(exchangerate creditlimit creditremaining);
 
-  ($AR_amountaccno, $AR_amounttaxkey) = split(/--/, $form->{AR_amountselected});  
-  $form->{selecttaxchart} = $form->{taxchart};
-  $form->{selecttaxchart}  =~ s/value=\"$AR_amounttaxkey--([^\"]*)\"/value=\"$AR_amounttaxkey--$1\" selected/; 
-  
-  $form->{rate} = $1; 
-      
-  map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining);
-
-  @flds = qw(amount AR_amount projectnumber oldprojectnumber project_id);
+  @flds  = qw(amount AR_amount projectnumber oldprojectnumber project_id);
   $count = 0;
-  @a = ();
-  for $i (1 .. 1) {
-    $form->{"amount_$i"} = $form->parse_amount(\%myconfig, $form->{"amount_$i"});
+  @a     = ();
+
+  for $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;
+          }
+        } else {
+          $form->{"tax_$i"} = 0;
+        }
+      }
+      $form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
 
+      $totaltax += $form->{"tax_$i"};
       map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
       $count++;
     }
   }
 
   $form->redo_rows(\@flds, \@a, $count, $form->{rowcount});
+  $form->{rowcount} = $count + 1;
+  map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. $form->{rowcount});
 
-  map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. 1);
-
-  $form->{exchangerate} = $exchangerate if ($form->{forex} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, 'buy')));
-
+  $form->{exchangerate} = $exchangerate
+    if (
+        $form->{forex} = (
+                     $exchangerate =
+                       $form->check_exchangerate(
+                       \%myconfig, $form->{currency}, $form->{transdate}, 'buy'
+                       )));
 
   $form->{invdate} = $form->{transdate};
   $save_AR = $form->{AR};
   &check_name(customer);
   $form->{AR} = $save_AR;
 
-  &check_project;
+  $form->{invtotal} =
+    ($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
 
+  for $i (1 .. $form->{paidaccounts}) {
+    if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
+      map {
+        $form->{"${_}_$i"} =
+          $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+      } qw(paid exchangerate);
 
-TAXCALC:
-  # recalculate taxes
+      $totalpaid += $form->{"paid_$i"};
 
-  @taxaccounts = split / /, $form->{taxaccounts};
-  
-  $form->{"tax"} = $form->parse_amount(\%myconfig, $form->{"tax"});
-  
-  if ($form->{taxincluded} && $form->{"rate"}) {
-    $taxrate = $form->{"rate"};
-    $withholdingrate = 0;
-
-   $amount = $form->round_amount(($form->{invtotal} - ($form->{invtotal} / ($taxrate + 1))), 2);
-   $form->{"tax"} = $form->round_amount($amount, 2);
-   $taxdiff += ($amount - $form->{"tax"});
-
-	
-   if (abs $taxdiff >= 0.005) {
-   	$form->{"tax"} += $form->round_amount($taxdiff, 2);
-   	$taxdiff = 0;
-   }
-   $totaltax += $form->{"tax"};
- 
-  } else {
-   $form->{"tax"} = $form->round_amount($form->{invtotal} * $form->{"rate"}, 2);
-   $totaltax += $form->{"tax"};
-    
+      $form->{"exchangerate_$i"} = $exchangerate
+        if (
+            $form->{"forex_$i"} = (
+                 $exchangerate =
+                   $form->check_exchangerate(
+                   \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy'
+                   )));
+    }
   }
 
-  $form->{invtotal} = ($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
+  $form->{creditremaining} -=
+    ($form->{invtotal} - $totalpaid + $form->{oldtotalpaid} -
+     $form->{oldinvtotal});
+  $form->{oldinvtotal}  = $form->{invtotal};
+  $form->{oldtotalpaid} = $totalpaid;
+
+  &display_form;
+
+  $lxdebug->leave_sub();
+}
+
+sub post_payment {
+  $lxdebug->enter_sub();
+
+  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 
   for $i (1 .. $form->{paidaccounts}) {
-    if ($form->{"paid_$i"}) {
-      map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(paid exchangerate);
+    if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
+      $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
 
-      $totalpaid += $form->{"paid_$i"};
+      $form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
+
+      $form->error($locale->text('Cannot post payment for a closed period!'))
+        if ($datepaid <= $closedto);
 
-      $form->{"exchangerate_$i"} = $exchangerate if ($form->{"forex_$i"} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy')));
+      if ($form->{currency} ne $form->{defaultcurrency}) {
+        $form->{"exchangerate_$i"} = $form->{exchangerate}
+          if ($invdate == $datepaid);
+        $form->isblank("exchangerate_$i",
+                       $locale->text('Exchangerate for payment missing!'));
+      }
     }
   }
 
-  $form->{creditremaining} -= ($form->{invtotal} - $totalpaid + $form->{oldtotalpaid} - $form->{oldinvtotal});
-  $form->{oldinvtotal} = $form->{invtotal};
-  $form->{oldtotalpaid} = $totalpaid;
-  
-  &display_form;
-  
+  ($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!'));
+
+
   $lxdebug->leave_sub();
 }
 
-
 sub post {
   $lxdebug->enter_sub();
 
-
   # 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!'));
+  $form->isblank("duedate",   $locale->text('Due Date missing!'));
+  $form->isblank("customer",  $locale->text('Customer missing!'));
 
-  $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+  $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);
 
-  $form->isblank("exchangerate", $locale->text('Exchangerate missing!')) if ($form->{currency} ne $form->{defaultcurrency});
-  
-  delete ($form->{AR});
-  
+  $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});
+
+  delete($form->{AR});
+
   for $i (1 .. $form->{paidaccounts}) {
-    if ($form->{"paid_$i"}) {
+    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);
+      $form->error($locale->text('Cannot post payment for a closed period!'))
+        if ($datepaid <= $closedto);
 
       if ($form->{currency} ne $form->{defaultcurrency}) {
-	$form->{"exchangerate_$i"} = $form->{exchangerate} if ($transdate == $datepaid);
-	$form->isblank("exchangerate_$i", $locale->text('Exchangerate for payment missing!'));
+        $form->{"exchangerate_$i"} = $form->{exchangerate} if ($transdate == $datepaid);
+        $form->isblank("exchangerate_$i", $locale->text('Exchangerate for payment missing!'));
       }
     }
   }
@@ -839,42 +1028,61 @@ sub post {
     exit;
   }
 
-
-  ($creditaccno, $credittaxkey) = split /--/, $form->{AR_amountselected};
-  ($taxkey, $NULL) = split /--/, $form->{taxchartselected};
-  ($receivablesaccno, $payablestaxkey) = split /--/, $form->{ARselected};  
-  $form->{AR}{amount_1} = $creditaccno;
-  $form->{AR}{receivables} = $receivablesaccno;
-  $form->{taxkey} = $taxkey;
-  
-  $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber") unless $form->{invnumber};
+  $form->{AR}{receivables} = $form->{ARselected};
+  $form->{storno}          = 0;
 
   $form->{id} = 0 if $form->{postasnew};
 
-  $form->redirect($locale->text('Transaction posted!')) if (AR->post_transaction(\%myconfig, \%$form));
+
+  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!'));
 
   $lxdebug->leave_sub();
 }
 
-
 sub post_as_new {
   $lxdebug->enter_sub();
 
-
   $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));
+  }
+  # /saving the history 
   &post;
 
   $lxdebug->leave_sub();
 }
 
+sub use_as_template {
+  $lxdebug->enter_sub();
+
+  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;
+  $form->{rowcount}--;
+  $form->{invdate} = $form->current_date(\%myconfig);
+  &update;
+
+  $lxdebug->leave_sub();
+}
 
 sub delete {
   $lxdebug->enter_sub();
 
-
   $form->{title} = $locale->text('Confirm!');
-  
+
   $form->header;
 
   delete $form->{header};
@@ -886,16 +1094,19 @@ sub delete {
 |;
 
   foreach $key (keys %$form) {
-    $form->{$key} =~ s/\"/&quot;/g;  
+    $form->{$key} =~ s/\"/&quot;/g;
     print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
   }
 
   print qq|
 <h2 class=confirm>$form->{title}</h2>
 
-<h4>|.$locale->text('Are you sure you want to delete Transaction').qq| $form->{invnumber}</h4>
+<h4>|
+    . $locale->text('Are you sure you want to delete Transaction')
+    . qq| $form->{invnumber}</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>
 
 </body>
@@ -905,80 +1116,108 @@ sub delete {
   $lxdebug->leave_sub();
 }
 
-
-
 sub yes {
   $lxdebug->enter_sub();
-
-
-  $form->redirect($locale->text('Transaction deleted!')) if (AR->delete_transaction(\%myconfig, \%$form, $spool));
+  if (AR->delete_transaction(\%myconfig, \%$form, $spool)) {
+    # saving the history
+    if(!exists $form->{addition}) {
+      $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
+  	  $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 search {
   $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} };
+  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>|;
   }
 
-  # departments 
+  # 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>
+  $department = qq|
+        <tr>
+	  <th align=right nowrap>| . $locale->text('Department') . qq|</th>
 	  <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
 	</tr>
 | if $form->{selectdepartment};
-    
+
   $form->{title} = $locale->text('AR Transactions');
   
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
+  
   # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
-  $jsscript = "";    
-  if ($form->{jsscript}) 
-  {
+  $form->{jsscript} = 1;
+  $jsscript = "";
+  if ($form->{jsscript}) {
+
     # with JavaScript Calendar
     $button1 = qq|
-       <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}">
-       <input type=button name=transdatefrom id="trigger1" value=|.$locale->text('button').qq|></td>
+       <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}">
-       <input type=button name=transdateto name=transdateto id="trigger2" 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}"></td>|;
-      $button2 = qq|
-                              <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
-    }
-  
-  $form->{fokus} = "search.customer";  
+
+    #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 });
+
+  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));
+
+  $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="fokus()">
+<body onLoad="$onload">
 
 <form method=post name="search" action=$form->{script}>
 
@@ -989,26 +1228,34 @@ sub search {
     <td>
       <table>
 	<tr>
-	  <th align=right>|.$locale->text('Customer').qq|</th>
+	  <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>
+	  <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>
+	  <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>
+	  <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>
+	  <th align=right nowrap>| . $locale->text('From') . qq|</th>
           $button1
-	  <th align=right>|.$locale->text('Bis').qq|</th>
+	  <th align=right>| . $locale->text('Bis') . qq|</th>
           $button2
 	</tr>
 	<input type=hidden name=sort value=transdate>
@@ -1019,58 +1266,62 @@ sub search {
     <td>
       <table>
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Include in Report').qq|</th>
+	  <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 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>
+		<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 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 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 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>
+		<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 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 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 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>
+		<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 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 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 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>
+		<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 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 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 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>
+		<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 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>
@@ -1085,12 +1336,12 @@ sub search {
 
 <input type=hidden name=nextsub value=$form->{nextsub}>
 
-<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>
 
@@ -1104,291 +1355,226 @@ $jsscript
   $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 };
+
+  $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2);
+
+  map { $totals->{$_} = 0 } @{ $subtotal_columns };
+
+  $lxdebug->leave_sub();
+
+  return $row;
+}
 
 sub ar_transactions {
   $lxdebug->enter_sub();
 
-
-  $form->{customer} = $form->unescape($form->{customer});
   ($form->{customer}, $form->{customer_id}) = split(/--/, $form->{customer});
 
-  
+  $form->{sort} ||= 'transdate';
+
   AR->ar_transactions(\%myconfig, \%$form);
 
-  $callback = "$form->{script}?action=ar_transactions&path=$form->{path}&login=$form->{login}&password=$form->{password}";
-  $href = $callback;
+  $form->{title} = $locale->text('AR Transactions');
+
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
+
+  my @columns =
+    qw(transdate id type invnumber ordnumber name netamount tax amount paid
+       datepaid due duedate transaction_description notes employee shippingpoint shipvia
+       globalprojectnumber);
+
+  my @hidden_variables = map { "l_${_}" } @columns;
+  push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber transaction_description notes project_id transdatefrom transdateto);
+
+  my $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'), },
+    'employee'                => { 'text' => $locale->text('Salesperson'), },
+    'shippingpoint'           => { 'text' => $locale->text('Shipping Point'), },
+    'shipvia'                 => { 'text' => $locale->text('Ship via'), },
+    'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
+  );
+
+  foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid
+                       employee shippingpoint shipvia)) {
+    $column_defs{$name}->{link} = $href . "&sort=$name";
+  }
+
+  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);
 
+  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";
+    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}) {
+    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') . "&nbsp;" . $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') . "&nbsp;" . $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');
-  }
-
-  @columns = $form->sort_columns(qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee shippingpoint shipvia));
-  
-  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";
-    }
-  }
-
-  if ($form->{l_subtotal} eq 'Y') {
-    $callback .= "&l_subtotal=Y";
-    $href .= "&l_subtotal=Y";
+    push @options, $locale->text('Closed');
   }
-  
-
-  $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{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>";
-
-  $form->{title} = $locale->text('AR Transactions');
-
-  $form->header;
-
-  print qq|
-<body>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>$option</td>
-  </tr>
-  <tr>
-    <td>
-      <table width=100%>
-	<tr class=listheading>
-|;
-
-  map { print "\n$column_header{$_}" } @column_index;
-
-  print qq|
-	</tr>
-|;
 
+  $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();
 
   # add sort and escape callback, this one we use for the add sub
-  $form->{callback} = $callback .= "&sort=$form->{sort}";
+  $form->{callback} = $href .= "&sort=$form->{sort}";
 
   # escape callback for href
-  $callback = $form->escape($callback);
-  
-  if (@{ $form->{AR} }) {
-    $sameitem = $form->{AR}->[0]->{$form->{sort}};
-  }
-  
-  # sums and tax on reports by Antonio Gallardo
-  #
-  foreach $ar (@{ $form->{AR} }) {
+  $callback = $form->escape($href);
 
-    if ($form->{l_subtotal} eq 'Y') {
-      if ($sameitem ne $ar->{$form->{sort}}) {
-	&ar_subtotal;
-      }
-    }
-    
-    $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}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}</a></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>";
-
-    $i++; $i %= 2;
-    print "
-        <tr class=listrow$i>
-";
+  my @subtotal_columns = qw(netamount amount paid due);
 
-    map { print "\n$column_data{$_}" } @column_index;
+  my %totals    = map { $_ => 0 } @subtotal_columns;
+  my %subtotals = map { $_ => 0 } @subtotal_columns;
 
-    print qq|
-        </tr>
-|;
+  my $idx = 0;
 
-  
-  }
+  foreach $ar (@{ $form->{AR} }) {
+    $ar->{tax} = $ar->{amount} - $ar->{netamount};
+    $ar->{due} = $ar->{amount} - $ar->{paid};
 
-  if ($form->{l_subtotal} eq 'Y') {
-    &ar_subtotal;
-  }
+    map { $subtotals{$_} += $ar->{$_};
+          $totals{$_}    += $ar->{$_} } @subtotal_columns;
 
-  # print totals
-  print qq|
-        <tr class=listtotal>
-|;
+    map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due);
 
-  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>";
+    my $is_storno  = $ar->{storno} && IS->is_storno(\%myconfig, $form, 'ar');
+    my $has_storno = $ar->{storno} && !$is_storno;
 
-  map { print "\n$column_data{$_}" } @column_index;
+    $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)");
 
-  print qq|
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
+    my $row = { };
 
-<br>
-<form method=post action=$form->{script}>
+    foreach my $column (@columns) {
+      $row->{$column} = {
+        'data'  => $ar->{$column},
+        'align' => $column_alignment{$column},
+      };
+    }
 
-<input name=callback type=hidden value="$form->{callback}">
+    $row->{invnumber}->{link} = build_std_url("script=" . ($ar->{invoice} ? 'is.pl' : 'ar.pl'), 'action=edit')
+      . "&id=" . E($ar->{id}) . "&callback=${callback}";
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+    my $row_set = [ $row ];
+
+    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');
+    }
 
-<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|">|;
+    $report->add_data($row_set);
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
+    $idx++;
   }
 
-  print qq|
-</form>
+  $report->add_separator();
+  $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
 
-</body>
-</html>
-|;
+  $report->generate_with_headers();
 
   $lxdebug->leave_sub();
 }
 
-
-sub ar_subtotal {
+sub storno {
   $lxdebug->enter_sub();
 
+  if (IS->has_storno(\%myconfig, $form, 'ar')) {
+    $form->{title} = $locale->text("Cancel Accounts Receivables Transaction");
+    $form->error($locale->text("Transaction has already been cancelled!"));
+  }
 
-  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;
+  # negate amount/taxes
+  for my $i (1 .. $form->{rowcount}) {
+    $form->{"amount_$i"} *= -1;
+    $form->{"tax_$i"}    *= -1; 
+  }
 
-  $sameitem = $ar->{$form->{sort}};
-  
-  print "<tr class=listsubtotal>";
+  # format things
+  for my $i (1 .. $form->{rowcount}) {
+    for (qw(amount tax)) {
+      $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) if $form->{"${_}_$i"};
+    }
+  }
 
-  map { print "\n$column_data{$_}" } @column_index;
+  $form->{storno}      = 1;
+  $form->{storno_id}   = $form->{id};
+  $form->{id}          = 0;
 
-print "
-</tr>
-";
- 
-  $lxdebug->leave_sub();
-}
+  $form->{invnumber}   = "Storno-" . $form->{invnumber};
 
+  post();
 
+  # 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 
 
+  $lxdebug->leave_sub();
+}