From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 3 Apr 2012 09:53:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'cebitversion/kivitendo_style'
X-Git-Tag: release-3.0.0beta1~344^2~7
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/c707edd523dc852f3bd11008d64ab3cb1daca545?hp=e39733b27117138516ec4d566261c9570f07ff69

Merge remote-tracking branch 'cebitversion/kivitendo_style'

Conflicts:
	SL/Form.pm
---

diff --git a/SL/DB/DeliveryOrder.pm b/SL/DB/DeliveryOrder.pm
index 0a483bfaa..9c860bf7e 100644
--- a/SL/DB/DeliveryOrder.pm
+++ b/SL/DB/DeliveryOrder.pm
@@ -13,7 +13,7 @@ use List::Util qw(first);
 __PACKAGE__->meta->add_relationship(orderitems => { type         => 'one to many',
                                                     class        => 'SL::DB::DeliveryOrderItem',
                                                     column_map   => { id => 'delivery_order_id' },
-                                                    manager_args => { with_objects => [ 'part' ] }
+                                                    manager_args => { with_objects => [ 'parts' ] }
                                                   },
                                     shipto => { type       => 'one to one',
                                                 class      => 'SL::DB::Shipto',
@@ -45,4 +45,16 @@ sub sales_order {
   return first { $_->is_type('sales_order') } @{ $orders };
 }
 
+sub type {
+  return shift->customer_id ? 'sales_delivery_order' : 'purchase_delivery_order';
+}
+
+sub displayable_state {
+  my ($self) = @_;
+
+  return join '; ',
+    ($self->closed    ? $::locale->text('closed')    : $::locale->text('open')),
+    ($self->delivered ? $::locale->text('delivered') : $::locale->text('not delivered'));
+}
+
 1;
diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index 14c11fa7d..c330084ed 100644
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -236,6 +236,22 @@ sub _post_update_allocated {
   }
 }
 
+sub invoice_type {
+  my ($self) = @_;
+
+  return 'ar_transaction'     if !$self->invoice;
+  return 'credit_note'        if $self->type eq 'credit_note' && $self->amount < 0 && !$self->storno;
+  return 'invoice_storno'     if $self->type ne 'credit_note' && $self->amount < 0 &&  $self->storno;
+  return 'credit_note_storno' if $self->type eq 'credit_note' && $self->amount > 0 &&  $self->storno;
+  return 'invoice';
+}
+
+sub displayable_state {
+  my $self = shift;
+
+  return $self->closed ? $::locale->text('closed') : $::locale->text('open');
+}
+
 1;
 
 __END__
diff --git a/SL/DB/Order.pm b/SL/DB/Order.pm
index 6b31cd235..e28a87c7d 100644
--- a/SL/DB/Order.pm
+++ b/SL/DB/Order.pm
@@ -84,6 +84,23 @@ sub is_type {
   return shift->type eq shift;
 }
 
+sub displayable_type {
+  my $type = shift->type;
+
+  return $::locale->text('Sales quotation')   if $type eq 'sales_quotation';
+  return $::locale->text('Request quotation') if $type eq 'request_quotation';
+  return $::locale->text('Sales Order')       if $type eq 'sales_order';
+  return $::locale->text('Purchase Order')    if $type eq 'purchase_order';
+
+  die 'invalid type';
+}
+
+
+sub is_sales {
+  croak 'not an accessor' if @_ > 1;
+  return shift->customer_id;
+}
+
 sub invoices {
   my $self   = shift;
   my %params = @_;
@@ -100,6 +117,12 @@ sub invoices {
   }
 }
 
+sub displayable_state {
+  my ($self) = @_;
+
+  return $self->closed ? $::locale->text('closed') : $::locale->text('open');
+}
+
 sub abschlag_invoices {
   return shift()->invoices(query => [ abschlag => 1 ]);
 }
diff --git a/SL/Form.pm b/SL/Form.pm
index 392cd6648..95f4099e3 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -464,7 +464,12 @@ sub get_stylesheet_for_user {
   my $css_path = 'css';
   if (my $user_style = $::myconfig{stylesheet}) {
     $user_style =~ s/\.css$//; # nuke trailing .css, this is a remnand of pre 2.7.0 stylesheet handling
-    $css_path = "$css_path/$user_style" if -d "$css_path/$user_style";
+    if (-d "$css_path/$user_style" &&
+        -f "$css_path/$user_style/main.css") {
+      $css_path = "$css_path/$user_style";
+    } else {
+      $css_path = "$css_path/lx-office-erp";
+    }
   } else {
     $css_path = "$css_path/lx-office-erp";
   }
@@ -502,6 +507,7 @@ sub header {
   push @header, "<link rel='shortcut icon' href='$self->{favicon}' type='image/x-icon'>" if -f $self->{favicon};
   push @header, map { qq|<script type="text/javascript" src="js/$_.js"></script>| }
        qw(jquery common jscalendar/calendar jscalendar/lang/calendar-de jscalendar/calendar-setup part_selection jquery-ui jqModal switchmenuframe);
+  push @header, $self->{javascript} if $self->{javascript};
   push @header, map { qq|<link rel="stylesheet" type="text/css" href="$css_path/$_.css">| }
        qw(main menu tabcontent list_accounts jquery.autocomplete jquery.multiselect2side frame_header/header ui-lightness/jquery-ui-1.8.12.custom);
   push @header, map { qq|<link rel="stylesheet" type="text/css" href="js/jscalendar/calendar-win2k-1.css">| }
@@ -2540,13 +2546,17 @@ sub all_vc {
 
   $table = $table eq "customer" ? "customer" : "vendor";
 
-  my $query = qq|SELECT count(*) FROM $table WHERE NOT obsolete|;
+  # build selection list
+  # Hotfix für Bug 1837 - Besser wäre es alte Buchungsbelege
+  # OHNE Auswahlliste (reines Textfeld) zu laden. Hilft aber auch
+  # nicht für veränderbare Belege (oe, do, ...)
+  my $obsolete = "WHERE NOT obsolete" unless $self->{id};
+  my $query = qq|SELECT count(*) FROM $table $obsolete|;
   my ($count) = selectrow_query($self, $dbh, $query);
 
-  # build selection list
-  if ($count <= $myconfig->{vclimit}) {
+  if ($count < $myconfig->{vclimit}) {
     $query = qq|SELECT id, name, salesman_id
-                FROM $table WHERE NOT obsolete
+                FROM $table $obsolete
                 ORDER BY name|;
     $self->{"all_$table"} = selectall_hashref_query($self, $dbh, $query);
   }
diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm
index f81435e71..3f5cdebba 100644
--- a/SL/ReportGenerator.pm
+++ b/SL/ReportGenerator.pm
@@ -204,8 +204,11 @@ sub set_custom_headers {
 sub get_attachment_basename {
   my $self     = shift;
   my $filename =  $self->{options}->{attachment_basename} || 'report';
+
+  # FIXME: this is bonkers. add a real sluggify method somewhere or import one.
   $filename    =~ s|.*\\||;
   $filename    =~ s|.*/||;
+  $filename    =~ s| |_|g;
 
   return $filename;
 }
@@ -228,6 +231,7 @@ sub generate_with_headers {
     print $self->generate_html_content();
 
   } elsif ($format eq 'csv') {
+    # FIXME: don't do mini http in here
     my $filename = $self->get_attachment_basename();
     print qq|content-type: text/csv\n|;
     print qq|content-disposition: attachment; filename=${filename}.csv\n\n|;
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index cd30053ed..e69e13cbf 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -32,7 +32,7 @@
 #======================================================================
 
 use POSIX qw(strftime);
-use List::Util qw(sum first);
+use List::Util qw(sum first max);
 
 use SL::AR;
 use SL::FU;
@@ -218,19 +218,16 @@ sub form_header {
   my $cgi      = $::request->{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);
+  my ($notes, $department, $customer, $employee, $amount, $project);
+  my ($onload);
+  my ($ARselected);
 
 
   $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')
+  $form->{title} = $locale->text("$title Accounts Receivables Transaction");
+
   $form->{javascript} = qq|<script type="text/javascript">
   <!--
   function setTaxkey(accno, row) {
@@ -253,90 +250,23 @@ sub form_header {
   # 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;
+  $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
   $readonly = ($form->{radier}) ? "" : $readonly;
 
   # set option selected
   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->{"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->{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");
-
-  $exchangerate = qq|
-<input type=hidden name=forex value=$form->{forex}>
-|;
-  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>
-|;
-    } else {
-      $exchangerate .= qq|
-        <th align=right>| . $locale->text('Exchangerate') . qq|</th>
-        <td><input name=exchangerate size=10 value=$form->{exchangerate}></td>
-|;
-    }
-  }
-
-  $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>
-|;
-
-  if (($rows = $form->numtextrows($form->{notes}, 50)) < 2) {
-    $rows = 2;
-  }
-  $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>
-                <td colspan=3><select name=department>$form->{selectdepartment}</select>
-                <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
-                </td>
-              </tr>
-| if $form->{selectdepartment};
-
-  my $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
-
-  $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}">
-|;
-
-  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>
-|;
-  }
+  $rows = max 2, $form->numtextrows($form->{notes}, 50);
 
-  my @old_project_ids = ();
-  map({ push(@old_project_ids, $form->{"project_id_$_"})
-          if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
+  my @old_project_ids = grep { $_ } map { $form->{"project_id_$_"} } 1..$form->{rowcount};
 
   $form->get_lists("projects"  => { "key"       => "ALL_PROJECTS",
                                     "all"       => 0,
@@ -346,40 +276,32 @@ sub form_header {
                    "taxcharts" => { "key"       => "ALL_TAXCHARTS",
                                     "module"    => "AR" },);
 
-  map({ $_->{link_split} = [ split(/:/, $_->{link}) ]; }
-      @{ $form->{ALL_CHARTS} });
+  $_->{link_split} = { map { $_ => 1 } split/:/, $_->{link} } for @{ $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 %project_labels = map { $_->{id} => $_->{projectnumber} } @{ $form->{"ALL_PROJECTS"} };
 
-  my (%AR_amount_labels, @AR_amount_values);
-  my (%AR_labels, @AR_values);
-  my (%AR_paid_labels, @AR_paid_values);
+  my (@AR_amount_values);
+  my (@AR_values);
+  my (@AR_paid_values);
+  my %chart_labels;
   my %charts;
   my $taxchart_init;
 
   foreach my $item (@{ $form->{ALL_CHARTS} }) {
-    if (grep({ $_ eq "AR_amount" } @{ $item->{link_split} })) {
+    if ($item->{link_split}{AR_amount}) {
       $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} })) {
+    } elsif ($item->{link_split}{AR}) {
       push(@AR_values, $item->{accno});
-      $AR_labels{$item->{accno}} = "$item->{accno}--$item->{description}";
-
-    } elsif (grep({ $_ eq "AR_paid" } @{ $item->{link_split} })) {
+    } elsif ($item->{link_split}{AR_paid}) {
       push(@AR_paid_values, $item->{accno});
-      $AR_paid_labels{$item->{accno}} =
-        "$item->{accno}--$item->{description}";
     }
 
+    # weirdness for AR_amount
+    $chart_labels{$item->{accno}} = "$item->{accno}--$item->{description}";
+    $chart_labels{"$item->{accno}--$item->{tax_id}"} = "$item->{accno}--$item->{description}";
+
     $charts{$item->{accno}} = $item;
   }
 
@@ -390,184 +312,33 @@ sub form_header {
     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) . ' %';
+    $taxchart_labels{$key} = "$item->{taxdescription} " . ($item->{rate} * 100) . ' %';
     $taxcharts{$item->{id}} = $item;
   }
 
   $form->{fokus} = "arledger.customer";
 
-  # use JavaScript Calendar or not
-  $form->{jsscript} = 1;
-  $jsscript = "";
-  if ($form->{jsscript}) {
-
-    # with 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>
-       <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}" 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}" 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>|;
-  }
-
   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/follow_up.js"></script>|;
 
-  my $globalprojectnumber =
-    NTI($cgi->popup_menu('-name' => "globalproject_id",
-                         '-values' => \@project_values,
-                         '-labels' => \%project_labels,
-                         '-default' => $form->{"globalproject_id"} ));
-
-  $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">
-
-<form method=post name="arledger" action=$form->{script}>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=sort value=$form->{sort}>
-<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|
-
-<table width=100%>
-  <tr class=listtop>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr valign=top>
-    <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="| . $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>
-                $button2
-              </tr>
-              <tr>
-                <th align=right nowrap>| . $locale->text('Project Number') . qq|</th>
-                <td>$globalprojectnumber</td>
-              </tr>
-     </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-
-$jsscript
-  <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('Taxkey') . qq|</th>
-          <th class=listheading style="width:10%">|
-    . $locale->text('Project') . qq|</th>
-        </tr>
-|;
 
-  $amount  = $locale->text('Amount');
-  $project = $locale->text('Project');
+#  $amount  = $locale->text('Amount');
+#  $project = $locale->text('Project');
 
+  my @transactions;
   for my $i (1 .. $form->{rowcount}) {
-
-    # format amounts
-    $form->{"amount_$i"} =
-      $form->format_amount(\%myconfig, $form->{"amount_$i"}, 2);
-    $form->{"tax_$i"} = $form->format_amount(\%myconfig, $form->{"tax_$i"}, 2);
+    my $transaction = {
+      amount     => $form->{"amount_$i"},
+      tax        => $form->{"tax$i"},
+      project_id => $form->{"project_id_$i"},
+    };
 
     my $selected_accno_full;
     my ($accno_row) = split(/--/, $form->{"AR_amount_$i"});
@@ -593,280 +364,89 @@ $jsscript
       }
     }
 
-    $selectAR_amount =
+    $transaction->{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,
+                           '-labels' => \%chart_labels,
                            '-default' => $selected_accno_full))
       . $cgi->hidden('-name' => "previous_AR_amount_$i",
                      '-default' => $selected_accno_full);
 
-    $tax = qq|<td>| .
+    $transaction->{tax} =
       NTI($cgi->popup_menu('-name' => "taxchart_$i",
                            '-id' => "taxchart_$i",
                            '-style' => 'width:200px',
                            '-values' => \@taxchart_values,
                            '-labels' => \%taxchart_labels,
-                           '-default' => $selected_taxchart))
-      . qq|</td>|;
+                           '-default' => $selected_taxchart));
 
-    my $projectnumber =
-      NTI($cgi->popup_menu('-name' => "project_id_$i",
-                           '-values' => \@project_values,
-                           '-labels' => \%project_labels,
-                           '-default' => $form->{"project_id_$i"} ));
-
-    print qq|
-        <tr>
-          <td>$selectAR_amount</td>
-          <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
-          <td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>
-          $tax
-          <td>$projectnumber</td>
-        </tr>
-|;
-    $amount  = "";
-    $project = "";
+    push @transactions, $transaction;
   }
 
   $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,
+                         '-values' => \@AR_values, '-labels' => \%chart_labels,
                          '-default' => $form->{ARselected}));
 
-  print qq|
-        <tr>
-          <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}>
-          <input type=hidden name=oldtotalpaid value=$form->{oldtotalpaid}>
-
-          <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
-
-          <td colspan=4></td>
-
-
-        </tr>
-        </table>
-        </td>
-    </tr>
-    <tr>
-      <td>
-        <table width=100%>
-        <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>|
-    . $locale->text('Incoming Payments') . qq|</th>
-        </tr>
-|;
 
-  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);
-  }
-
-  $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>
-";
-  map { print "$column_data{$_}\n" } @column_index;
-  print "
-        </tr>
-";
+  $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
 
-  my @triggers  = ();
-  $form->{totalpaid} = 0;
+  my $now = $form->current_date(\%myconfig);
 
-  $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
+  my @payments;
   for my $i (1 .. $form->{paidaccounts}) {
-    print "
-        <tr>
-";
-
-    $selectAR_paid =
+    my $payment = {
+      paid             => $form->{"paid_$i"},
+      exchangerate     => $form->{"exchangerate_$i"} || '',
+      gldate           => $form->{"gldate_$i"},
+      acc_trans_id     => $form->{"acc_trans_id_$i"},
+      source           => $form->{"source_$i"},
+      memo             => $form->{"memo_$i"},
+      AR_paid          => $form->{"AR_paid_$i"},
+      forex            => $form->{"forex_$i"},
+      datepaid         => $form->{"datepaid_$i"},
+      paid_project_id  => $form->{"paid_project_id_$i"},
+      gldate           => $form->{"gldate_$i"},
+    };
+
+    $payment->{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"}));
+                           '-labels' => \%chart_labels,
+                           '-default' => $payment->{AR_paid}));
 
-    $form->{totalpaid} += $form->{"paid_$i"};
 
-    # format amounts
-    if ($form->{"paid_$i"}) {
-      $form->{"paid_$i"} =
-        $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
-    }
-    if ($form->{"exchangerate_$i"} == 0) {
-      $form->{"exchangerate_$i"} = "";
-    } else {
-      $form->{"exchangerate_$i"} =
-        $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
-    }
 
-    print qq|<input type=hidden name="acc_trans_id_$i" value=$form->{"acc_trans_id_$i"}>\n|;
-    print qq|<input type=hidden name="gldate_$i" value=$form->{"gldate_$i"}>\n|;
-    my $changeable = 1;
-    if ($::lx_office_conf{features}->{payments_changeable} == 0) {
-      # never
-      $changeable = ($form->{"acc_trans_id_$i"})? 0 : 1;
-    }
-    if ($::lx_office_conf{features}->{payments_changeable} == 2) {
-      # on the same day
-      $changeable = (($form->{"gldate_$i"} eq '') || $form->current_date(\%myconfig) eq $form->{"gldate_$i"});
-    }
-
-    $exchangerate = qq|&nbsp;|;
-    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"}|;
-      } else {
-        if ($changeable) {
-          $exchangerate =
-            qq|<input name="exchangerate_$i" size=10 value=$form->{"exchangerate_$i"}>|;
-        } else {
-          $exchangerate =
-            qq|<input type=hidden name="exchangerate_$i" value=$form->{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
-        }
-      }
-    }
+    $payment->{changeable} =
+        $::lx_office_conf{features}->{payments_changeable} == 0 ? !$payment->{acc_trans_id} # never
+      : $::lx_office_conf{features}->{payments_changeable} == 2 ? $payment->{gldate} eq '' || $payment->{gldate} eq $now
+      :                                                           1;
 
-    $exchangerate .= qq|
-<input type=hidden name="forex_$i" value=$form->{"forex_$i"}>
-|;
-
-    my $datepaid;
-    if ($changeable) {
-      $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>|;
-    } else {
-      $datepaid = qq|<td align=center>$form->{"datepaid_$i"}</td>|.
-        qq|<input type=hidden name="datepaid_$i" value=$form->{"datepaid_$i"}>|;
-    }
-
-    my $paid;
-    if ($changeable) {
-      $paid = qq|<td align=center><input name="paid_$i" size=11 value="$form->{"paid_$i"}" onBlur=\"check_right_number_format(this)\"></td>|;
-    } else {
-      $paid = qq|<td align=center>$form->{"paid_$i"}</td>|.
-        qq|<input type=hidden name="paid_$i" value=$form->{"paid_$i"}>|;
-    }
-
-    my $source;
-    if ($changeable) {
-      $source = qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
-    } else {
-      $source = qq|<td align=center>$form->{"source_$i"}</td>|.
-        qq|<input type=hidden name="source_$i" value=$form->{"source_$i"}>|;
-    }
-
-    my $memo;
-    if ($changeable) {
-      $memo = qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></td>|;
-    } else {
-      $memo = qq|<td align=center>$form->{"memo_$i"}</td>|.
-        qq|<input type=hidden name="memo_$i" value=$form->{"memo_$i"}>|;
-    }
-
-    my $AR_paid;
-    if ($changeable) {
-      $AR_paid = qq|<td align=center>${selectAR_paid}</td>|;
-    } else {
-      $AR_paid = qq|<td align=center>$form->{"AR_paid_$i"}</td>|.
-        qq|<input type=hidden name="AR_paid_$i" value=$form->{"AR_paid_$i"}>|;
-    }
-
-    my $paid_project_id;
-    if ($changeable) {
-      $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>|;
-    } else {
-      my $projectnumber = $project_labels{$form->{"paid_project_id_$i"}};
-      $paid_project_id = qq|<td>$projectnumber</td>|.
-        qq|<input type=hidden name="paid_project_id_$i" value=$form->{"paid_project_id_$i"}>|;
-    }
-
-    $column_data{paid}            = $paid;
-    $column_data{AR_paid}         = $AR_paid;
-    $column_data{exchangerate}    = qq|<td align=center>$exchangerate</td>|;
-    $column_data{datepaid}        = $datepaid;
-    $column_data{source}          = $source;
-    $column_data{memo}            = $memo;
-    $column_data{paid_project_id} = $paid_project_id;
-
-    map { print qq|$column_data{$_}\n| } @column_index;
-
-    print "
-        </tr>
-";
-    if ($changeable) {
-      push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
-    }
+    push @payments, $payment;
   }
 
-  my $paid_missing = $form->{invtotal_unformatted} - $form->{totalpaid};
+  $form->{totalpaid} = sum map { $_->{paid} } @payments;
 
-  print qq|
-        <tr>
-          <td></td>
-          <td></td>
-          <td align="center">| . $locale->text('Total') . qq|</td>
-          <td align="center">| . H($form->format_amount(\%myconfig, $form->{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}>
-
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
+  $form->header;
+  print $::form->parse_html_template('ar/form_header', {
+    paid_missing         => $::form->{invtotal} - $::form->{totalpaid},
+    show_exch            => ($::form->{defaultcurrency} && ($::form->{currency} ne $::form->{defaultcurrency})),
+    payments             => \@payments,
+    transactions         => \@transactions,
+    project_labels       => \%project_labels,
+    rows                 => $rows,
+    ARselected           => $ARselected,
+    onload               => $onload,
+    title_str            => $title,
+    follow_up_trans_info => $follow_up_trans_info,
+  });
 
   $main::lxdebug->leave_sub();
 }
diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index fcff5cf33..af6c6c824 100644
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -359,7 +359,7 @@ sub list_transactions {
 
   $form->{callback} = $link . '&sort=' . E($form->{sort});
 
-  my %column_alignment = map { $_ => 'right' } qw(debit credit);
+  my %column_alignment = map { $_ => 'right' } qw(debit credit balance);
 
   my @custom_headers = ();
  # Zeile 1:
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 2ada087cb..0b607da1d 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1844,7 +1844,7 @@ sub save {
         qw(weight listprice sellprice rop);
 
       $form->{assembly_rows}--;
-      $i = $newform{rowcount};
+      $i = $form->{assembly_rows};
       $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
 
       $form->{sellprice} -= $form->{"sellprice_$i"} * $form->{"qty_$i"};
diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index 89818c93c..e81ecb26a 100644
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -776,7 +776,7 @@ sub generate_ustva {
         dec_places  => '2',
     });
 
-    push @category_cent, qw(83  Z43  Z45  Z53  Z62  Z65  Z67);
+    push @category_cent, qw(Z43  Z45  Z53  Z62  Z65  Z67);
 
     my @category_euro = $ustva->report_variables({
         myconfig    => \%myconfig,
diff --git a/css/lx-office-erp/menu.css b/css/lx-office-erp/menu.css
index b9fbcdaf0..be9424392 100644
--- a/css/lx-office-erp/menu.css
+++ b/css/lx-office-erp/menu.css
@@ -13,7 +13,7 @@ table.menunew {
   border-spacing: 0;
 }
 
-table.menunew > td {
+table.menunew td {
   padding: 0;
   color:white;
   font-family: Verdana, Arial, sans-serif;
diff --git a/templates/webpages/amcvar/render_inputs.html b/templates/webpages/amcvar/render_inputs.html
index f4f1c63c7..a69101bf0 100644
--- a/templates/webpages/amcvar/render_inputs.html
+++ b/templates/webpages/amcvar/render_inputs.html
@@ -31,7 +31,7 @@
 
 <select name="[% var_name %]">
  [%- FOREACH option = var.OPTIONS %]
- <option[% IF option.value == var.value %] selected[% END %]>[% HTML.escape(option.value) %]</option>
+ <option value="[% option.value | html %]"[% IF option.value == var.value %] selected[% END %]>[% HTML.escape(option.value) %]</option>
  [%- END %]
 </select>
 
diff --git a/templates/webpages/ar/form_header.html b/templates/webpages/ar/form_header.html
new file mode 100644
index 000000000..5d2fb7417
--- /dev/null
+++ b/templates/webpages/ar/form_header.html
@@ -0,0 +1,279 @@
+[%- USE HTML %]
+[%- USE L %]
+[%- USE T8 %]
+[%- USE LxERP %]
+
+<body onLoad="[% onload %]">
+
+<form method=post name="arledger" action="[% script %]">
+
+[% L.hidden_tag('id', id) %]
+[% L.hidden_tag('sort', sort) %]
+[% L.hidden_tag('closedto', closedto) %]
+[% L.hidden_tag('locked', locked) %]
+[% L.hidden_tag('title', title_str) %]
+[% L.hidden_tag('follow_up_trans_id_1', id) %]
+[% L.hidden_tag('follow_up_trans_type_1', 'ar_transaction') %]
+[% L.hidden_tag('follow_up_trans_info_1', follow_up_trans_info) %]
+[% L.hidden_tag('follow_up_rowcount', 1) %]
+
+[%- IF saved_message %]<p>[% saved_message | html  %]</p>[% END %]
+
+<table width=100%>
+  <tr class=listtop>
+    <th class=listtop>[% title | html %]</th>
+  </tr>
+  <tr height="5"></tr>
+  <tr valign=top>
+    <td>
+      <table width=100%>
+        <tr valign=top>
+          <td>
+            <table>
+              <tr>
+                <th align="right" nowrap>[% 'Customer' | $T8 %]</th>
+                <td colspan=3>
+[%- IF selectcustomer %]
+    <select name="customer" onchange="document.getElementById('update_button').click();">[% selectcustomer %]</select>
+[%- ELSE %]
+    <input name=customer value="[% customer | html %]" size=35>
+[%- END %]
+                <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('customer')"></td>
+                [% L.hidden_tag('selectcustomer', selectcustomer) %]
+                [% L.hidden_tag('oldcustomer', oldcustomer) %]
+                [% L.hidden_tag('oldcustomer', oldcustomer) %]
+                [% L.hidden_tag('terms', terms) %]
+              </tr>
+              <tr>
+                <td></td>
+                <td colspan=3>
+                  <table width=100%>
+                    <tr>
+                      <th align=left nowrap>[% 'Credit Limit' | $T8 %]</th>
+                      <td>[% LxERP.format_amount(creditlimit, 0) %][% L.hidden_tag('creditlimit', LxERP.format_amount(creditlimit, 0)) %]</td>
+                      <th align=left nowrap>[% 'Remaining' | $T8 %]</th>
+                      <td class="plus[% creditlimit < 0 ? 0 : 1 %]">[% LxERP.format_amount(creditremaining, 0) %][% L.hidden_tag('creditremaining', LxERP.format_amount(creditremaining, 0)) %]</td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr>
+                <th align=right>[% 'Currency' | $T8 %]</th>
+                <td><select name=currency>[% selectcurrency %]</select></td>
+                [% L.hidden_tag('selectcurrency', selectcurrency) %]
+                [% L.hidden_tag('defaultcurrency', defaultcurrency) %]
+                [% L.hidden_tag('fxgain_accno', fxgain_accno) %]
+                [% L.hidden_tag('fxloss_accno', fxloss_accno) %]
+
+                [% L.hidden_tag('forex', forex) %]
+                [% IF show_exch %]
+                   <th align=right>[% 'Exchangerate' | $T8 %]</th>
+                   <td>[%- IF forex %][% L.hidden_tag(exchangerate, LxERP.format_amount(exchangerate, 2)) %][% LxERP.format_amount(exchangerate, 2) %][%- ELSE %][% L.input_tag(exchangerate, LxERP.format_amount(exchangerate, 2), size=10) %][%- END %]</td>
+                [% END %]
+              </tr>
+              [% department_html %]
+              [%- IF selectdepartment %]
+              <tr>
+                <th align="right" nowrap>[% 'Department' | $T8 %]</th>
+                <td colspan=3><select name=department>[% selectdepartment %]</select>
+                <input type=hidden name=selectdepartment value="[% selectdepartment | html %]">
+                </td>
+              </tr>
+              [%- END %]
+              <tr>
+                <td align=right>[% L.checkbox_tag('taxincluded', checked=taxincluded) %]</td>
+                <th align=left nowrap>[% 'Tax Included' | $T8 %]</th>
+              </tr>
+            </table>
+          </td>
+          <td align=right>
+            <table>
+[%- IF selectemployee %]
+              <tr>
+                <th align=right nowrap>[% 'Salesperson' | $T8 %]</th>
+                <td  colspan=2><select name=employee>[% selectemployee %]</select>[% L.hidden_tag('selectemployee', selectemployee) %]</td>
+              </tr>
+[%- ELSE %]
+                [% L.hidden_tag('employee', employee) %]
+[%- END %]
+              <tr>
+                <th align=right nowrap>[% 'Invoice Number' | $T8 %]</th>
+                <td><input name=invnumber size=11 value="[% invnumber | html %]"></td>
+              </tr>
+              <tr>
+                <th align=right nowrap>[% 'Order Number' | $T8 %]</th>
+                <td><input name=ordnumber size=11 value="[% ordnumber | html %]"></td>
+              </tr>
+              <tr>
+                <th align=right nowrap>[% 'Invoice Date' | $T8 %]</th>
+                <td>[% L.date_tag('transdate', transdate) %]</td>
+              </tr>
+              <tr>
+                <th align=right nowrap>[% 'Due Date' | $T8 %]</th>
+                <td>[% L.date_tag('duedate', duedate) %]</td>
+              </tr>
+              <tr>
+                <th align=right nowrap>[% 'Project Number' | $T8 %]</th>
+                <td>[% L.select_tag('globalproject_id', L.options_for_select(ALL_PROJECTS, title='projectnumber', default=globalproject_id, with_empty=1)) %]</td>
+              </tr>
+     </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+
+                [% L.hidden_tag('rowcount', rowcount) %]
+  <tr>
+      <td>
+          <table width=100%>
+           <tr class=listheading>
+          <th class=listheading style="width:15%">[% 'Account' | $T8 %]</th>
+          <th class=listheading style="width:10%">[% 'Amount' | $T8 %]</th>
+          <th class=listheading style="width:10%">[% 'Tax' | $T8 %]</th>
+          <th class=listheading style="width:5%">[% 'Taxkey' | $T8 %]</th>
+          <th class=listheading style="width:10%">[% 'Project' | $T8 %]</th>
+        </tr>
+
+
+[%- FOREACH row IN transactions %]
+        <tr>
+          <td>[% row.selectAR_amount %]</td>
+          <td>[% L.input_tag('amount_' _ loop.count, LxERP.format_amount(row.amount, 2)) %]</td>
+          <td>[% L.input_tag('tax_' _ loop.count, LxERP.format_tax(row.tax, 2)) %][% LxERP.format_tax(row.tax, 2) | html %]</td>
+          <td>[% row.tax %]</td>
+          <td>[% L.select_tag('project_id_' _ loop.count, L.options_for_select(ALL_PROJECTS, title='projectnumber', default=row.project_id, with_empty=1)) %]</td>
+        </tr>
+[%- END %]
+
+        <tr>
+          <td colspan=6>
+            <hr noshade>
+          </td>
+        </tr>
+        <tr>
+          <td>[% ARselected %]</td>
+          <th align=left>[% LxERP.format_amount(invtotal, 2) | html %]</th>
+
+          <input type=hidden name=oldinvtotal value='[% oldinvtotal %]'>
+          <input type=hidden name=oldtotalpaid value='[% oldtotalpaid %]'>
+
+          <input type=hidden name=taxaccounts value="[% taxaccounts | html %]">
+
+          <td colspan=4></td>
+
+
+        </tr>
+        </table>
+        </td>
+    </tr>
+    <tr>
+      <td>
+        <table width=100%>
+        <tr>
+          <th align=left width=1%>[% 'Notes' | $T8 %]</th>
+          <td align=left><textarea name=notes rows="[% rows %]" cols=50 wrap=soft>[% notes | html %]</textarea></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <table width=100%>
+        <tr class=listheading>
+          <th colspan=7 class=listheading>[% 'Incoming Payments' | $T8 %]</th>
+        </tr>
+
+        <tr>
+         <th>[% 'Date' | $T8 %]</th>
+         <th>[% 'Source' | $T8 %]</th>
+         <th>[% 'Memo' | $T8 %]</th>
+         <th>[% 'Amount' | $T8 %]</th>
+[%- IF show_exch %]
+         <th>[% 'Exch' | $T8 %]</th>
+[%- END %]
+         <th>[% 'Account' | $T8 %]</th>
+         <th>[% 'Project Number' | $T8 %]</th>
+        </tr>
+
+[%- FOREACH row IN payments %]
+        <tr>
+         <td align=center>
+  [%- IF row.changeable %]
+          [% L.date_tag('datepaid_' _ loop.count, row.datepaid) %]
+  [%- ELSE %]
+         [% row.datepaid | html %][% L.hidden_tag('datepaid_' _ loop.count, row.datepaid) %]
+  [%- END %]
+         </td>
+         <td align=center>
+  [%- IF row.changeable %]
+          <input name="source_[% loop.count %]" size=11 value="[% row.source | html %]">
+  [%- ELSE %]
+         [% row.source | html %]<input type=hidden name="source_[% loop.count %]" value="[% row.source | html %]">
+  [%- END %]
+         </td>
+         <td align=center>
+  [%- IF row.changeable %]
+          <input name="memo_[% loop.count %]" size=11 value="[% row.memo | html %]">
+  [%- ELSE %]
+         [% row.memo | html %]<input type=hidden name="memo_[% loop.count %]" value="[% row.memo | html %]">
+  [%- END %]
+         </td>
+         <td align=center>
+  [%- IF row.changeable %]
+          <input name="paid_[% loop.count %]" size=11 value="[% row.paid ? LxERP.format_amount(row.paid, 2) : '' | html %]" onBlur="check_right_number_format(this)">
+  [%- ELSE %]
+         [% row.paid | html %]<input type=hidden name="paid_[% loop.count %]" value="[% row.paid ? LxERP.format_amount(row.paid, 2) : '' | html %]">
+  [%- END %]
+         </td>
+[%- IF show_exch %]
+         <td align=center>
+    [%- IF row.forex || !row.changeable%]
+          <input type=hidden name="exchangerate_[% loop.count %]" value='[% row.exchangerate | html %]'>[% row.exchangerate | html %]
+    [%- ELSE %]
+          <input name="exchangerate_[% loop.count %]" size=10 value='[% row.exchangerate | html %]'>
+    [%- END %]
+          <input type=hidden name="forex_[% loop.count %]" value='[% row.forex | html %]'>
+         </td>
+[%- END %]
+         <td align=center>
+  [%- IF row.changeable %]
+          [% row.selectAR_paid %]
+  [%- ELSE %]
+         [% row.AR_paid | html %]<input type=hidden name="AR_paid_[% loop.count %]" value='[% row.AR_paid | html %]'>
+  [%- END %]
+         </td>
+         <td>
+  [%- IF row.changeable %]
+          [% L.select_tag('paid_project_id_' _ loop.count, L.options_for_select(ALL_PROJECTS, title='projectnumber', default=row.paid_project_id, with_empty=1)) %]
+  [%- ELSE %]
+          [% project_labels.${row.paid_project_id} | html %]
+          <input type=hidden name="paid_project_id_[% loop.count %]" value='[% row.paid_project_id %]'>
+  [%- END %]
+         </td>
+
+         <input type=hidden name="acc_trans_id_[% loop.count %]" value='[% row.acc_trans_id | html %]'>
+         <input type=hidden name="gldate_[% loop.count %]" value='[% row.gldate | html %]'>
+        </tr>
+[%- END %]
+        <tr>
+          <td></td>
+          <td></td>
+          <td align="center">[% 'Total' | $T8 %]</td>
+          <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %]</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td align="center">[% 'Missing amount' | $T8 %]</td>
+          <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
+        </tr>
+        <input type=hidden name=paidaccounts value='[% paidaccounts %]'>
+
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td><hr size=3 noshade></td>
+  </tr>
+</table>
diff --git a/templates/webpages/common/paginate.html b/templates/webpages/common/paginate.html
index a476fa09f..8878193f2 100644
--- a/templates/webpages/common/paginate.html
+++ b/templates/webpages/common/paginate.html
@@ -1,9 +1,10 @@
 [%- USE T8 %]
+<span class='paginate'>
 [%- IF pages.max > 1 %]
-[%- IF pages.cur > 1 %]<a href='[% base_url _ "&page=" _ (pages.cur - 1) %]'>&laquo; [% 'prev' | $T8 %]</a> [% ELSE %]<b>&laquo;</b> [% END %]
+[%- IF pages.cur > 1 %]<a class='paginate-prev' href='[% base_url _ "&page=" _ (pages.cur - 1) %]'>&laquo; [% 'prev' | $T8 %]</a> [% ELSE %]<b>&laquo;</b> [% END %]
 [%- FOR p = pages.common %]
   [%- NEXT UNLESS p.visible %]
-  [%- IF p.active %]<a href="[% base_url _ "&page=" _ p.page %]">[% p.page %]</a> [% ELSE %]<b>[% p.page %]</b> [%- END %]
+  [%- IF p.active %]<a class='paginate-page' href="[% base_url _ "&page=" _ p.page %]">[% p.page %]</a> [% ELSE %]<b>[% p.page %]</b> [%- END %]
 [%- END %]
-[%- IF pages.cur < pages.max %]<a href='[% base_url _ "&page=" _ (pages.cur + 1) %]'>[% 'next' | $T8 %] &raquo;</a>[% ELSE %]<b>&raquo;</b>[%- END %]
+[%- IF pages.cur < pages.max %]<a class='paginate-next' href='[% base_url _ "&page=" _ (pages.cur + 1) %]'>[% 'next' | $T8 %] &raquo;</a>[% ELSE %]<b>&raquo;</b>[%- END %]
 [%- END %]
diff --git a/templates/webpages/oe/form_header.html b/templates/webpages/oe/form_header.html
index ed67b02e3..2c5d801ff 100644
--- a/templates/webpages/oe/form_header.html
+++ b/templates/webpages/oe/form_header.html
@@ -6,7 +6,6 @@
 
   <form method="post" name="oe" action="[% script %]">
 
-    <script type="text/javascript" src="js/common.js"></script>
     <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
     <script type="text/javascript" src="js/vendor_selection.js"></script>
     <script type="text/javascript" src="js/calculate_qty.js"></script>
diff --git a/templates/webpages/report_generator/html_report.html b/templates/webpages/report_generator/html_report.html
index 8c6250e39..a35cfb6a1 100644
--- a/templates/webpages/report_generator/html_report.html
+++ b/templates/webpages/report_generator/html_report.html
@@ -36,7 +36,7 @@
      [%- IF col.align %] align="[% HTML.escape(col.align) %]" style="text-align: [% HTML.escape(col.align) %]"[% END -%]
      [%- IF col.colspan && col.colspan > 1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
      >
-      [%- IF col.link -%]<a href="[% col.link %]">[%- END -%]
+      [%- IF col.link -%]<a class='report-generator-header-link' href="[% col.link %]">[%- END -%]
       [%- col.text -%]
       [%- IF col.show_sort_indicator -%]<img border="0" src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[%- END -%]
       [%- IF col.link -%]</a>[%- END -%]